保留学籍申请流程通过后修改学生的学籍状态为“入伍保留学籍”

src/views/flowable/task/todo/detail/index.vue

@@ -663,6 +663,7 @@ import pdf from 'vue-pdf'
 import { getEnlistmentReserveByProcessInstanceId, updateEnlistmentReserve } from "@/api/routine/enlistmentReserve/enlistmentReserve";
 import { insertOrUpdateByStuAndApprover } from "@/api/routine/enlistmentReserve/enlistmentReserveApproval";
 import { getUserProfile } from '@/api/system/user' // 获取当前登录用户
+import { updateStudent } from '@/api/stuCQS/basedata/student'
 
 export default {
   name: 'Record',
@@ -1046,7 +1047,7 @@ export default {
         if (valid) {
           this.$modal.loading('正在努力加载中,请稍等...')
 
-          this.taskForm.comment = '同意'
+          this.taskForm.comment = this.taskForm.variables.approvalOpinion != '' ? this.taskForm.variables.approvalOpinion : '同意'
           this.taskForm.variables.approvalResult = 1
           if (this.taskForm && this.formKeyExist) {
             // 表单是否禁用
@@ -1058,7 +1059,6 @@ export default {
 
             complete(this.taskForm).then((response) => {
               this.$modal.closeLoading()
-
               this.goBack()
             })
           } else {
@@ -1090,6 +1090,10 @@ export default {
                 this.form.quitNumber = this.taskForm.quitNumber
                 this.form.remark = this.taskForm.remark
                 this.updateRtStuQuitSchool()
+              } else if (this.category == 'enlistmentReserve') { // 是应征入伍保留学籍申请，才执行 
+                if (this.taskName == '教务处主管领导审批') { // (最后一个领导审核完成之后，修改学生学籍状态, status：07是入伍保留学籍)
+                  updateStudent({stuId: this.form.studentId, status: '07'}).then(response => {})
+                }
               } else {
                 this.$modal.msgSuccess(response.msg)
               }

src/views/routine/enlistmentReserve/applicationForm.vue

@@ -692,19 +692,25 @@ export default {
           };
           if (this.formData.id != null) {
             updateEnlistmentReserve(submitData.formData).then(response => {
-              this.$modal.msgSuccess("修改成功");
-
+              
+              // 填写附件里面的申请编号
+              this.enlistmentReserveAttachList.forEach(element => {
+                element.applyNo = this.formData.applyNo
+                element.applyId = response.data.id
+              })
               // 批量新增材料附件
               if (this.enlistmentReserveAttachList && this.enlistmentReserveAttachList.length > 0) {
-                this.batchAddEnlistmentReserveAttach(this.enlistmentReserveAttachList);
+                batchAddEnlistmentReserveAttach(this.enlistmentReserveAttachList)
               }
-              this.goBack()
               this.loading = false;
+              this.$modal.msgSuccess("修改成功");
+              this.goBack()
+              
             });
             
           } else {
             addEnlistmentReserve(submitData.formData).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              
               // 申请表新增成功之后，进行附件的添加
               if (response.code == 200) {
                 // 填写附件里面的申请编号
@@ -712,11 +718,12 @@ export default {
                   element.applyNo = this.formData.applyNo
                   element.applyId = response.data.id
                 })
-                this.loading = false;
                 // 批量新增材料附件
                 if (this.enlistmentReserveAttachList && this.enlistmentReserveAttachList.length > 0) {
-                  this.batchAddEnlistmentReserveAttach(this.enlistmentReserveAttachList);
+                  batchAddEnlistmentReserveAttach(this.enlistmentReserveAttachList)
                 }
+                this.loading = false;
+                this.$modal.msgSuccess("新增成功");
                 this.goBack()
               }
             });

src/views/routine/enlistmentReserve/enlistmentReserveAttach/index.vue

@@ -50,8 +50,12 @@
       </el-table-column>
       <el-table-column label="文件路径" align="center" prop="filePath">
         <template slot-scope="scope">
-          <el-tooltip class="item" effect="dark" :content="scope.row.filePath" placement="top">
-            <div class="text-ellipsis">{{ scope.row.filePath }}</div>
+          <el-tooltip class="item" effect="dark" :content="`点击可下载文件`" placement="top">
+            <div class="text-ellipsis">
+              <el-link :href="`${baseUrl}${scope.row.filePath}`" :underline="false" target="_blank">
+                <span style="color: #007AFF;">{{ scope.row.filePath }}</span>
+              </el-link>
+            </div>
           </el-tooltip>
         </template>
       </el-table-column>
@@ -101,6 +105,7 @@ export default {
   name: "EnlistmentReserveAttach",
   data() {
     return {
+      baseUrl:process.env.VUE_APP_BASE_API,
       // 遮罩层
       loading: true,
       // 选中数组