From 564779ba68d2ec966e57cafb5ae74d6c944e4f47 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 8 Aug 2024 11:48:46 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=E5=BA=93=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/customField/AddForm.vue                 |  7 ++++---
 .../standard/modules/AllocationStandardDrawer.vue      | 10 +++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue
index 38e8f2f..61e390b 100644
--- a/src/components/customField/AddForm.vue
+++ b/src/components/customField/AddForm.vue
@@ -114,7 +114,7 @@
                   tree-checkable
                   treeCheckStrictly
                   dropdownMatchSelectWidth
-                  :replaceFields="{title: isChinese() ? 'title' : 'enTitle'}"
+                  :replaceFields="notNeedEnTitleTreeField.includes(item.dbFieldName) ? null : {title: isChinese() ? 'title' : 'enTitle'}"
                   :placeholder="$t('pleaseSelect')+item.dbFieldTxt" />
                 <!--  14, 年份选择 -->
                 <j-date v-else-if="item.fieldShowType === FieldType.YEAR_PICKER.value"
@@ -132,7 +132,7 @@
                                :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
                                :tree-data="optionsData[item.dbFieldName]"
                                :label-in-value="false"
-                               :replaceFields="{title: isChinese() ? 'title' : 'enTitle'}"
+                               :replaceFields="notNeedEnTitleTreeField.includes(item.dbFieldName) ? null : {title: isChinese() ? 'title' : 'enTitle'}"
                                :placeholder="$t('pleaseSelect')+item.dbFieldTxt" />
                 <!--16、树形弹框选择-->
                 <tree-selection v-else-if="item.fieldShowType === FieldType.TREE_MODAL_SELECT.value || item.fieldShowType === FieldType.TREE_MODAL_SELECT_SEARCH_DIFF.value"
@@ -341,7 +341,8 @@ export default {
       dictNotCodes: ['name_code'], // 用到字典的字段不传dictCode的字段
       filePerm: { // 上传文件根据权限控制只能查看，没有权限的除了系统管理员外不可见不可下载
         associated_file: 'enterpriseStandard:associatedFile:look' // 关联文件
-      }
+      },
+      notNeedEnTitleTreeField: ['standard_system'] // 树形不需要enTitle判断的字段,暂时只有结构树不需要
     }
   },
   watch: {
diff --git a/src/views/enterpriseStandardLibrary/standard/modules/AllocationStandardDrawer.vue b/src/views/enterpriseStandardLibrary/standard/modules/AllocationStandardDrawer.vue
index 46197c2..fb24435 100644
--- a/src/views/enterpriseStandardLibrary/standard/modules/AllocationStandardDrawer.vue
+++ b/src/views/enterpriseStandardLibrary/standard/modules/AllocationStandardDrawer.vue
@@ -51,6 +51,14 @@
           </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>
+
       </a-table>
     </div>
 
@@ -128,7 +136,7 @@ export default {
           dataIndex: 'esStandardState_dictText',
           align: 'center',
           width: 120,
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'dictText' }
         }
       ],
       dataList: [],