From 763284d5bd779ad2206c08ecc13790f365ef508f Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Tue, 31 Oct 2023 18:33:53 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnterprisePlanSelectionModal.vue | 43 ++++++++-- .../selection/StandardSelectionModal.vue | 6 ++ .../RevisionPlanActivelyReportFlow.vue | 4 + .../PlanApprovalChangeFlow.vue | 85 ++++++++++++------- .../modules/DutyDepartChangeBaseInfo.vue | 79 +++++++++++++---- .../FinishTimeChangeBaseInfoDrawer.vue | 8 +- .../modules/MergeBaseInfo.vue | 1 + 7 files changed, 163 insertions(+), 63 deletions(-) diff --git a/src/components/selection/EnterprisePlanSelectionModal.vue b/src/components/selection/EnterprisePlanSelectionModal.vue index 71b15e3e..059baf25 100644 --- a/src/components/selection/EnterprisePlanSelectionModal.vue +++ b/src/components/selection/EnterprisePlanSelectionModal.vue @@ -80,6 +80,22 @@ :row-selection="{ type: type, selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :loading="loading"> + + + + + @@ -166,49 +182,49 @@ export default { title: this.$t('enterpriseStandardLibrary.plan.authDepartment'), align: 'center', width: 180, - dataIndex: 'authDeparts', + dataIndex: 'authDept_dictText', scopedSlots: { customRender: 'text' } }, { // 企业标准代号 title: this.$t('enterpriseStandardLibrary.plan.enterpriseStandardCode'), align: 'center', width: 180, - dataIndex: 'enStandardCode', + dataIndex: 'enStandardCode_dictText', scopedSlots: { customRender: 'text' } }, { // 配合单位 title: this.$t('enterpriseStandardLibrary.plan.suitUnit'), align: 'center', width: 180, - dataIndex: 'cooperateDeparts', + dataIndex: 'cooperationUnit_dictText', scopedSlots: { customRender: 'text' } }, { // 主起草人 title: this.$t('enterpriseStandardLibrary.plan.principalDrafter'), align: 'center', width: 180, - dataIndex: 'mainDraftingUser', + dataIndex: 'mainDraftingUser_dictText', scopedSlots: { customRender: 'text' } }, { // 主起草单位 title: this.$t('enterpriseStandardLibrary.plan.mainDraftingUnit'), align: 'center', width: 180, - dataIndex: 'mainDraftingUnit', + dataIndex: 'mainDraftingUnit_dictText', scopedSlots: { customRender: 'text' } }, { // 主起草单位负责人 title: this.$t('enterpriseStandardLibrary.plan.headOfMainDraftingUnit'), align: 'center', width: 180, - dataIndex: 'mainDraftingUnitResponsiblePerson', + dataIndex: 'mainDraftingUnitResponsiblePerson_dictText', scopedSlots: { customRender: 'text' } }, { // 标准推进人 title: this.$t('enterpriseStandardLibrary.plan.standardPusher'), align: 'center', width: 180, - dataIndex: 'standardPromoter', + dataIndex: 'standardPromoter_dictText', scopedSlots: { customRender: 'text' } }, { // 草稿计划完成日期 @@ -265,6 +281,15 @@ export default { } }) }, + // 企标编号,企标名称跳转详情,原企标 + handleGoDetailOld (record) { + this.$openPageNewSheet({ + path: '/enterpriseStandardLibrary/enterpriseStandardDetail', + query: { + standardNumber: record.originEnStandardNo + } + }) + }, // 获取表格数据 replacePage () { const query = { @@ -317,6 +342,6 @@ export default { } - diff --git a/src/components/selection/StandardSelectionModal.vue b/src/components/selection/StandardSelectionModal.vue index eda1d2cf..ddd0d105 100644 --- a/src/components/selection/StandardSelectionModal.vue +++ b/src/components/selection/StandardSelectionModal.vue @@ -47,6 +47,12 @@ :row-selection="{ type: type, selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :loading="loading" @change="handleTableChange"> + diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue index b20cfd3f..a4f68f7b 100644 --- a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue +++ b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue @@ -239,7 +239,11 @@ export default { }, mounted () { if (this.$route.query.taskId) { + // 有流程id说明是从流程中心来的,需要初始化数据 this.getProcessData(this.$route.query.taskId) + } else { + // 没有taskId说明是新建进来的,初始化人员信息 + this.personnelInfoData = personData } // 如果是查看进入的,不可编辑,不可操作 if (this.$route.query.onlyLook) { diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue index 8cff7b5f..d72c86f2 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue @@ -148,6 +148,7 @@ ref="changeBaseInfo" :disabled="disabled" @processNameChange="processNameChange" + :currentNode="currentNode" :projectType="formInline.projectType" > @@ -164,18 +165,18 @@ - - - + + + - - - + + + !!v)) { this.$message.warning(this.$t('pleaseEnterPersonnelInfo')) @@ -947,8 +957,10 @@ export default { this.approvalInfoForm.validateFields((approvalErr, approvalValues) => { if (!err && !approvalErr) { this.loading = true - const param = Object.assign({}, values, approvalValues) - param.taskId = this.$route.query.taskId + const param = {} + param.common = Object.assign({}, approvalValues) + param.common.taskId = this.$route.query.taskId + param.flowUser = Object.assign({}, values) enterprisePlanApprovalAgree(param).then(res => { if (res.success) { this.$message.success(res.message) @@ -991,22 +1003,35 @@ export default { // 同意 handleAgree () { if (this.loading) return + const param = {} // 需要传给后端的数据 this.approvalInfoForm.validateFields((err, values) => { - if (!err) { - this.loading = true - const param = {} - param.common = Object.assign({}, values) - param.common.taskId = this.$route.query.taskId - enterprisePlanApprovalAgree(param).then(res => { - if (res.success) { - this.$message.success(res.message) - } else { - this.$message.warning(res.message) + if (this.formInline.projectType === this.ProjectType.RESPONSIBLE_DEPT_CHANGE.value && this.currentNode === 5) { + // 责任部门变更,节点5需要校验业务基本信息的必填,新起草单位负责人就是新起草部门主管级上一级领导 + this.$refs.changeBaseInfo.$refs.ruleForm.validate(valid => { + if (!err && valid) { + // 校验完成 + param.common = Object.assign({}, values) + param.common.taskId = this.$route.query.taskId + param.dataList = [this.$refs.changeBaseInfo.formInline] + param.flowUser = { newMainDraftUserLeaderLeader: this.$refs.changeBaseInfo.formInline.newMainDraftingUnitResponsiblePerson } } - }).finally(() => { - this.loading = false }) + } else { + if (!err) { + param.common = Object.assign({}, values) + param.common.taskId = this.$route.query.taskId + } } + this.loading = true + enterprisePlanApprovalAgree(param).then(res => { + if (res.success) { + this.$message.success(res.message) + } else { + this.$message.warning(res.message) + } + }).finally(() => { + this.loading = false + }) }) }, // 驳回 diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/DutyDepartChangeBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/DutyDepartChangeBaseInfo.vue index 7afa0e7e..13cb2842 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/modules/DutyDepartChangeBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/modules/DutyDepartChangeBaseInfo.vue @@ -86,47 +86,50 @@ type="radio" /> - +
- - {{ $t('workCenter.enterpriseInitChangePlan.principalDrafter') }} - + * + + {{ $t('workCenter.enterpriseInitChangePlan.newPrincipalDrafter') }} +
-
- +
- - {{ $t('workCenter.enterpriseInitChangePlan.mainDraftUnit') }} - + * + + {{ $t('workCenter.enterpriseInitChangePlan.newMainDraftUnit') }} +
- +
- - {{ $t('workCenter.enterpriseInitChangePlan.headOfMainDraftingUnit') }} - + * + + {{ $t('workCenter.enterpriseInitChangePlan.newHeadOfMainDraftingUnit') }} +
-
@@ -45,7 +44,6 @@ disabled v-model="formInline.originEnStandardName" :maxLength="50" - @change="event => event.target.value = event.target.value.trim()" :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardName')" /> @@ -274,10 +272,6 @@ export default { this.model = Object.assign({}, record) this.formInline = Object.assign({}, record) }, - // 企标计划选择完成的企标编号回调 - standardNumberChange (value) { - this.formInline.originEnStandardNo = value - }, // 企标选编号选择完成的回调 listChange (value) { // todo: 三个有校验的日期验证不会消失 @@ -285,6 +279,8 @@ export default { if (value && value.length > 0) { // this.$refs.ruleForm.clearValidate() const formInline = {} + // 企标编号 + formInline.originEnStandardNo = value[0].originEnStandardNo // 企标名称 formInline.originEnStandardName = value[0].originEnStandardName // 主起草人 diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue index ec4bbc53..d0935dec 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue @@ -125,6 +125,7 @@