From 694e01305b28732c9bbae4f5541607b10a30a517 Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Sun, 6 Mar 2022 22:12:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tags/dialog/OnlCgformTagForm.vue          |  9 +++++++
 .../documentManage/tags/dialog/areaManage.vue | 10 ++++----
 .../documentManage/tags/tabs/tabTable.vue     |  4 +--
 .../documentManage/tags/tabs/tagContent.vue   |  2 +-
 .../documentManage/tags/tabs/tagItem.vue      | 25 +++++++++++--------
 5 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue b/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue
index 2eddcf29b..e0fd425aa 100644
--- a/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue
@@ -292,6 +292,15 @@
                 this.contentOption2.push(res)
               }
             })
+            if(this.form.fieldShowType==0){
+              this.contentOption=[...this.contentOption2]
+              this.isTagContent=true
+            }else if(this.form.fieldShowType==3||this.form.fieldShowType=='4'){
+              this.contentOption=[...this.contentOption1]
+              this.isTagContent=true
+            }else{
+              this.isTagContent=false
+            }
           }
         });
       },
diff --git a/jero-web/src/views/documentManage/tags/dialog/areaManage.vue b/jero-web/src/views/documentManage/tags/dialog/areaManage.vue
index 60e60503c..fb256919e 100644
--- a/jero-web/src/views/documentManage/tags/dialog/areaManage.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/areaManage.vue
@@ -111,8 +111,8 @@
         columns: [
           {
             title: this.$t('DisplayArea'),
-            dataIndex: 'showArea',
-            key: 'showArea',
+            dataIndex: 'show_area',
+            key: 'show_rea',
             align: "center",
             width: 100,
           },
@@ -120,13 +120,13 @@
             title: this.$t('enName'),
             align: "center",
             width: 100,
-            dataIndex: 'enName',
+            dataIndex: 'en_name',
           },
           {
             title: this.$t('Module'),
             align: "center",
             width: 100,
-            dataIndex: 'isModel_dictText',
+            dataIndex: 'item_text',
           },
           {
             title: this.$t('SortNumber'),
@@ -186,7 +186,7 @@
         }
         getAction(`tag/onlCgformArea/page`,params).then(res=>{
           if(res.success){
-            this.areaTable=res.result.records
+            this.areaTable=res.result
             this.total=res.result.total
           }
         })
diff --git a/jero-web/src/views/documentManage/tags/tabs/tabTable.vue b/jero-web/src/views/documentManage/tags/tabs/tabTable.vue
index 48c27d66d..e5c79ec4a 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tabTable.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tabTable.vue
@@ -11,8 +11,8 @@
       :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
       @change="handleTableChange">
       <span slot="action" slot-scope="text, record">
-          <a @click="editVisible(record.id)" v-if="record.isReadOnly==0">{{$t('edit')}}</a>
-          <a-divider type="vertical" v-if="record.isReadOnly==0" />
+          <a @click="editVisible(record.id)" v-if="!record.is_read_only">{{$t('edit')}}</a>
+          <a-divider type="vertical" v-if="!record.is_read_only" />
           <a class="table-del" @click="deleteVisible(record.id)">{{$t('delete')}}</a>
       </span>
     </a-table>
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
index aac8c62c4..009fcce30 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
@@ -51,7 +51,7 @@
         </a-form-model>
       </a-modal>
 
-      <a-table bordered :data-source="tableData" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" class="tag-con-table">
+      <a-table :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 class="action-dict" @click="handleDicPop(record)">{{$t('DictionaryConfiguration')}}</a>
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
index d4db2cdcc..f77443d22 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
@@ -87,37 +87,37 @@
             title: this.$t('ChineseName'),
             align: "center",
             width: 100,
-            dataIndex: 'dbFieldTxt',
+            dataIndex: 'db_field_txt',
           },
           {
             title: this.$t('enName'),
             align: "center",
             width: 100,
-            dataIndex: 'dbFieldEnName',
+            dataIndex: 'db_field_en_name',
           },
           {
             title: this.$t('AttributeType'),
             align: "center",
             width: 100,
-            dataIndex: 'fieldShowType_dictText',
+            dataIndex: 'field_show_type_dict_text',
           },
           {
             title: this.$t('FieldLength'),
             align: "center",
             width: 80,
-            dataIndex: 'dbLength'
+            dataIndex: 'db_length'
           },
           {
             title: this.$t('DisplayOrder'),
             align: "center",
             width: 80,
-            dataIndex: 'orderNum'
+            dataIndex: 'order_num'
           },
           {
             title: this.$t('DisplayArea'),
             align: "center",
             width: 80,
-            dataIndex: 'showArea_dictText'
+            dataIndex: 'show_area_dict_text'
           },
           {
             title: this.$t('operation'),
@@ -147,9 +147,12 @@
     },
     methods:{
       getHeader(){
-        getAction(`tag/onlCgformArea/getHeader`,{flag:3}).then(res=>{
-
-        })
+        // getAction(`tag/onlCgformTag/getHeader`,{flag:3}).then(res=>{
+        //
+        // })
+        // getAction(`tag/onlCgformTag/queryCondition`,{flag:3}).then(res=>{
+        //
+        // })
       },
       //获取展示区域
       loadShowArea(){
@@ -200,15 +203,15 @@
         }
         // console.log('params',params)
         if(val==1){
+          console.log('1')
           params.isModel=1
         }else if(val==0){
           params.isModel=0
         }
         getAction(`tag/onlCgformTag/page`,params).then(res=>{
           if(res.success){
-
             this.total=res.result.total
-            this.tableData= [ ...res.result.records]
+            this.tableData= [ ...res.result]
             this.spinning=false
           }
         })