From ac88be2b7138a31e14d9ed8bbd9aa9d7ed13a87e Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Wed, 17 Jul 2024 14:09:33 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/JExpandTable.vue                    |  7 +++++++
 .../modules/DesignEngineerEvaluation.vue           | 14 ++++++++------
 .../modules/MainFinderDistributesBaseInfo.vue      | 14 ++++++++------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/components/JExpandTable.vue b/src/components/JExpandTable.vue
index 10485ac..1bc1b41 100644
--- a/src/components/JExpandTable.vue
+++ b/src/components/JExpandTable.vue
@@ -69,6 +69,13 @@
                     :disabled="allDisabled || form.isDisabled || (form.dynamicIsDisabled && form.dynamicIsDisabled(record)) || false"
                     v-model="record[form.dbFieldName]" />
                 </template>
+                <template v-else-if="form.fieldShowType === 5">
+                  <j-dict-select-tag
+                    :placeholder="$t('pleaseSelect')+form.dbFieldTxt"
+                    :dict-code="form.dictCode"
+                    :disabled="allDisabled || form.isDisabled || (form.dynamicIsDisabled && form.dynamicIsDisabled(record)) || false"
+                    v-model="record[form.dbFieldName]" />
+                </template>
               </a-form-model-item>
             </a-form-model>
           </template>
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue
index 6c9128f..f70d91b 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue
@@ -112,7 +112,7 @@ export default {
         2: { // 不符合
           rules: {
             // 整改周期
-            correctionCycle: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' },
+            correctionCycle: { required: true, message: this.$t('pleaseSelect') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' },
             // 整改费用
             correctionCost: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCost'), trigger: 'blur' },
             // 共用后本项目所需费用
@@ -126,10 +126,11 @@ export default {
           },
           formArr: [
             { // 整改周期
-              fieldShowType: 4,
+              fieldShowType: 5,
               dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
               fieldMustInput: true,
-              dbFieldName: 'correctionCycle'
+              dbFieldName: 'correctionCycle',
+              dictCode: 'correction_period'
             },
             { // 整改费用
               fieldShowType: 4,
@@ -186,7 +187,7 @@ export default {
         4: { // 待验证
           rules: {
             // 整改周期
-            correctionCycle: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' },
+            correctionCycle: { required: true, message: this.$t('pleaseSelect') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' },
             // 整改费用
             correctionCost: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCost'), trigger: 'blur' },
             // 共用后本项目所需费用
@@ -200,10 +201,11 @@ export default {
           },
           formArr: [
             { // 整改周期
-              fieldShowType: 4,
+              fieldShowType: 5,
               dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
               fieldMustInput: true,
-              dbFieldName: 'correctionCycle'
+              dbFieldName: 'correctionCycle',
+              dictCode: 'correction_period'
             },
             { // 整改费用
               fieldShowType: 4,
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue
index ff00207..8be1f7c 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue
@@ -378,7 +378,7 @@ export default {
         2: { // 不符合
           rules: {
             // 整改周期
-            correctionCycle: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' },
+            correctionCycle: { required: true, message: this.$t('pleaseSelect') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' },
             // 整改费用
             correctionCost: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCost'), trigger: 'blur' },
             // 共用后本项目所需费用
@@ -392,10 +392,11 @@ export default {
           },
           formArr: [
             { // 整改周期
-              fieldShowType: 4,
+              fieldShowType: 5,
               dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
               fieldMustInput: true,
-              dbFieldName: 'correctionCycle'
+              dbFieldName: 'correctionCycle',
+              dictCode: 'correction_period'
             },
             { // 整改费用
               fieldShowType: 4,
@@ -452,7 +453,7 @@ export default {
         4: { // 待验证
           rules: {
             // 整改周期
-            correctionCycle: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' },
+            correctionCycle: { required: true, message: this.$t('pleaseSelect') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), trigger: 'blur' },
             // 整改费用
             correctionCost: { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCost'), trigger: 'blur' },
             // 共用后本项目所需费用
@@ -466,10 +467,11 @@ export default {
           },
           formArr: [
             { // 整改周期
-              fieldShowType: 4,
+              fieldShowType: 5,
               dbFieldTxt: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
               fieldMustInput: true,
-              dbFieldName: 'correctionCycle'
+              dbFieldName: 'correctionCycle',
+              dictCode: 'correction_period'
             },
             { // 整改费用
               fieldShowType: 4,