From bb5ecb6f273b2f5d3dfb16ed540f9e805af8e254 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 8 Aug 2024 16:05:38 +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=E6=8E=92=E6=9F=A5=E6=B5=81=E7=A8=8B=E5=92=8C=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E4=B8=AD=E4=B8=AD=E5=BF=83=E7=9A=84=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/JExpandTable.vue                 |  7 +++++++
 .../selection/StandardSelectionModal.vue        | 17 ++++++++++++++---
 .../workCenter/processCenter/table/DoneList.vue |  4 ++--
 .../processCenter/table/DraftList.vue           |  2 +-
 .../processCenter/table/MonitorList.vue         |  4 ++--
 .../workCenter/processCenter/table/SentList.vue |  4 ++--
 .../workCenter/processCenter/table/TodoList.vue |  2 +-
 .../modules/DesignEngineerEvaluation.vue        |  2 +-
 .../modules/EngineerInitBaseInfo.vue            |  5 +++--
 .../modules/FinishAuditBaseInfo.vue             |  4 ++--
 .../modules/InterfacePersonDeliveryBaseInfo.vue |  2 +-
 .../modules/MainFinderCollectBaseInfo.vue       |  4 ++--
 .../modules/MainFinderCollectEditModal.vue      |  1 +
 .../modules/MainFinderDistributesBaseInfo.vue   |  4 ++--
 .../modules/MainFinderSingleAuditBaseInfo.vue   |  4 ++--
 .../MainFinderTwiceDistributesBaseInfo.vue      |  2 +-
 .../modules/ManualAddModal.vue                  |  3 +++
 17 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/src/components/JExpandTable.vue b/src/components/JExpandTable.vue
index 8d8e596..b17e699 100644
--- a/src/components/JExpandTable.vue
+++ b/src/components/JExpandTable.vue
@@ -23,6 +23,13 @@
         <div class="table-text">{{ text || text === 0 ? text : global.emptyLine }}</div>
       </a-tooltip>
     </template>
+    <!--增加数据字典双语翻译的插槽-->
+    <template slot="dictText" slot-scope="text, record, index, column">
+      <a-tooltip overlay-class-name="tooltip-style">
+        <template slot="title">{{ (isChinese() ? text : record[column.key + 'En']) || (isChinese() ? text : record[column.key + 'En']) === 0 ? (isChinese() ? text : record[column.key + 'En']) : global.emptyLine }}</template>
+        <div class="table-text">{{ (isChinese() ? text : record[column.key + 'En']) || (isChinese() ? text : record[column.key + 'En']) === 0 ? (isChinese() ? text : record[column.key + 'En']) : global.emptyLine }}</div>
+      </a-tooltip>
+    </template>
     <!--  表格扩展插槽 -->
     <div slot="expandedRowRender" slot-scope="record, index" style="margin: 0">
       <!--   如果表单会依赖某个字段变化就需要加判断，循环判断extraForm中的表单  -->
diff --git a/src/components/selection/StandardSelectionModal.vue b/src/components/selection/StandardSelectionModal.vue
index e86408d..0b5dce8 100644
--- a/src/components/selection/StandardSelectionModal.vue
+++ b/src/components/selection/StandardSelectionModal.vue
@@ -82,8 +82,20 @@
         <!--  标准状态  -->
         <template slot="standardState" slot-scope="text, record">
           <a-tooltip overlay-class-name="tooltip-style">
-            <template slot="title">{{ record.source === '3' ? (record.esStandardState_dictText || global.emptyLine) : (record.standardState_dictText || global.emptyLine) }}</template>
-            <div class="table-text">{{ record.source === '3' ? (record.esStandardState_dictText || global.emptyLine) : (record.standardState_dictText || global.emptyLine) }}</div>
+            <template slot="title">
+              {{
+                record.source === '3' ?
+                  (isChinese() ? (record.esStandardState_dictText || global.emptyLine) : (record.esStandardState_dictTextEn || global.emptyLine)) :
+                  (isChinese() ? (record.standardState_dictText || global.emptyLine) : (record.standardState_dictTextEn || global.emptyLine))
+              }}
+            </template>
+            <div class="table-text">
+              {{
+                record.source === '3' ?
+                  (isChinese() ? (record.esStandardState_dictText || global.emptyLine) : (record.esStandardState_dictTextEn || global.emptyLine)) :
+                  (isChinese() ? (record.standardState_dictText || global.emptyLine) : (record.standardState_dictTextEn || global.emptyLine))
+              }}
+            </div>
           </a-tooltip>
         </template>
 
@@ -371,7 +383,6 @@ export default {
                 }
               }
             }
-
           } else {
             this.selectedRowList = []
           }
diff --git a/src/views/workCenter/processCenter/table/DoneList.vue b/src/views/workCenter/processCenter/table/DoneList.vue
index 83ca2f2..d24ae65 100644
--- a/src/views/workCenter/processCenter/table/DoneList.vue
+++ b/src/views/workCenter/processCenter/table/DoneList.vue
@@ -97,7 +97,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'prcType_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 流程名称
           title: this.$t('processName'),
@@ -140,7 +140,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'prcStatus_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         {
           title: this.$t('operation'),
diff --git a/src/views/workCenter/processCenter/table/DraftList.vue b/src/views/workCenter/processCenter/table/DraftList.vue
index 7565617..cddab45 100644
--- a/src/views/workCenter/processCenter/table/DraftList.vue
+++ b/src/views/workCenter/processCenter/table/DraftList.vue
@@ -75,7 +75,7 @@ export default {
           align: 'center',
           width: 300,
           dataIndex: 'prcType_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 流程名称
           title: this.$t('processName'),
diff --git a/src/views/workCenter/processCenter/table/MonitorList.vue b/src/views/workCenter/processCenter/table/MonitorList.vue
index d074bf2..75a9069 100644
--- a/src/views/workCenter/processCenter/table/MonitorList.vue
+++ b/src/views/workCenter/processCenter/table/MonitorList.vue
@@ -113,7 +113,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'prcType_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 流程名称
           title: this.$t('processName'),
@@ -162,7 +162,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'prcStatus_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         {
           title: this.$t('operation'),
diff --git a/src/views/workCenter/processCenter/table/SentList.vue b/src/views/workCenter/processCenter/table/SentList.vue
index 7cffe36..fe0cabe 100644
--- a/src/views/workCenter/processCenter/table/SentList.vue
+++ b/src/views/workCenter/processCenter/table/SentList.vue
@@ -117,7 +117,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'prcType_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 流程名称
           title: this.$t('processName'),
@@ -160,7 +160,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'prcStatus_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         {
           title: this.$t('operation'),
diff --git a/src/views/workCenter/processCenter/table/TodoList.vue b/src/views/workCenter/processCenter/table/TodoList.vue
index 3b28610..059da6a 100644
--- a/src/views/workCenter/processCenter/table/TodoList.vue
+++ b/src/views/workCenter/processCenter/table/TodoList.vue
@@ -112,7 +112,7 @@ export default {
           align: 'center',
           width: 260,
           dataIndex: 'prcType_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 流程名称
           title: this.$t('processName'),
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue
index ddf58ac..8de3b42 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue
@@ -106,7 +106,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'modelStatus_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 评价结果
           title: this.$t('workCenter.regulatoryComplianceCheckProcess.evaluationResult'),
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue
index 0be86c0..20cec26 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue
@@ -337,7 +337,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'standardState_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 分解单来源
           title: this.$t('workCenter.regulatoryComplianceCheckProcess.decompositionSingleSource'),
@@ -445,7 +445,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'modelStatus_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 责任部门
           title: this.$t('responsibleDepartment'),
@@ -629,6 +629,7 @@ export default {
             // 标准状态
             obj.standardState = result.standard_state
             obj.standardState_dictText = result.standard_state_dictText
+            obj.standardState_dictTextEn = result.standard_state_dictTextEn
             // 分解单来源初始化成不带入
             obj.splitFileSource = DecompositionSource.NO_INPUT.value
             // 新生产车实施日期
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue
index 4496df1..1c22d77 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue
@@ -99,7 +99,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'modelStatus_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 责任部门
           title: this.$t('responsibleDepartment'),
@@ -120,7 +120,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'result_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 不满足要求的现状
           title: this.$t('workCenter.regulatoryComplianceCheckProcess.theStatusNotMeetRequirements'),
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/InterfacePersonDeliveryBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/InterfacePersonDeliveryBaseInfo.vue
index 749c2d8..bcf635f 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/InterfacePersonDeliveryBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/InterfacePersonDeliveryBaseInfo.vue
@@ -138,7 +138,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'modelStatus_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         }
       ],
       dataSource: [],
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue
index 8085464..72c31ef 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue
@@ -190,7 +190,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'modelStatus_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 责任部门
           title: this.$t('responsibleDepartment'),
@@ -211,7 +211,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'result_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 不满足要求的现状
           title: this.$t('workCenter.regulatoryComplianceCheckProcess.theStatusNotMeetRequirements'),
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue
index fcd2b0d..a08e0d4 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectEditModal.vue
@@ -172,6 +172,7 @@ export default {
     resultChange (value) {
       this.model.result = value
       this.model.result_dictText = this.$refs.resultRef.dictOptions.find(item => item.value === value).text
+      this.model.result_dictTextEn = this.$refs.resultRef.dictOptions.find(item => item.value === value).enText
       // 清空备注和佐证材料,不满足要求的现状,整改方案,整改周期,整改费用,与其他项目共用性,共用后本项目所需费用
       this.model.remark = ''
       this.model.material = ''
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue
index 5bf5f99..6fee15a 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue
@@ -322,7 +322,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'modelStatus_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 设计工程师
           title: this.$t('designEngineer'),
@@ -376,7 +376,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'modelStatus_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 评价结果
           title: this.$t('workCenter.regulatoryComplianceCheckProcess.evaluationResult'),
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue
index 1bcdfca..91977d5 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue
@@ -113,7 +113,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'modelStatus_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 责任部门
           title: this.$t('responsibleDepartment'),
@@ -134,7 +134,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'result_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 不满足要求的现状
           title: this.$t('workCenter.regulatoryComplianceCheckProcess.theStatusNotMeetRequirements'),
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderTwiceDistributesBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderTwiceDistributesBaseInfo.vue
index 69f44db..73c741d 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderTwiceDistributesBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderTwiceDistributesBaseInfo.vue
@@ -116,7 +116,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'modelStatus_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         },
         { // 设计工程师
           title: this.$t('designEngineer'),
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/ManualAddModal.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/ManualAddModal.vue
index a06355e..7d79969 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/ManualAddModal.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/ManualAddModal.vue
@@ -147,6 +147,7 @@ export default {
       const valueArr = value.split(this.$refs.standardState.spliter)
       const arr = this.$refs.standardState.dictOptions.filter(item => valueArr.includes(item.value))
       this.model.standardState_dictText = arr.map(item => item.title).join(',')
+      this.model.standardState_dictTextEn = arr.map(item => item.enText).join(',')
     },
     // 上传拆解单文件改变
     splitFileChange (value) {
@@ -166,6 +167,8 @@ export default {
           const isEdit = this.model.standardNumber
           const formData = Object.assign(values)
           formData.splitFile_dictText = this.model.splitFile_dictText
+          formData.standardState_dictText = this.model.standardState_dictText
+          formData.standardState_dictTextEn = this.model.standardState_dictTextEn
           this.$emit('ok', formData, isEdit)
           this.confirmLoading = false
           this.close()