From 03ac1eca2fe0225db4bcf5f38c67a6dec69eaaf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=88=90?= <962704835@qq.com> Date: Fri, 28 Nov 2025 11:17:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E7=95=99=E5=AD=A6=E7=B1=8D=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=B5=81=E7=A8=8B=E9=80=9A=E8=BF=87=E5=90=8E=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AD=A6=E7=94=9F=E7=9A=84=E5=AD=A6=E7=B1=8D=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=BA=E2=80=9C=E5=85=A5=E4=BC=8D=E4=BF=9D=E7=95=99?= =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/flowable/task/todo/detail/index.vue | 8 +++++-- .../enlistmentReserve/applicationForm.vue | 21 ++++++++++++------- .../enlistmentReserveAttach/index.vue | 9 ++++++-- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/views/flowable/task/todo/detail/index.vue b/src/views/flowable/task/todo/detail/index.vue index 6bc30fc..15b2f11 100644 --- a/src/views/flowable/task/todo/detail/index.vue +++ b/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) } diff --git a/src/views/routine/enlistmentReserve/applicationForm.vue b/src/views/routine/enlistmentReserve/applicationForm.vue index 7242a70..be14c45 100644 --- a/src/views/routine/enlistmentReserve/applicationForm.vue +++ b/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() } }); diff --git a/src/views/routine/enlistmentReserve/enlistmentReserveAttach/index.vue b/src/views/routine/enlistmentReserve/enlistmentReserveAttach/index.vue index 07fefb0..97dd45e 100644 --- a/src/views/routine/enlistmentReserve/enlistmentReserveAttach/index.vue +++ b/src/views/routine/enlistmentReserve/enlistmentReserveAttach/index.vue @@ -50,8 +50,12 @@ @@ -101,6 +105,7 @@ export default { name: "EnlistmentReserveAttach", data() { return { + baseUrl:process.env.VUE_APP_BASE_API, // 遮罩层 loading: true, // 选中数组