diff --git a/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/applicationForm.vue b/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/applicationForm.vue index 7e14014..83d3d07 100644 --- a/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/applicationForm.vue +++ b/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/applicationForm.vue @@ -274,7 +274,7 @@ 保存 - + 提交申请 @@ -372,7 +372,9 @@ export default { promiseDate: '', parentSignAttachment: '', promiseContent: '', - accommodationFee: '' + accommodationFee: '', + affixId: '', + status: 0 }, formRules: { originalDormitory: [{ required: true, message: '原宿舍号不能为空', trigger: 'blur' }], diff --git a/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue b/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue index e79da30..35f9592 100644 --- a/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue +++ b/src/views/dormitory/outsideAccommodation/outsideAccommodationApply/index.vue @@ -152,7 +152,7 @@ v-hasPermi="['dormitory:outsideAccommodationApply:edit']" v-if="scope.row.status == 0 || getRejectInfo(scope.row.outsideAccommodationApprovals).isReject">修改 删除 + v-hasPermi="['dormitory:outsideAccommodationApply:remove']" v-if="scope.row.status == 0 && scope.row.processInstanceId == null">删除 详情 diff --git a/src/views/flowable/task/todo/detail/index.vue b/src/views/flowable/task/todo/detail/index.vue index acd46cc..dbbc5f7 100644 --- a/src/views/flowable/task/todo/detail/index.vue +++ b/src/views/flowable/task/todo/detail/index.vue @@ -2010,28 +2010,29 @@ export default { // 生成审核记录 insertOrUpdateByStuAndApprover(data).then(ress => { // 审核记录生成之后,判断退回或驳回是不是到学生申请,如果是则更新申请表状态 - if (text == '退回') { - let nodeName = '' - this.returnTaskList.forEach(element => { - if (element.id == this.taskForm.targetKey) { // 如果选中的节点id等于列表里面的id,就将节点名称获取到nodeName - nodeName = element.documentation - } - }); - if (nodeName == '学生申请') { // 如果退回选择的是学生节点更新申请表状态 - this.form.applyStatus = 0 - updateEnlistmentReserve(this.form).then(result => { - this.$modal.closeLoading() - }) - } - } else { - // 驳回 - if (this.taskName == '辅导员审批') { // 当前节点如果是辅导员审批,证明驳回就到了学生,所以更新申请表状态 - this.form.applyStatus = 0 - updateEnlistmentReserve(this.form).then(result => { - this.$modal.closeLoading() - }) - } - } + // if (text == '退回') { + // let nodeName = '' + // this.returnTaskList.forEach(element => { + // if (element.id == this.taskForm.targetKey) { // 如果选中的节点id等于列表里面的id,就将节点名称获取到nodeName + // nodeName = element.documentation + // } + // }); + // if (nodeName == '学生申请') { // 如果退回选择的是学生节点更新申请表状态 + // this.form.applyStatus = 0 + // updateEnlistmentReserve(this.form).then(result => { + // this.$modal.closeLoading() + // }) + // } + // } else { + // // 驳回 + // if (this.taskName == '辅导员审批') { // 当前节点如果是辅导员审批,证明驳回就到了学生,所以更新申请表状态 + // this.form.applyStatus = 0 + // updateEnlistmentReserve(this.form).then(result => { + // this.$modal.closeLoading() + // }) + // } + // } + this.$modal.closeLoading() }) }) }, diff --git a/src/views/routine/enlistmentReserve/index.vue b/src/views/routine/enlistmentReserve/index.vue index 5b9c25a..f84bbbf 100644 --- a/src/views/routine/enlistmentReserve/index.vue +++ b/src/views/routine/enlistmentReserve/index.vue @@ -101,12 +101,21 @@ - + @@ -124,10 +133,10 @@ @@ -475,6 +484,28 @@ export default { query: { id: row.id, type: 'detail', deployId: row.deployId, processInstanceId: row.processInstanceId } // 将 row.id 放在 query 中 }) }, + /** + * 获取驳回信息(是否驳回 + 驳回文字) + * @param {Array} approvalList 审批意见列表 + * @returns {Object} { isReject: 布尔值, rejectText: 驳回文字 } + */ + getRejectInfo(approvalList) { + // 空值保护:列表不存在/非数组/为空时,返回未驳回 + if (!approvalList || !Array.isArray(approvalList) || approvalList.length === 0) { + return { isReject: false, rejectText: '' }; + } + // 找到第一个审批结果为0(驳回)的记录 + const rejectItem = approvalList.find(item => item.approvalResult === 2); + if (rejectItem) { + // 提取审批节点名称(如「辅导员审批」→ 截取「辅导员」) + const nodeName = rejectItem.nodeName.replace('审批', ''); + // 拼接驳回文字(如「辅导员驳回」) + return { isReject: true, rejectText: `${nodeName}驳回` }; + } else { + // 无驳回记录 + return { isReject: false, rejectText: '' }; + } + } } };