From b0a6c9cea68bc5495e36e00e2cdf9d7dbb4552fa Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Mon, 28 Feb 2022 18:17:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=86=85=E5=AE=B9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../documentManage/tags/tabs/tagContent.vue   | 27 +++++++++----------
 .../documentManage/tags/tabs/tagItem.vue      |  2 +-
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
index b8dd7f3c4..57b98180b 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
@@ -54,15 +54,16 @@
       <a-table bordered :data-source="tableData" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" class="tag-con-table">
 
         <template slot="action" slot-scope="text, record">
-          <a-popover placement="right" v-model="typeVisible[record.id]" trigger="click">
-            <template slot="content"  class="type-popover-content">
-              <div class="type-popover">
-                <p class="type type-input" @click="handleDicPop(record,'list')">下拉选择</p>
-                <p class="type type-select" @click="handleDicPop(record,'tree')">树状结构</p>
-              </div>
-            </template>
-            <a class="action-dict" href="javascript:;">字典配置</a>
-          </a-popover>
+          <a class="action-dict" href="javascript:;" @click="handleDicPop(record)">字典配置</a>
+<!--          <a-popover placement="right" v-model="typeVisible[record.id]" trigger="click">-->
+<!--            <template slot="content"  class="type-popover-content">-->
+<!--              <div class="type-popover">-->
+<!--                <p class="type type-input" @click="handleDicPop(record,'list')">下拉选择</p>-->
+<!--                <p class="type type-select" @click="handleDicPop(record,'tree')">树状结构</p>-->
+<!--              </div>-->
+<!--            </template>-->
+<!--            <a class="action-dict" href="javascript:;">字典配置</a>-->
+<!--          </a-popover>-->
           <a class="action-edit" href="javascript:;" @click="actionEdit(record)">编辑</a>
           <a-popconfirm
             v-if="tableData.length"
@@ -295,15 +296,13 @@
         this.contentVisible=true
       },
       //字典配置
-      handleDicPop(record,val){
+      handleDicPop(record){
         this.record=record
-        this.dictVal=val
-        if(val=='list'){
+        if(record.attributeType=='1'){
           this.typeVisible[record.id]=false
           this.dicVisible=true
 
-
-        }else if(val == 'tree'){
+        }else{
           this.typeVisible[record.id]=false
           this.dicVisible=true
 
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
index 4aa7f9d1a..93c57d5f3 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
@@ -132,7 +132,7 @@
             title: '英文名称',
             align: "center",
             width: 100,
-            dataIndex: 'dbFieldName',
+            dataIndex: 'dbFieldEnName',
           },
           {
             title: '属性类型',