bug fixes

src/modules/offices/api/index.js

@@ -10,10 +10,10 @@ export function getAffairType() {
 export function getAffairList(params) {
   return httpRequest.get('/api/lms/v2/lobby/processes', params).then(response => {
     const status = {
-      '-1': '待审核',
+      '-1': '待审批',
       0: '未通过',
       1: '通过',
-      2: '审核中'
+      2: '审批中'
     }
     if (response.list) {
       response.list = response.list.map(item => {

src/modules/offices/languages/zh-CN.js

@@ -10,9 +10,9 @@ export default {
     enteraddress: '请输入活动地址',
     activityContent: '学术活动内容',
     entActCon: '请输入活动内容',
-    approvalTime: '审核时间',
+    approvalTime: '审批时间',
     backlist: '返回列表',
-    beizhu: '备注',
+    beizhu: '审批备注',
     people: '主 讲 人',
     people2: '请输入主讲人',
     savesubmit: '保存提交'

src/modules/offices/mixins/edit.js

@@ -47,13 +47,13 @@ export default {
     disabledInfo() {
       return this.hasPay || this.isView || (this.isEdit && this.detail.status !== -1)
     },
-    // 审核状态
+    // 审批状态
     statusText() {
       const map = {
-        '-1': '待审核',
+        '-1': '待审批',
         0: '未通过',
         1: '通过',
-        2: '审核中'
+        2: '审批中'
       }
       return map[this.detail.status]
     },
@@ -81,6 +81,7 @@ export default {
     getStudent() {
       api.getStudent().then(response => {
         const data = this.$_.pick(response, ['personal_name', 'class_name', 'sofia_id'])
+        data.sofia_id = data.sofia_id || response.sno
         Object.assign(this.ruleForm, data)
       })
     },
@@ -136,6 +137,22 @@ export default {
           this.submitLoading = false
         })
     },
+    // 撤销的时候
+    onRemove() {
+      this.$confirm('你确定要撤回申请吗？撤回后，需要重新提交申请并由教务审批。', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消'
+      }).then(this.handleRemove)
+    },
+    // 撤回申请
+    handleRemove() {
+      api.deleteAffair(this.pid).then(response => {
+        if (response.success) {
+          this.$message({ type: 'success', message: '撤回成功' })
+          this.$router.replace({ path: '/app/offices', query: { id: this.affairId } })
+        }
+      })
+    },
     // 成功
     handleSuccess(response) {
       this.$message({ type: 'success', message: response.message })

src/modules/offices/src/activity/list.vue

@@ -17,9 +17,9 @@ export default {
         { prop: 'form.symposium_name', label: '活动名称' },
         { prop: 'form.symposium_time', label: '活动时间' },
         { prop: 'form.symposium_lecturer', label: '主讲人' },
-        { prop: 'status_name', label: '审核状态' },
-        { prop: 'approve_time1', label: '审核时间' },
-        { prop: 'remark1', label: '备注' },
+        { prop: 'status_name', label: '审批状态' },
+        { prop: 'approve_time1', label: '审批时间' },
+        { prop: 'remark1', label: '审批备注' },
         {
           label: '操作',
           attrs: { width: '200' },

src/modules/offices/src/activity/reportView.vue

@@ -3,8 +3,10 @@
     <div class="con-title">{{ $t('pages.affairsHall.uploadReport.title') }}</div>
     <div class="con-box">
       <!-- <el-button type="primary" @click="goReportSubmit">申请报告</el-button> -->
-      <el-button type="text" @click='gobackReportActiveList'>{{ $t('pages.affairsHall.uploadReport.backText') }}</el-button>
-      <div style="width: 100%; height: 0.2rem;"></div>
+      <el-button type="text" @click="gobackReportActiveList">{{
+        $t('pages.affairsHall.uploadReport.backText')
+      }}</el-button>
+      <div style="width: 100%; height: 0.2rem"></div>
       <m-page
         :tableHead="tableHead"
         :tableData="tableData"
@@ -25,7 +27,7 @@ export default {
     rid: { type: String, required: true }
   },
   components: { mPage },
-  data () {
+  data() {
     return {
       tableConfig: { border: '', size: '', selection: { has: false, sels: [], width: '50px', fix: 'left', align: '' } }, // 增加选择框，has设置为true
       tableHead: [
@@ -33,15 +35,24 @@ export default {
         { prop: 'report_name', label: '报告名称', minWidth: '150', fix: false },
         { prop: 'report_description', label: '报告摘要', minWidth: '120', fix: false },
         { prop: 'submit_time', label: '提交时间', minWidth: '120', fix: false },
-        // { prop: 'approve_status', label: '审核状态', minWidth: '120', fix: false },
+        // { prop: 'approve_status', label: '审批状态', minWidth: '120', fix: false },
         { prop: 'file_url', label: '附件下载', minWidth: '120', fix: false },
         // { prop: '', label: '', minWidth: '', fix: false, goObj: { routerName: '', params: {} } }, // 点击跳转页面并传参数
-        { prop: 'operate-x', label: '操作', width: '140px', fix: false, commandArr: "[ { command: 'reportlist-', name: '' }, { command: 'reportlist-edit', name: '编辑' }, { command: 'reportlist-delete', name: '删除' } ]" }
+        {
+          prop: 'operate-x',
+          label: '操作',
+          width: '140px',
+          fix: false,
+          commandArr:
+            "[ { command: 'reportlist-', name: '' }, { command: 'reportlist-edit', name: '编辑' }, { command: 'reportlist-delete', name: '删除' } ]"
+        }
       ],
       tableData: [],
       params: { keywords: '', curPage: 1, pageSize: 100, total: '' },
       objFn: {
-        paramsFn: (_this) => { return { rid: this.rid } },
+        paramsFn: _this => {
+          return { rid: this.rid }
+        },
         nameAPI: 'getReportListAll',
         actionClass: 'Report',
         // nameExcel: 'getStatSummaryExcel',
@@ -49,7 +60,7 @@ export default {
         callback: (_this, data) => {
           _this.params.total = 100
           data.forEach((elem, i) => {
-            elem.approve_status = elem.is_checked === 1 ? '通过' : (elem.is_checked === 0 ? '未通过' : '未审核')
+            elem.approve_status = elem.is_checked === 1 ? '通过' : elem.is_checked === 0 ? '未通过' : '未审批'
             elem.file_url = JSON.parse(elem.file_url)[0].url
             elem.index = i + 1 + (_this.params.curPage - 1) * _this.params.pageSize
             _this.tableData.push(elem)
@@ -58,8 +69,8 @@ export default {
       }
     }
   },
-  mounted () {
-    this.VueEvent.$off('command-tablelist-x').$on('command-tablelist-x', (_obj) => {
+  mounted() {
+    this.VueEvent.$off('command-tablelist-x').$on('command-tablelist-x', _obj => {
       if (_obj.command.command === 'reportlist-edit') {
         const reid = _obj.tableData[_obj.index - 1].id
         this.$router.push({ path: `/app/learn/report-submit/${this.rid}/${reid}` })
@@ -68,20 +79,27 @@ export default {
         const reid = _obj.tableData[_obj.index - 1].id
         /* 删除 */
         const loading = this.$loading({ lock: true, text: '', spinner: '', background: 'rgba(255, 255, 255, 0.9)' })
-        cAction.Affairs.deleteSubmitReport(this.rid, reid).then(data => {
-          if (data.flag) {
-            this.$message({ type: 'success', message: '删除成功' })
-          }
-          this.params.pageSize += 1
-        }).catch(e => { this.$message.error(e.message) }).finally(() => { loading.close() })
+        cAction.Affairs.deleteSubmitReport(this.rid, reid)
+          .then(data => {
+            if (data.flag) {
+              this.$message({ type: 'success', message: '删除成功' })
+            }
+            this.params.pageSize += 1
+          })
+          .catch(e => {
+            this.$message.error(e.message)
+          })
+          .finally(() => {
+            loading.close()
+          })
       }
     })
   },
   methods: {
-    goReportSubmit () {
+    goReportSubmit() {
       this.$router.push({ path: `/app/learn/report-submit/${this.rid}/-1` })
     },
-    gobackReportActiveList () {
+    gobackReportActiveList() {
       this.$router.push({ path: '/app/affairs-hall/hall' })
     }
   }

src/modules/offices/src/certSchool/edit.vue

@@ -6,29 +6,33 @@
       <div class="main-form">
         <el-form label-width="120px" :disabled="isView" ref="ruleForm" :model="ruleForm" :rules="rules">
           <el-form-item label="姓名" prop="personal_name">
-            <el-input v-model="ruleForm.personal_name" />
+            <el-input v-model="ruleForm.personal_name" readonly />
           </el-form-item>
           <el-form-item label="班级" prop="class_name">
-            <el-input v-model="ruleForm.class_name" />
+            <el-input v-model="ruleForm.class_name" readonly />
+          </el-form-item>
+          <el-form-item label="Sofia ID" prop="sofia_id">
+            <el-input v-model="ruleForm.sofia_id" readonly />
           </el-form-item>
           <el-form-item label="出生年月" prop="birth_date">
             <el-date-picker v-model="ruleForm.birth_date" type="date" value-format="yyyy-MM-dd"> </el-date-picker>
           </el-form-item>
-          <el-form-item label="Sofia ID" prop="sofia_id">
-            <el-input v-model="ruleForm.sofia_id" />
-          </el-form-item>
           <template v-if="isView">
-            <el-form-item v-if="detail.approve_time" :label="$t('pages.affairsHall.shareAdd.approvalTime')">
-              <el-input v-model="detail.approve_time" />
+            <el-form-item label="审批状态" style="margin: 0">
+              {{ statusText }}
+            </el-form-item>
+            <el-form-item label="审批时间" style="margin: 0" v-if="detail.approve_time1">
+              {{ detail.approve_time1 }}
             </el-form-item>
-            <el-form-item v-if="detail.remark1" :label="$t('pages.affairsHall.shareAdd.remarks')">
-              <el-input v-model="detail.remark1" maxlength="50" type="textarea" :autosize="{ minRows: 5 }" />
+            <el-form-item label="审批备注" style="margin: 0" v-if="detail.remark">
+              {{ detail.remark }}
             </el-form-item>
           </template>
           <el-form-item v-if="!this.isView">
             <el-button type="primary" :loading="submitLoading" @click="handleSubmit">
               {{ $t('pages.affairsHall.shareAdd.savesubmit') }}
             </el-button>
+            <el-button type="info" @click="onRemove" v-if="hasAbort">撤回申请</el-button>
           </el-form-item>
         </el-form>
       </div>

src/modules/offices/src/certSchool/list.vue

@@ -18,9 +18,9 @@ export default {
         { prop: 'form.personal_name', label: '姓名' },
         { prop: 'form.class_name', label: '班级' },
         { prop: 'form.birth_date', label: '出生日期' },
-        { prop: 'status_name', label: '审核状态' },
-        { prop: 'approve_time1', label: '审核时间' },
-        { prop: 'remark1', label: '备注' },
+        { prop: 'status_name', label: '审批状态' },
+        { prop: 'approve_time1', label: '审批时间' },
+        { prop: 'remark1', label: '审批备注' },
         {
           label: '操作',
           attrs: { width: '100' },

src/modules/offices/src/certStudy/edit.vue

@@ -6,13 +6,13 @@
       <div class="main-form">
         <el-form label-width="180px" :disabled="isView" ref="ruleForm" :model="ruleForm" :rules="rules">
           <el-form-item label="姓名" prop="personal_name">
-            <el-input v-model="ruleForm.personal_name" />
+            <el-input v-model="ruleForm.personal_name" readonly />
           </el-form-item>
           <el-form-item label="班级" prop="class_name">
-            <el-input v-model="ruleForm.class_name" />
+            <el-input v-model="ruleForm.class_name" readonly />
           </el-form-item>
           <el-form-item label="Sofia ID" prop="sofia_id">
-            <el-input v-model="ruleForm.sofia_id" />
+            <el-input v-model="ruleForm.sofia_id" readonly />
           </el-form-item>
           <el-form-item label="在读证明收件人是否为本人" prop="is_self">
             <el-radio-group v-model="ruleForm.is_self">
@@ -30,17 +30,21 @@
             <el-input type="textarea" v-model="ruleForm.email" :autosize="{ minRows: 3 }" />
           </el-form-item>
           <template v-if="isView">
-            <el-form-item v-if="detail.approve_time" :label="$t('pages.affairsHall.shareAdd.approvalTime')">
-              <el-input v-model="detail.approve_time" />
+            <el-form-item label="审批状态" style="margin: 0">
+              {{ statusText }}
             </el-form-item>
-            <el-form-item v-if="detail.remark1" :label="$t('pages.affairsHall.shareAdd.remarks')">
-              <el-input v-model="detail.remark1" maxlength="50" type="textarea" :autosize="{ minRows: 5 }" />
+            <el-form-item label="审批时间" style="margin: 0" v-if="detail.approve_time1">
+              {{ detail.approve_time1 }}
+            </el-form-item>
+            <el-form-item label="审批备注" style="margin: 0" v-if="detail.remark">
+              {{ detail.remark }}
             </el-form-item>
           </template>
           <el-form-item v-if="!this.isView">
             <el-button type="primary" :loading="submitLoading" @click="handleSubmit">
               {{ $t('pages.affairsHall.shareAdd.savesubmit') }}
             </el-button>
+            <el-button type="info" @click="onRemove" v-if="hasAbort">撤回申请</el-button>
           </el-form-item>
         </el-form>
       </div>

src/modules/offices/src/certStudy/list.vue

@@ -18,9 +18,9 @@ export default {
         { prop: 'form.receive_name', label: '收件人' },
         { prop: 'form.telephone', label: '收件人电话' },
         { prop: 'form.email', label: '邮寄地址' },
-        { prop: 'status_name', label: '审核状态' },
-        { prop: 'approve_time1', label: '审核时间' },
-        { prop: 'remark1', label: '备注' },
+        { prop: 'status_name', label: '审批状态' },
+        { prop: 'approve_time1', label: '审批时间' },
+        { prop: 'remark1', label: '审批备注' },
         {
           label: '操作',
           attrs: { width: '100' },

src/modules/offices/src/reportE/edit.vue

@@ -6,26 +6,30 @@
       <div class="main-form">
         <el-form label-width="100px" :disabled="isView" ref="ruleForm" :model="ruleForm" :rules="rules">
           <el-form-item label="姓名" prop="personal_name">
-            <el-input v-model="ruleForm.personal_name" />
+            <el-input v-model="ruleForm.personal_name" readonly />
           </el-form-item>
           <el-form-item label="班级" prop="class_name">
-            <el-input v-model="ruleForm.class_name" />
+            <el-input v-model="ruleForm.class_name" readonly />
           </el-form-item>
           <el-form-item label="Sofia ID" prop="sofia_id">
-            <el-input v-model="ruleForm.sofia_id" />
+            <el-input v-model="ruleForm.sofia_id" readonly />
           </el-form-item>
           <template v-if="isView">
-            <el-form-item v-if="detail.approve_time" :label="$t('pages.affairsHall.shareAdd.approvalTime')">
-              <el-input v-model="detail.approve_time" />
+            <el-form-item label="审批状态" style="margin: 0">
+              {{ statusText }}
             </el-form-item>
-            <el-form-item v-if="detail.remark1" :label="$t('pages.affairsHall.shareAdd.remarks')">
-              <el-input v-model="detail.remark1" maxlength="50" type="textarea" :autosize="{ minRows: 5 }" />
+            <el-form-item label="审批时间" style="margin: 0" v-if="detail.approve_time1">
+              {{ detail.approve_time1 }}
+            </el-form-item>
+            <el-form-item label="审批备注" style="margin: 0" v-if="detail.remark">
+              {{ detail.remark }}
             </el-form-item>
           </template>
           <el-form-item v-if="!this.isView">
             <el-button type="primary" :loading="submitLoading" @click="handleSubmit">
               {{ $t('pages.affairsHall.shareAdd.savesubmit') }}
             </el-button>
+            <el-button type="info" @click="onRemove" v-if="hasAbort">撤回申请</el-button>
           </el-form-item>
         </el-form>
       </div>

src/modules/offices/src/reportE/list.vue

@@ -16,9 +16,9 @@ export default {
       columns: [
         { prop: 'form.sofia_id', label: 'Sofia ID' },
         { prop: 'form.class_name', label: '班级' },
-        { prop: 'status_name', label: '审核状态' },
-        { prop: 'approve_time1', label: '审核时间' },
-        { prop: 'remark1', label: '审核备注' },
+        { prop: 'status_name', label: '审批状态' },
+        { prop: 'approve_time1', label: '审批时间' },
+        { prop: 'remark1', label: '审批备注' },
         {
           label: '操作',
           attrs: { width: '180' },

src/modules/offices/src/reportPaper/edit.vue

@@ -6,13 +6,13 @@
       <div class="main-form">
         <el-form label-width="180px" :disabled="isView" ref="ruleForm" :model="ruleForm" :rules="rules">
           <el-form-item label="姓名" prop="personal_name">
-            <el-input v-model="ruleForm.personal_name" />
+            <el-input v-model="ruleForm.personal_name" readonly />
           </el-form-item>
           <el-form-item label="班级" prop="class_name">
-            <el-input v-model="ruleForm.class_name" />
+            <el-input v-model="ruleForm.class_name" readonly />
           </el-form-item>
           <el-form-item label="Sofia ID" prop="sofia_id">
-            <el-input v-model="ruleForm.sofia_id" />
+            <el-input v-model="ruleForm.sofia_id" readonly />
           </el-form-item>
           <el-form-item label="在读证明收件人是否为本人" prop="is_self">
             <el-radio-group v-model="ruleForm.is_self">
@@ -46,32 +46,29 @@
             </el-radio-group>
           </el-form-item>
 
-          <template v-if="isView && detail.status !== -1">
+          <template v-if="isView">
             <el-form-item label="支付方式" style="margin: 0" v-if="detail.pay !== -1">
               {{ payText }}
             </el-form-item>
             <el-form-item label="支付状态" style="margin: 0" v-if="detail.pay !== -1">
               {{ payStatusText }}
             </el-form-item>
-            <el-form-item label="审核状态" style="margin: 0">
+            <el-form-item label="审批状态" style="margin: 0">
               {{ statusText }}
             </el-form-item>
-            <el-form-item label="审核时间" style="margin: 0" v-if="detail.approve_time1">
+            <el-form-item label="审批时间" style="margin: 0" v-if="detail.approve_time1">
               {{ detail.approve_time1 }}
             </el-form-item>
-            <el-form-item label="备注" style="margin: 0" v-if="detail.remark">
+            <el-form-item label="审批备注" style="margin: 0" v-if="detail.remark">
               {{ detail.remark }}
             </el-form-item>
           </template>
-          <el-form-item v-if="!isPaid">
-            <el-button type="primary" :loading="submitLoading" @click="handleSubmit(handleSubmitSuccess)"
+          <el-form-item v-if="!this.isView">
+            <el-button type="primary" :loading="submitLoading" @click="handleSubmit(handleSubmitSuccess)" v-if="!isPaid"
               >去支付</el-button
             >
-          </el-form-item>
-          <el-form-item v-else>
-            <el-button type="primary" :loading="submitLoading" @click="handleSubmit" v-if="!isView"
-              >保存并提交</el-button
-            >
+            <el-button type="primary" :loading="submitLoading" @click="handleSubmit" v-else>保存并提交</el-button>
+            <el-button type="info" @click="onRemove" v-if="hasAbort">撤回申请</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -130,7 +127,9 @@ export default {
   methods: {
     handleSubmitSuccess(response) {
       if (!this.isEdit) {
-        this.$router.replace({ name: 'pareportEdit', params: { id: response.data.id }, query: { id: this.affairId } })
+        this.$router
+          .replace({ name: 'pareportEdit', params: { id: response.data.id }, query: { id: this.affairId } })
+          .then(this.getDetail)
       }
       this.handlePay()
     },

src/modules/offices/src/reportPaper/list.vue

@@ -19,9 +19,9 @@ export default {
         { prop: 'form.receive_name', label: '收件人' },
         { prop: 'form.telephone', label: '收件人电话' },
         { prop: 'form.email', label: '邮寄地址' },
-        { prop: 'status_name', label: '审核状态' },
-        { prop: 'approve_time1', label: '审核时间' },
-        { prop: 'remark1', label: '审核备注' },
+        { prop: 'status_name', label: '审批状态' },
+        { prop: 'approve_time1', label: '审批时间' },
+        { prop: 'remark1', label: '审批备注' },
         {
           label: '操作',
           attrs: { width: '160' },

src/modules/offices/src/retake/edit.vue

@@ -13,13 +13,13 @@
         v-loading="loading"
       >
         <el-form-item label="姓名" prop="personal_name">
-          <el-input v-model="ruleForm.personal_name" :disabled="disabledInfo" placeholder="请输入您的姓名" />
+          <el-input v-model="ruleForm.personal_name" :disabled="disabledInfo" readonly />
         </el-form-item>
         <el-form-item label="班级" prop="class_name">
-          <el-input v-model="ruleForm.class_name" :disabled="disabledInfo" placeholder="请输入您的班级" />
+          <el-input v-model="ruleForm.class_name" :disabled="disabledInfo" readonly />
         </el-form-item>
         <el-form-item label="Sofia ID" prop="sofia_id">
-          <el-input v-model="ruleForm.sofia_id" :disabled="disabledInfo" placeholder="请输入您的Sofia ID" />
+          <el-input v-model="ruleForm.sofia_id" :disabled="disabledInfo" readonly />
         </el-form-item>
         <el-form-item label="重修时间" prop="semester_name">
           <el-radio-group
@@ -48,20 +48,20 @@
           </el-checkbox-group>
           <div class="score" v-if="hasPay && detail.form">{{ detail.form.credit_sum_str }}</div>
         </el-form-item>
-        <template v-if="isView && detail.status !== -1">
+        <template v-if="isView">
           <el-form-item label="支付方式" style="margin: 0" v-if="detail.pay !== -1">
             {{ payText }}
           </el-form-item>
           <el-form-item label="支付状态" style="margin: 0" v-if="detail.pay !== -1">
             {{ payStatusText }}
           </el-form-item>
-          <el-form-item label="审核状态" style="margin: 0">
+          <el-form-item label="审批状态" style="margin: 0">
             {{ statusText }}
           </el-form-item>
-          <el-form-item label="审核时间" style="margin: 0" v-if="detail.approve_time1">
+          <el-form-item label="审批时间" style="margin: 0" v-if="detail.approve_time1">
             {{ detail.approve_time1 }}
           </el-form-item>
-          <el-form-item label="备注" style="margin: 0" v-if="detail.remark">
+          <el-form-item label="审批备注" style="margin: 0" v-if="detail.remark">
             {{ detail.remark }}
           </el-form-item>
         </template>
@@ -79,7 +79,7 @@
         </template>
         <el-form-item v-else>
           <el-button type="primary" :loading="submitLoading" @click="handleSubmit" v-if="!isView">保存并提交</el-button>
-          <!-- <el-button type="info" @click="onAbort" v-if="hasAbort">撤回申请</el-button> -->
+          <el-button type="info" @click="onRemove" v-if="hasAbort">撤回申请</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -189,12 +189,10 @@ export default {
     },
     // 撤回
     onAbort() {
-      this.$confirm('你确定要撤回重修申请吗？撤回后，需要重新提交申请并由教务审批。', {
+      this.$confirm('你确定要撤回申请吗？撤回后，需要重新提交申请并由教务审批。', {
         confirmButtonText: '确定',
         cancelButtonText: '取消'
-      })
-        .then(() => {})
-        .catch(() => {})
+      }).then(() => {})
     },
     // 去支付
     handlePay() {

src/modules/offices/src/retake/list.vue

@@ -17,9 +17,9 @@ export default {
         { prop: 'form.sofia_id', label: 'Sofia ID' },
         { prop: 'form.semester_name', label: '重修时间' },
         { prop: 'form.course_name', label: '重修课程' },
-        { prop: 'status_name', label: '审核状态', attrs: { width: '100' } },
-        { prop: 'approve_time1', label: '审核时间', attrs: { width: '160' } },
-        { prop: 'remark1', label: '备注' },
+        { prop: 'status_name', label: '审批状态', attrs: { width: '100' } },
+        { prop: 'approve_time1', label: '审批时间', attrs: { width: '160' } },
+        { prop: 'remark1', label: '审批备注' },
         {
           label: '操作',
           attrs: { width: '160' },

src/modules/offices/src/share/list.vue

@@ -18,9 +18,9 @@ export default {
         { prop: 'form.class_name', label: '班级' },
         { prop: 'form.personal_name', label: '申请人' },
         { prop: 'form.telephone', label: '电话' },
-        { prop: 'status_name', label: '审核状态' },
-        { prop: 'approve_time1', label: '审核时间' },
-        { prop: 'remark1', label: '备注' },
+        { prop: 'status_name', label: '审批状态' },
+        { prop: 'approve_time1', label: '审批时间' },
+        { prop: 'remark1', label: '审批备注' },
         {
           label: '操作',
           attrs: { width: '100' },

src/modules/offices/src/studyContinue/edit.vue

@@ -6,13 +6,13 @@
       <div class="main-form">
         <el-form label-width="120px" :disabled="isView" ref="ruleForm" :model="ruleForm" :rules="rules">
           <el-form-item label="姓名" prop="personal_name">
-            <el-input v-model="ruleForm.personal_name" />
+            <el-input v-model="ruleForm.personal_name" readonly />
           </el-form-item>
           <el-form-item label="班级" prop="class_name">
-            <el-input v-model="ruleForm.class_name" />
+            <el-input v-model="ruleForm.class_name" readonly />
           </el-form-item>
           <el-form-item label="Sofia ID" prop="sofia_id">
-            <el-input v-model="ruleForm.sofia_id" />
+            <el-input v-model="ruleForm.sofia_id" readonly />
           </el-form-item>
           <el-form-item label="复学时间" prop="semester_name">
             <el-radio-group v-model="ruleForm.semester_name">
@@ -22,17 +22,21 @@
             </el-radio-group>
           </el-form-item>
           <template v-if="isView">
-            <el-form-item v-if="detail.approve_time" :label="$t('pages.affairsHall.shareAdd.approvalTime')">
-              <el-input v-model="detail.approve_time" />
+            <el-form-item label="审批状态" style="margin: 0">
+              {{ statusText }}
             </el-form-item>
-            <el-form-item v-if="detail.remark1" :label="$t('pages.affairsHall.shareAdd.remarks')">
-              <el-input v-model="detail.remark1" maxlength="50" type="textarea" :autosize="{ minRows: 5 }" />
+            <el-form-item label="审批时间" style="margin: 0" v-if="detail.approve_time1">
+              {{ detail.approve_time1 }}
+            </el-form-item>
+            <el-form-item label="审批备注" style="margin: 0" v-if="detail.remark">
+              {{ detail.remark }}
             </el-form-item>
           </template>
           <el-form-item v-if="!this.isView">
             <el-button type="primary" :loading="submitLoading" @click="handleSubmit">
               {{ $t('pages.affairsHall.shareAdd.savesubmit') }}
             </el-button>
+            <el-button type="info" @click="onRemove" v-if="hasAbort">撤回申请</el-button>
           </el-form-item>
         </el-form>
       </div>

src/modules/offices/src/studyContinue/list.vue

@@ -17,9 +17,9 @@ export default {
         { prop: 'form.sofia_id', label: 'Sofia ID' },
         { prop: 'form.class_name', label: '班级' },
         { prop: 'form.semester_name', label: '复学时间' },
-        { prop: 'status_name', label: '审核状态' },
-        { prop: 'approve_time1', label: '审核时间' },
-        { prop: 'remark1', label: '备注' },
+        { prop: 'status_name', label: '审批状态' },
+        { prop: 'approve_time1', label: '审批时间' },
+        { prop: 'remark1', label: '审批备注' },
         {
           label: '操作',
           attrs: { width: '100' },

src/modules/offices/src/studyPause/edit.vue

@@ -6,13 +6,13 @@
       <div class="main-form">
         <el-form label-width="120px" :disabled="isView" ref="ruleForm" :model="ruleForm" :rules="rules">
           <el-form-item label="姓名" prop="personal_name">
-            <el-input v-model="ruleForm.personal_name" />
+            <el-input v-model="ruleForm.personal_name" readonly />
           </el-form-item>
           <el-form-item label="班级" prop="class_name">
-            <el-input v-model="ruleForm.class_name" />
+            <el-input v-model="ruleForm.class_name" readonly />
           </el-form-item>
           <el-form-item label="Sofia ID" prop="sofia_id">
-            <el-input v-model="ruleForm.sofia_id" />
+            <el-input v-model="ruleForm.sofia_id" readonly />
           </el-form-item>
           <el-form-item label="休学时间" prop="semester_name">
             <el-radio-group v-model="ruleForm.semester_name">
@@ -25,17 +25,21 @@
             <el-input type="textarea" v-model="ruleForm.reason" :autosize="{ minRows: 5 }" />
           </el-form-item>
           <template v-if="isView">
-            <el-form-item v-if="detail.approve_time" :label="$t('pages.affairsHall.shareAdd.approvalTime')">
-              <el-input v-model="detail.approve_time" />
+            <el-form-item label="审批状态" style="margin: 0">
+              {{ statusText }}
             </el-form-item>
-            <el-form-item v-if="detail.remark1" :label="$t('pages.affairsHall.shareAdd.remarks')">
-              <el-input v-model="detail.remark1" maxlength="50" type="textarea" :autosize="{ minRows: 5 }" />
+            <el-form-item label="审批时间" style="margin: 0" v-if="detail.approve_time1">
+              {{ detail.approve_time1 }}
+            </el-form-item>
+            <el-form-item label="审批备注" style="margin: 0" v-if="detail.remark">
+              {{ detail.remark }}
             </el-form-item>
           </template>
           <el-form-item v-if="!this.isView">
             <el-button type="primary" :loading="submitLoading" @click="handleSubmit">
               {{ $t('pages.affairsHall.shareAdd.savesubmit') }}
             </el-button>
+            <el-button type="info" @click="onRemove" v-if="hasAbort">撤回申请</el-button>
           </el-form-item>
         </el-form>
       </div>

src/modules/offices/src/studyPause/list.vue

@@ -17,9 +17,9 @@ export default {
         { prop: 'form.sofia_id', label: 'Sofia ID' },
         { prop: 'form.semester_name', label: '休学时间' },
         { prop: 'form.reason', label: '休学原因' },
-        { prop: 'status_name', label: '审核状态' },
-        { prop: 'approve_time1', label: '审核时间' },
-        { prop: 'remark1', label: '备注' },
+        { prop: 'status_name', label: '审批状态' },
+        { prop: 'approve_time1', label: '审批时间' },
+        { prop: 'remark1', label: '审批备注' },
         {
           label: '操作',
           attrs: { width: '100' },