From 884b39f7d8048946f5e476973ee3b95a03e7b82b Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Thu, 11 Jul 2024 11:37:54 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91-=E8=81=94=E8=B0=83?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/incomePayments/meetManage/Attendance.vue | 2 +- .../WorkingGroupMemberUnitMaintenance.vue | 10 +++------- .../WorkingGroupProjectManagement.vue | 4 ++-- .../modules/WorkingGroupMemberUnitModule.vue | 7 ++++--- .../modules/WorkingGroupProjectModule.vue | 2 +- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index f4a3a94..8a15501 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -1360,7 +1360,7 @@ export default { title: '确认审核', content: '是否确定批量审核报名信息?', onOk: function () { - that.$refs.auditModal.title = '审核报名信息' + that.$refs.auditModal.title = '批量审核报名信息' that.$refs.auditModal.open({ batch: true, ids }, true) } }) diff --git a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue index 073a49d..e77fe7d 100644 --- a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue +++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue @@ -214,7 +214,7 @@ 调账 编辑 删除 - 确认凭证 + 确认凭证 @@ -329,7 +329,7 @@ export default { exportXlsUrl: '/project/payWorkingGroupSubitem/exportXls', importExcelUrl: '/project/payWorkingGroupSubitem/importExcel', downTemplateUrl: '/project/payWorkingGroupSubitem/downloadExcelModel', - // todo 需要进行修改 + // 确认凭证 confirmVoucher: '/project/payWorkingGroupSubitem/confirmVoucher' }, columns: [ @@ -679,14 +679,10 @@ export default { getAction(that.url.confirmVoucher, {id: id}).then((res) => { if (res.success) { that.$message.success(res.message) - // 判断当前删除的数据是否是最后一页的最后一条数据，如果是的话页码减一 - if (that.ipagination.current > 1 && ((that.ipagination.current - 1) * that.ipagination.pageSize) + 1 === that.ipagination.total) { - that.ipagination.current -= 1 - } that.loadData() } else { if (res.message.indexOf('
') > -1) { - that.messageLineFeed('删除失败', res.message) + that.messageLineFeed('确认凭证失败', res.message) } else { that.$message.warning(res.message) } diff --git a/src/views/projectManagement/WorkingGroupProjectManagement.vue b/src/views/projectManagement/WorkingGroupProjectManagement.vue index 4e8cb11..92e5152 100644 --- a/src/views/projectManagement/WorkingGroupProjectManagement.vue +++ b/src/views/projectManagement/WorkingGroupProjectManagement.vue @@ -48,7 +48,7 @@ 新增 批量删除 批量新增成员单位 - 全部文件导出 + 全部文件导出
@@ -134,7 +134,7 @@ import ProgressBar from '@comp/ProgressBar' import PageHeaderTitle from '@comp/layouts/PageHeaderTitle' import IconWorkingGruop from '@/assets/imgs/icon/icon_working_group.png' import { copyWorkingGroup } from '../../api/incomePaymentsApi' -import { downloadFile, getAction } from "../../api/manage"; +import { downloadFile, getAction } from '../../api/manage' import WorkingGroupMemberUnitModule from '@views/projectManagement/modules/WorkingGroupMemberUnitModule' export default { diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue index 769c9eb..ee7ec27 100644 --- a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue +++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue @@ -28,7 +28,7 @@ - + diff --git a/src/views/projectManagement/modules/WorkingGroupProjectModule.vue b/src/views/projectManagement/modules/WorkingGroupProjectModule.vue index 5fb7c69..ec6e017 100644 --- a/src/views/projectManagement/modules/WorkingGroupProjectModule.vue +++ b/src/views/projectManagement/modules/WorkingGroupProjectModule.vue @@ -267,7 +267,7 @@ export default { this.model = Object.assign({}, record) this.visible = true this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model, 'workingGroupProject', 'year', 'payFlag', 'principalIdA', 'principalIdB', 'convokeNum', 'operationCycle', 'yearChargeA', 'chargeNoticeNoA', 'chargeNoticeAId', 'yearChargeB', 'chargeNoticeNoB', 'chargeNoticeBId', 'missionAndObjectives', 'remarks')) + this.form.setFieldsValue(pick(this.model, 'workingGroupProject', 'sortNo', 'year', 'payFlag', 'principalIdA', 'principalIdB', 'convokeNum', 'operationCycle', 'yearChargeA', 'chargeNoticeNoA', 'chargeNoticeAId', 'yearChargeB', 'chargeNoticeNoB', 'chargeNoticeBId', 'missionAndObjectives', 'remarks')) if (!this.model.id) { this.form.setFieldsValue({ 'year': (new Date().getFullYear()).toString(),