From 1ceed7e8561aa796b46e3f1c9a454234f1a73246 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Fri, 10 Nov 2023 10:13:52 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=E7=AB=8B=E9=A1=B9?= =?UTF-8?q?=EF=BC=8C=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnterprisePlanSelectionModal.vue | 32 +++++++++++++++++++ .../PlanApprovalChangeFlow.vue | 3 -- .../modules/DutyDepartChangeBaseInfo.vue | 4 +-- .../FinishTimeChangeBaseInfoDrawer.vue | 4 +-- .../modules/JobEndBaseInfoDrawer.vue | 8 ++--- .../modules/MergeBaseInfo.vue | 18 ++++------- 6 files changed, 44 insertions(+), 25 deletions(-) diff --git a/src/components/selection/EnterprisePlanSelectionModal.vue b/src/components/selection/EnterprisePlanSelectionModal.vue index 059baf25..445752a4 100644 --- a/src/components/selection/EnterprisePlanSelectionModal.vue +++ b/src/components/selection/EnterprisePlanSelectionModal.vue @@ -96,6 +96,15 @@ + + + @@ -171,6 +180,13 @@ export default { dataIndex: 'originEnStandardNo', scopedSlots: { customRender: 'toDetailOld' } }, + { // 新企标编号 + title: this.$t('enterpriseStandardLibrary.plan.newEnterpriseStandardNum'), + align: 'center', + width: 180, + dataIndex: 'newEnStandardNo', + scopedSlots: { customRender: 'toDetailNew' } + }, { // 原企标名称 title: this.$t('enterpriseStandardLibrary.plan.oldEnterpriseStandardName'), align: 'center', @@ -178,6 +194,13 @@ export default { dataIndex: 'originEnStandardName', scopedSlots: { customRender: 'toDetailOld' } }, + { // 新企标名称 + title: this.$t('enterpriseStandardLibrary.plan.newEnterpriseStandardName'), + align: 'center', + width: 180, + dataIndex: 'newEnStandardName', + scopedSlots: { customRender: 'toDetailNew' } + }, { // 授权部门 title: this.$t('enterpriseStandardLibrary.plan.authDepartment'), align: 'center', @@ -290,6 +313,15 @@ export default { } }) }, + // 新企标点击跳转企标详情 + handleGoDetailNew (record) { + this.$openPageNewSheet({ + path: '/enterpriseStandardLibrary/enterpriseStandardDetail', + query: { + standardNumber: record.newEnStandardNo + } + }) + }, // 获取表格数据 replacePage () { const query = { diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue index da8eccf8..643c844a 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue @@ -981,9 +981,6 @@ export default { }) } }) - }, - goBack () { - this.$router.go(-1) } } } diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/DutyDepartChangeBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/DutyDepartChangeBaseInfo.vue index cb1ac098..35b66462 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/modules/DutyDepartChangeBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/modules/DutyDepartChangeBaseInfo.vue @@ -255,8 +255,8 @@ export default { console.log(value) if (value && value.length > 0) { const formInline = {} - formInline.originEnStandardNo = value[0].originEnStandardNo - formInline.originEnStandardName = value[0].originEnStandardName + formInline.originEnStandardNo = value[0].newEnStandardNo + formInline.originEnStandardName = value[0].newEnStandardName formInline.mainDraftingUser = value[0].mainDraftingUser formInline.mainDraftingUser_dictText = value[0].mainDraftingUser_dictText formInline.mainDraftingUnit = value[0].mainDraftingUnit diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfoDrawer.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfoDrawer.vue index 90c149df..b676f7a6 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfoDrawer.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfoDrawer.vue @@ -280,9 +280,9 @@ export default { // this.$refs.ruleForm.clearValidate() const formInline = {} // 企标编号 - formInline.originEnStandardNo = value[0].originEnStandardNo + formInline.originEnStandardNo = value[0].newEnStandardNo // 企标名称 - formInline.originEnStandardName = value[0].originEnStandardName + formInline.originEnStandardName = value[0].newEnStandardName // 主起草人 formInline.mainDraftingUser = value[0].mainDraftingUser formInline.mainDraftingUser_dictText = value[0].mainDraftingUser_dictText diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/JobEndBaseInfoDrawer.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/JobEndBaseInfoDrawer.vue index 868c02a8..a2938818 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/modules/JobEndBaseInfoDrawer.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/modules/JobEndBaseInfoDrawer.vue @@ -26,7 +26,6 @@ :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')" v-model="formInline.espId" :standard-number="formInline.originEnStandardNo" - @standardNumberChange="standardNumberChange" :searchParam="{ projectType: projectType }" @listChange="listChange"/> @@ -152,15 +151,12 @@ export default { this.model = Object.assign({}, record) this.formInline = Object.assign({}, record) }, - // 企标计划选择完成的企标编号回调 - standardNumberChange (value) { - this.formInline.originEnStandardNo = value - }, // 企标选编号选择完成的回调 listChange (value) { console.log(value) if (value && value.length > 0) { - this.formInline.originEnStandardName = value[0].originEnStandardName + this.formInline.originEnStandardNo = value[0].newEnStandardNo + this.formInline.originEnStandardName = value[0].newEnStandardName this.formInline.mainDraftingUser = value[0].mainDraftingUser this.formInline.mainDraftingUser_dictText = value[0].mainDraftingUser_dictText this.formInline.mainDraftingUnit = value[0].mainDraftingUnit diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue index d0935dec..a90d34eb 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue @@ -26,7 +26,6 @@ :standard-number="formInline.standardNoOne" :disabled="disabled" :searchParam="{ projectType: projectType, excludeIds: formInline.standardIdTwo }" - @standardNumberChange="standardNumberChangeOne" @listChange="listChangeOne"/> @@ -77,7 +76,6 @@ :disabled="disabled" :standard-number="formInline.standardNoTwo" :searchParam="{ projectType: projectType, excludeIds: formInline.standardIdOne }" - @standardNumberChange="standardNumberChangeTwo" @listChange="listChangeTwo"/> @@ -672,21 +670,15 @@ export default { this.$set(this.retractableFlag, module, !this.retractableFlag[module]) this.$forceUpdate() }, - // 企标计划1选择完成的企标编号回调 - standardNumberChangeOne (value) { - this.formInline.standardNoOne = value - }, - // 企标计划2选择完成的企标编号的回调 - standardNumberChangeTwo (value) { - this.formInline.standardNoTwo = value - }, // 企标选编号1选择完成的回调 listChangeOne (value) { console.log(value) if (value && value.length > 0) { const formInline = {} + // 企标编号1 + this.formInline.standardNoOne = value[0].newEnStandardNo || '' // 企标名称1 - formInline.standardNameOne = value[0].originEnStandardName || '' + formInline.standardNameOne = value[0].newEnStandardName || '' // 制修订类型1 formInline.projectTypeOne = value[0].applicationCategory || undefined // 新企标名称 @@ -733,8 +725,10 @@ export default { console.log(value) if (value && value.length > 0) { const formInline = {} + // 企标编号2 + this.formInline.standardNoTwo = value[0].newEnStandardNo // 企标名称2 - formInline.standardNameTwo = value[0].originEnStandardName + formInline.standardNameTwo = value[0].newEnStandardName // 制修订类型2 formInline.projectTypeTwo = value[0].applicationCategory this.formInline = Object.assign(this.formInline, formInline)