From ef6c01830e7b31a7c01224315be77727ddad841f Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Wed, 16 Mar 2022 17:26:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/documentManage/tags/dialog/areaManage.vue    |  2 +-
 .../src/views/documentManage/tags/dialog/dicList.vue   | 10 ++++++++--
 .../src/views/documentManage/tags/dialog/treeTable.vue |  4 +++-
 .../src/views/documentManage/tags/tabs/tagContent.vue  |  6 ++++--
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/views/documentManage/tags/dialog/areaManage.vue b/jero-web/src/views/documentManage/tags/dialog/areaManage.vue
index 9c43e4393..9ba82221d 100644
--- a/jero-web/src/views/documentManage/tags/dialog/areaManage.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/areaManage.vue
@@ -125,7 +125,7 @@
             title: this.$t('Module'),
             align: "center",
             width: 100,
-            dataIndex: 'isModel_dictText',
+            dataIndex: 'isModelName',
           },
           {
             title: this.$t('SortNumber'),
diff --git a/jero-web/src/views/documentManage/tags/dialog/dicList.vue b/jero-web/src/views/documentManage/tags/dialog/dicList.vue
index e9a740151..b2b2cb370 100644
--- a/jero-web/src/views/documentManage/tags/dialog/dicList.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/dicList.vue
@@ -356,7 +356,9 @@
           content: '',
           onOk:
             async () => {
-              deleteAction(`sys/dictItem/delete`, params).then(res => {
+            //sys/dictItem/logicDelete
+              // sys/dictItem/delete
+              deleteAction(`sys/dictItem/logicDelete`, params).then(res => {
                 if(res.success) {
                   this.$message.success(this.$t('OperationSuccessful'));
                   if(this.tableData&&this.tableData.length==1&&this.queryParams.pageNo!=1){
@@ -391,6 +393,7 @@
             onOk:
               async () => {
                 if(this.dictVal=='list'){
+                  //  sys/dictItem/logicDeleteBatch
                   deleteAction(`sys/dictItem/logicDeleteBatch`, params).then(res => {
                     if(res.success){
                       this.$message.success(this.$t('OperationSuccessful'))
@@ -404,7 +407,10 @@
                     }
                   })
                 }else if(this.dictVal=='tree'){
-                  deleteAction(`sys/category/deleteBatch`, params).then(res => {
+                  // sys/category/deleteBatch
+                  // sys/category/logicDeleteBatch
+
+                  deleteAction(`sys/category/logicDeleteBatch`, params).then(res => {
                     if(res.success){
                       this.queryParams.pageNo=1
                       this.loadData()
diff --git a/jero-web/src/views/documentManage/tags/dialog/treeTable.vue b/jero-web/src/views/documentManage/tags/dialog/treeTable.vue
index 162319e1d..c9c5a2bb5 100644
--- a/jero-web/src/views/documentManage/tags/dialog/treeTable.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/treeTable.vue
@@ -131,7 +131,9 @@
           content: '',
           onOk:
             async () => {
-              deleteAction(`sys/category/delete`, { id: val.id }).then((res) => {
+            // sys/category/delete
+              //  sys/category/logicDelete
+              deleteAction(`sys/category/logicDelete`, { id: val.id }).then((res) => {
                 if (res.success) {
                   this.$message.success(this.$t('OperationSuccessful'));
                   this.$emit('ok',this.queryParams)
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
index 9961db2dc..c32e55b23 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
@@ -125,7 +125,7 @@
             title: this.$t('LabelType'),
             align: "center",
             width: 100,
-            dataIndex: 'attributeType_dictText',
+            dataIndex: 'attributeTypeName',
           },
           {
             title: this.$t('describe'),
@@ -175,7 +175,9 @@
           ...this.queryParams,
           isTagDict:1,
         }
-        getAction(`sys/dict/page`,params).then(res=>{
+        //  sys/dict/tagDictPage
+        //  sys/dict/page
+        postAction(`sys/dict/tagDictPage`,params).then(res=>{
           if(res.success){
             this.total=res.result.total
             this.tableData=[...res.result.records]