From 3052c91143a3cdf820f2468ce48ecdafb3bf8077 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Fri, 19 Jul 2024 15:00:35 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E6=80=A7=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=E5=8D=95=E7=BA=BF?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=92=8C=E4=B8=BB=E6=8E=92=E6=9F=A5=E4=BA=BA?= =?UTF-8?q?=E6=B1=87=E6=80=BB=E8=8A=82=E7=82=B9=E5=A2=9E=E5=8A=A0=E6=9D=A1?= =?UTF-8?q?=E6=AC=BE=E6=A0=87=E9=A2=98=E5=88=97=EF=BC=8C=E6=95=B4=E6=94=B9?= =?UTF-8?q?=E5=91=A8=E6=9C=9F=E6=94=B9=E6=88=90=E8=BE=93=E5=85=A5=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/NonmatchItemLookModal.vue | 8 ++++---- .../modules/DesignEngineerEvaluation.vue | 17 +++++++--------- .../modules/FinishAuditBaseInfo.vue | 2 +- .../modules/MainFinderCollectBaseInfo.vue | 9 ++++++++- .../modules/MainFinderCollectEditModal.vue | 9 ++++----- .../modules/MainFinderDistributesBaseInfo.vue | 20 ++++++++----------- .../modules/MainFinderSingleAuditBaseInfo.vue | 9 ++++++++- 7 files changed, 40 insertions(+), 34 deletions(-) diff --git a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemLookModal.vue b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemLookModal.vue index 82f8aa7..114d786 100644 --- a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemLookModal.vue +++ b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemLookModal.vue @@ -27,10 +27,10 @@ - + diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue index 4c1544d..175f19e 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue @@ -127,7 +127,7 @@ export default { 2: { // 不符合 rules: { // 整改周期 - correctionPeriod: { required: true, message: this.$t('pleaseSelect') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' }, + correctionPeriod: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' }, // 整改费用 correctionCost: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCost'), trigger: 'blur' }, // 共用后本项目所需费用 @@ -141,11 +141,10 @@ export default { }, formArr: [ { // 整改周期 - fieldShowType: 5, + fieldShowType: 4, dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), fieldMustInput: true, - dbFieldName: 'correctionPeriod', - dictCode: 'correction_period' + dbFieldName: 'correctionPeriod' }, { // 整改费用 fieldShowType: 4, @@ -202,7 +201,7 @@ export default { 4: { // 待验证 rules: { // 整改周期 - correctionPeriod: { required: true, message: this.$t('pleaseSelect') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' }, + correctionPeriod: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' }, // 整改费用 correctionCost: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCost'), trigger: 'blur' }, // 共用后本项目所需费用 @@ -216,11 +215,10 @@ export default { }, formArr: [ { // 整改周期 - fieldShowType: 5, + fieldShowType: 4, dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), fieldMustInput: true, - dbFieldName: 'correctionPeriod', - dictCode: 'correction_period' + dbFieldName: 'correctionPeriod' }, { // 整改费用 fieldShowType: 4, @@ -294,8 +292,7 @@ export default { this.dataSource[index].material = '' this.dataSource[index].unsatisfiedRequire = '' this.dataSource[index].correctionSolution = '' - this.dataSource[index].correctionPeriod = null - this.dataSource[index].correctionPeriod_dictText = '' + this.dataSource[index].correctionPeriod = '' this.dataSource[index].correctionCost = '' this.dataSource[index].commonality = '' this.dataSource[index].commonalityCost = '' diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue index 1e61c89..45fc631 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue @@ -128,7 +128,7 @@ export default { title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), align: 'center', width: 180, - dataIndex: 'correctionPeriod_dictText', + dataIndex: 'correctionPeriod', scopedSlots: { customRender: 'text' } }, { // 整改费用 diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue index 5b4b247..263be44 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue @@ -153,6 +153,13 @@ export default { dataIndex: 'termNumber', scopedSlots: { customRender: 'text' } }, + { // 条款标题 + title: this.$t('clauseTitle'), + align: 'center', + width: 180, + dataIndex: 'termTitle', + scopedSlots: { customRender: 'text' } + }, { // 条款内容 title: this.$t('clauseContent'), align: 'center', @@ -213,7 +220,7 @@ export default { title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), align: 'center', width: 180, - dataIndex: 'correctionPeriod_dictText', + dataIndex: 'correctionPeriod', scopedSlots: { customRender: 'text' } }, { // 整改费用 diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue index 3f6fd85..fcd2b0d 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue @@ -32,9 +32,9 @@