From 448549b6490c91dc4a2a1e86c31ff0d7788d6e3b Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Tue, 8 Mar 2022 12:07:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=A1=B9=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../documentManage/tags/dialog/dicList.vue    | 49 +++++++++++++------
 .../documentManage/tags/dialog/treeTable.vue  |  2 +-
 .../documentManage/tags/tabs/tagContent.vue   |  8 +--
 .../documentManage/tags/tabs/tagItem.vue      |  2 +-
 4 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/jero-web/src/views/documentManage/tags/dialog/dicList.vue b/jero-web/src/views/documentManage/tags/dialog/dicList.vue
index f51360e11..5b21c47cc 100644
--- a/jero-web/src/views/documentManage/tags/dialog/dicList.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/dicList.vue
@@ -36,7 +36,10 @@
             :label-col="labelCol"
             :wrapper-col="wrapperCol"
           >
-            <a-form-model-item :label="$t('name')" prop="name">
+            <a-form-model-item :label="$t('name')" prop="itemText" v-if="dictVal=='list'">
+              <a-input v-model="form.itemText" :placeholder="$t('enterName')" />
+            </a-form-model-item>
+            <a-form-model-item :label="$t('name')" prop="name" v-if="dictVal=='tree'">
               <a-input v-model="form.name" :placeholder="$t('enterName')" />
             </a-form-model-item>
             <a-form-model-item :label="$t('DataValue')" prop="itemValue">
@@ -102,6 +105,10 @@
         newVisible:false,
         rules:{
           name:[
+            { required: true, message: this.$t('enterName'), trigger: 'blur' },
+            { min:1, max: 30, message: this.$t('charactersLength130'), trigger: 'blur' },
+          ],
+          itemText:[
               { required: true, message: this.$t('enterName'), trigger: 'blur' },
               { min:1, max: 30, message: this.$t('charactersLength130'), trigger: 'blur' },
             ],
@@ -127,17 +134,36 @@
         total:0,
         isEdit:false,
         selectedIds:[],  //树形选中的id
-        parentData:[]
+        parentData:[],
+        editPId:'',
+        tabletreeDataSource:[]
       }
     },
     watch: {
       parentName(value) {
         console.log(value);
       },
+      editPId(){
+        this.parentData=this.getParents
+      },
     },
     mounted() {
       this.loadData()
     },
+    computed:{
+      //获取父级名称
+      getParents(){
+        let parents=[]
+        if(this.tabletreeDataSource&&this.tabletreeDataSource.length>0){
+          this.tabletreeDataSource.forEach((item)=>{
+          if(item.pid=='0'&&item.id!=this.editPId){
+            parents.push(item)
+          }
+        })
+        }
+        return parents
+      },
+    },
     methods:{
       //获取列表数据
       loadData(){
@@ -164,25 +190,16 @@
             isTagDict:1
           }).then(res=>{
             let parentNode=[]
-            let tabletreeData=[...res.result]
-            let data = this.toTree(tabletreeData)
+            this.tabletreeDataSource=[...res.result]
+            let data = this.toTree(this.tabletreeDataSource)
             this.tabletreeData=data
-            this.parentData=this.getParents(tabletreeData)
+            this.parentData=this.getParents
             this.dataFlag=true
           })
         }
         
       },
-      //获取父级名称
-      getParents(data){
-        let parents=[]
-        data.forEach((item)=>{
-          if(item.pid=='0'){
-            parents.push(item)
-          }
-        })
-        return parents
-      },
+
       //将数据拼成树形结构
       toTree(config) {
         config.forEach(function(item) {
@@ -313,6 +330,8 @@
       //树状编辑
       editTreeDict(val,form){
         this.title=this.$t('edit')
+        this.editPId=form.id
+        // console.log('dictId',form)
         this.isEdit=true
         this.form={...form}
         if(form.pid=='0'){
diff --git a/jero-web/src/views/documentManage/tags/dialog/treeTable.vue b/jero-web/src/views/documentManage/tags/dialog/treeTable.vue
index 49ce0b94c..cff272d13 100644
--- a/jero-web/src/views/documentManage/tags/dialog/treeTable.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/treeTable.vue
@@ -133,7 +133,7 @@
               deleteAction(`sys/category/delete`, { id: val.id }).then((res) => {
                 if (res.success) {
                   this.$message.success(this.$t('OperationSuccessful'));
-                  this.$emit('ok')
+                  this.$emit('ok',this.queryParams)
                 }else{
                   this.$message.warning(this.$t('operationFailed'));
                 }
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
index 03933dc65..009fcce30 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
@@ -111,8 +111,8 @@
         columns: [
           {
             title: this.$t('LabelName'),
-            dataIndex: 'dict_name',
-            key: 'dict_name',
+            dataIndex: 'dictName',
+            key: 'dictName',
             align: "center",
             width: 100,
           },
@@ -120,7 +120,7 @@
             title: this.$t('LabelType'),
             align: "center",
             width: 100,
-            dataIndex: 'attribute_type_name',
+            dataIndex: 'attributeType_dictText',
           },
           {
             title: this.$t('describe'),
@@ -170,7 +170,7 @@
         getAction(`sys/dict/page`,params).then(res=>{
           if(res.success){
             this.total=res.result.total
-            this.tableData=[...res.result]
+            this.tableData=[...res.result.records]
           }
         })
       },
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
index b1c88bf65..f509e5dbb 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
@@ -118,7 +118,7 @@
             title: this.$t('DisplayArea'),
             align: "center",
             width: 80,
-            dataIndex: 'showAreaName_dictText'
+            dataIndex: 'showAreaName'
           },
           {
             title: this.$t('operation'),