From 2fbebce21fe579eb1d0db9577a9d5d9de32929d7 Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Thu, 3 Mar 2022 13:32:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E9=98=85=E9=A2=86=E5=9F=9F=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  2 +-
 jero-web/src/components/ocrTable/docTable.vue |  8 ++++
 .../src/views/documentManage/ocr/index.vue    |  1 +
 .../views/documentManage/splitting/index.vue  | 20 +++++-----
 .../subscribtion/module/subArea.vue           | 25 ++++++++++---
 .../documentManage/tags/dialog/areaManage.vue | 28 +++++++-------
 .../documentManage/tags/dialog/dicList.vue    | 25 ++++++++++---
 .../documentManage/tags/dialog/listTable.vue  |  8 +---
 .../documentManage/tags/dialog/treeTable.vue  | 24 ++++++++----
 .../documentManage/tags/tabs/tabTable.vue     |  9 +----
 .../documentManage/tags/tabs/tagContent.vue   | 37 ++++++++-----------
 .../documentManage/tags/tabs/tagItem.vue      | 31 +++++++++-------
 13 files changed, 127 insertions(+), 92 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index ab1d80c16..80afea7ab 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -399,5 +399,6 @@ module.exports = {
   DropDownType:'Drop down type',
   ExhibitionAreaManagement:'Exhibition area management',
   NewLabelItem:'New label item',
+  NodeQuickLookup:'Node quick lookup',
 
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index ece7144c6..6e8010dbb 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -403,5 +403,5 @@ module.exports = {
   DropDownType:'下拉选类型',
   ExhibitionAreaManagement:'展示区域管理',
   NewLabelItem:'新增标签项',
-
+  NodeQuickLookup:'节点快速查找',
 }
\ No newline at end of file
diff --git a/jero-web/src/components/ocrTable/docTable.vue b/jero-web/src/components/ocrTable/docTable.vue
index 03494269c..dce4b8bae 100644
--- a/jero-web/src/components/ocrTable/docTable.vue
+++ b/jero-web/src/components/ocrTable/docTable.vue
@@ -135,6 +135,14 @@
           if (res.success) {
             var jsonHead = res.result
             this.columns = []
+            this.columns.push(
+            {
+              title: this.$t('serialNumber'),
+              dataIndex: 'index',
+              key: 'index',
+              align: 'center',
+              customRender: (text,record,index) => `${index+1}`,
+            })
             jsonHead.forEach((res, index) => {
               this.columns.push({
                 title: res.db_field_txt,
diff --git a/jero-web/src/views/documentManage/ocr/index.vue b/jero-web/src/views/documentManage/ocr/index.vue
index f4ffb8b22..1ff62455a 100644
--- a/jero-web/src/views/documentManage/ocr/index.vue
+++ b/jero-web/src/views/documentManage/ocr/index.vue
@@ -290,6 +290,7 @@
         }
         postAction(`ocr/ocrRecord/syncToDocument`,params).then(res=>{
           if(res.success){
+            eventBUs.$emit('searchReset')
             this.$message.success(res.message)
             this.toVisible=false
           }else{
diff --git a/jero-web/src/views/documentManage/splitting/index.vue b/jero-web/src/views/documentManage/splitting/index.vue
index 503511256..afc4bc800 100644
--- a/jero-web/src/views/documentManage/splitting/index.vue
+++ b/jero-web/src/views/documentManage/splitting/index.vue
@@ -72,14 +72,14 @@
           }
         ],
         url: {
-          tableHeader: 'document/bussDocumentLibraryEO/getHeader',      //表格头部字段
-          seachList: 'document/bussDocumentLibraryEO/queryCondition',   //搜索字段
-          tableList: 'document/bussDocumentLibraryEO/queryPageInfo',         //表格数据
-          getAddForm: 'document/bussDocumentLibraryEO/getAddForm',   // 表单的字段
-          addInfo: 'document/bussDocumentLibraryEO/addInfo',      //新增
-          updateInfo: 'document/bussDocumentLibraryEO/updateInfo',   //编辑
-          getDocumentInfo: 'document/bussDocumentLibraryEO/getDocumentInfoById',   //查看
-          deleteBatch: 'document/bussDocumentLibraryEO/deleteBatch' //删除
+          // tableHeader: 'document/bussDocumentLibraryEO/getHeader',      //表格头部字段
+          // seachList: 'document/bussDocumentLibraryEO/queryCondition',   //搜索字段
+          // tableList: 'document/bussDocumentLibraryEO/queryPageInfo',         //表格数据
+          // getAddForm: 'document/bussDocumentLibraryEO/getAddForm',   // 表单的字段
+          // addInfo: 'document/bussDocumentLibraryEO/addInfo',      //新增
+          // updateInfo: 'document/bussDocumentLibraryEO/updateInfo',   //编辑
+          // getDocumentInfo: 'document/bussDocumentLibraryEO/getDocumentInfoById',   //查看
+          // deleteBatch: 'document/bussDocumentLibraryEO/deleteBatch' //删除
         }
       }
     },
@@ -111,7 +111,9 @@
       },
       //查看
       seeTable(){
-
+        this.$router.push({
+          path:'/docManage/splitting/splitDetail'
+        })
       },
       //删除
       deleteTable(val){
diff --git a/jero-web/src/views/documentManage/subscribtion/module/subArea.vue b/jero-web/src/views/documentManage/subscribtion/module/subArea.vue
index 4d927cc12..71049cf2e 100644
--- a/jero-web/src/views/documentManage/subscribtion/module/subArea.vue
+++ b/jero-web/src/views/documentManage/subscribtion/module/subArea.vue
@@ -1,15 +1,15 @@
 <template>
     <div class="sub-area">
       <a-modal
-        title="订阅领域管理"
+        :title="$t('SubscriptionManagement')"
         class="sub-area-modal"
         :visible="visible"
         :confirm-loading="confirmLoading"
-        :okText="'保存'"
+        :okText="$t('preservation')"
         @ok="handleOk"
         @cancel="handleCancel"
       >
-        <a-input-search v-model="searchValue" style="margin-bottom: 8px" placeholder="节点快速查找" @change="onChange" />
+        <a-input-search v-model="searchValue" style="margin-bottom: 8px" :placeholder="$t('NodeQuickLookup')" @change="onChange" />
         <a-tree
           v-if="treeData && treeData.length"
           v-model="checkedKeys"
@@ -104,7 +104,8 @@
         let params = {}
         getAction(`sys/category/getSysCategoryTree`,params).then(res=> {
           if(res.success){
-
+            let data=res.result
+            this.treeData=this.addAttr(data)
           }
         })
       },
@@ -116,6 +117,17 @@
           }
         })
       },
+      addAttr(dataI){
+        if((Array.isArray(dataI)) && dataI.length>0){
+          dataI.forEach((item,index)=>{
+            this.$set(item,'key',item.id)
+            let arr = [];
+            this.addAttr(item.children,arr);
+          });
+        }
+        // console.log('dataI',dataI)
+        return dataI
+      },
       afterVisibleChange(val) {
         console.log('visible', val);
       },
@@ -123,11 +135,14 @@
         this.confirmLoading = true;
 
         let params={
-
+          domainIdList:this.checkedKeys
         }
         postAction(`domain/domainUserRel/insert`,params).then(res=>{
           if(res.success){
             this.$emit('visible',false)
+            this.$message.success(res.result)
+          }else{
+            this.$message.warning(res.message)
           }
         })
       },
diff --git a/jero-web/src/views/documentManage/tags/dialog/areaManage.vue b/jero-web/src/views/documentManage/tags/dialog/areaManage.vue
index 194b3d201..0abff2d91 100644
--- a/jero-web/src/views/documentManage/tags/dialog/areaManage.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/areaManage.vue
@@ -72,13 +72,7 @@
       <span slot="action" slot-scope="text, record">
           <a @click="editArea(record.id)">编辑</a>
           <a-divider type="vertical" />
-         <a-popconfirm
-           v-if="areaTable.length"
-           title="确定删除?"
-           @confirm="() => deleteArea(record.id)"
-         >
-          <a style="color:red" href="javascript:;">删除</a>
-        </a-popconfirm>
+          <a style="color:red" href="javascript:;" @click=" deleteArea(record.id)">删除</a>
       </span>
     </a-table>
     <div class="page" v-if="areaTable.length > 0">
@@ -253,12 +247,20 @@
       },
       //删除按钮
       deleteArea(val){
-        deleteAction(`tag/onlCgformArea/delete`, {id: val}).then((res) => {
-          if(res.success){
-            this.$message.success(res.result);
-            this.loadData()
-
-          }
+        this.$confirm({
+          title: this.$t('ConfirmDelete'),
+          content: '',
+          onOk:
+            async () => {
+              deleteAction(`tag/onlCgformArea/delete`, { id: val }).then((res) => {
+                if (res.success) {
+                  this.$message.success(res.result);
+                  this.loadData()
+                }else{
+                  this.$message.warning(res.message);
+                }
+              })
+            }
         })
       },
       //编辑按钮
diff --git a/jero-web/src/views/documentManage/tags/dialog/dicList.vue b/jero-web/src/views/documentManage/tags/dialog/dicList.vue
index 6eb2f96dc..e369d5b2b 100644
--- a/jero-web/src/views/documentManage/tags/dialog/dicList.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/dicList.vue
@@ -24,7 +24,7 @@
         </div>
         <div class="dic-list-table">
           <list-table v-if="dictVal=='list'&&dataFlag" :tableData="tableData" @editDict="editDict" @deleteDict="deleteDict" :total="total"></list-table>
-          <tree-table v-if="dictVal=='tree'&&dataFlag" :tabletreeData="tabletreeData" :record="record" @editDict="editTreeDict" :total="total"></tree-table>
+          <tree-table v-if="dictVal=='tree'&&dataFlag" :tabletreeData="tabletreeData" :record="record" @editDict="editTreeDict" @ok="ok" :total="total"></tree-table>
         </div>
         <a-modal class="dict-module" v-model="newVisible" :title="titleDict" ok-text="保存" cancel-text="取消" @ok="hideModal" @cancel="cancelModel" v-if="newVisible">
           <a-form-model
@@ -340,20 +340,33 @@
         let params={
           id:val
         }
-         deleteAction(`sys/dictItem/delete`,params).then(res=>{
-            if(res.success){
-              this.loadData()
+        this.$confirm({
+          title: this.$t('ConfirmDelete'),
+          content: '',
+          onOk:
+            async () => {
+              deleteAction(`sys/dictItem/delete`, params).then(res => {
+                if(res.success) {
+                  this.$message.success(res.message);
+                  this.loadData()
+                }else{
+                  this.$message.warning(res.message);
+                }
+              })
             }
-         })
+        })
       },
       //批量删除
       batDelete(){
         let params={
 
         }
-        deleteAction(`sys/category/getChildListBatch`,params).then(res=>{
+        deleteAction(`sys/category/deleteBatch`,params).then(res=>{
 
         })
+      },
+      ok(){
+        this.loadData()
       }
     }
   }
diff --git a/jero-web/src/views/documentManage/tags/dialog/listTable.vue b/jero-web/src/views/documentManage/tags/dialog/listTable.vue
index 6ef68269e..acc1b638b 100644
--- a/jero-web/src/views/documentManage/tags/dialog/listTable.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/listTable.vue
@@ -4,13 +4,7 @@
 
         <template slot="action" slot-scope="text, record">
           <a class="action-edit" href="javascript:;" @click="actionEdit(record)">编辑</a>
-          <a-popconfirm
-            v-if="tableData.length"
-            title="Sure to delete?"
-            @confirm="() => onDelete(record)"
-          >
-            <a class="action-delete" href="javascript:;">删除</a>
-          </a-popconfirm>
+          <a class="action-delete" href="javascript:;" @click="onDelete(record)">删除</a>
         </template>
       </a-table>
       <div class="page" v-if="tableData.length > 0">
diff --git a/jero-web/src/views/documentManage/tags/dialog/treeTable.vue b/jero-web/src/views/documentManage/tags/dialog/treeTable.vue
index ee86ea85e..e80ba6c5f 100644
--- a/jero-web/src/views/documentManage/tags/dialog/treeTable.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/treeTable.vue
@@ -11,13 +11,7 @@
         >
           <template slot="action" slot-scope="text, record">
             <a class="action-edit" href="javascript:;" @click="actionEdit(record)">编辑</a>
-            <a-popconfirm
-              v-if="tabData.length"
-              title="确定删除?"
-              @confirm="() => onDelete(record)"
-            >
-              <a class="action-delete" href="javascript:;">删除</a>
-            </a-popconfirm>
+            <a class="action-delete" href="javascript:;" @click="onDelete(record)">删除</a>
           </template>
         </a-table>
       </div>
@@ -118,7 +112,21 @@
       },
       //删除
       onDelete(val){
-
+        this.$confirm({
+          title: this.$t('ConfirmDelete'),
+          content: '',
+          onOk:
+            async () => {
+              deleteAction(`sys/category/delete`, { id: val.id }).then((res) => {
+                if (res.success) {
+                  this.$message.success(res.message);
+                  this.$emit('ok')
+                }else{
+                  this.$message.warning(res.message);
+                }
+              })
+            }
+        })
       },
       //编辑
       actionEdit(val){
diff --git a/jero-web/src/views/documentManage/tags/tabs/tabTable.vue b/jero-web/src/views/documentManage/tags/tabs/tabTable.vue
index c13b519e9..52e96b8e2 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tabTable.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tabTable.vue
@@ -15,14 +15,7 @@
       <span slot="action" slot-scope="text, record">
           <a @click="editVisible(record.id)" v-if="record.isReadOnly==0">编辑</a>
           <a-divider type="vertical" v-if="record.isReadOnly==0" />
-        <a-popconfirm
-          v-if="tableData.length&&record.isReadOnly==0"
-          title="Sure to delete?"
-          @confirm="() => deleteVisible(record.id)"
-        >
-            <a class="table-del" href="javascript:;">删除</a>
-          </a-popconfirm>
-<!--          <a class="table-del" @click="deleteVisible(record.id)">删除</a>-->
+          <a class="table-del" @click="deleteVisible(record.id)">删除</a>
         </span>
     </a-table>
     <div class="page" v-if="tableData.length > 0">
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
index 76f0efb83..685710fd7 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
@@ -55,23 +55,8 @@
 
         <template slot="action" slot-scope="text, record">
           <a class="action-dict" @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" @click="actionEdit(record)">编辑</a>
-          <a-popconfirm
-            v-if="tableData.length"
-            title="Sure to delete?"
-            @confirm="() => onDelete(record)"
-          >
-            <a class="action-delete" href="javascript:;">删除</a>
-          </a-popconfirm>
+          <a class="action-delete" href="javascript:;" @click="onDelete(record)">删除</a>
         </template>
       </a-table>
       <div class="page" v-if="tableData.length > 0">
@@ -270,12 +255,20 @@
         let param={
           id:val.id
         }
-        // sys/dict/logicDelete
-        deleteAction(`sys/dict/logicDelete`,param).then(res=>{
-          if(res.success){
-            this.$message.success( res.message)
-            this.loadData()
-          }
+        this.$confirm({
+          title: this.$t('ConfirmDelete'),
+          content: '',
+          onOk:
+            async () => {
+              deleteAction(`sys/dict/logicDelete`, param).then(res => {
+                if (res.success) {
+                  this.$message.success(res.message)
+                  this.loadData()
+                }else{
+                  this.$message.warning(res.message);
+                }
+              })
+            }
         })
       },
       onSelectChange(selectedRowKeys) {
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
index dfa8ad075..464ecb8da 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
@@ -321,20 +321,25 @@
         let params={
           id:id
         }
-        // deleteAction(that.url.delete, {depId: this.currentDeptId, userId: id}).then((res) => {
-        //   if (res.success) {
-        //
-        //   }
-        // })
-        deleteAction(`tag/onlCgformTag/delete`,params).then(res=>{
-          if(res.success){
-
-            if(this.key==1){
-              this.loadData(1)
-            }else if(this.key==2){
-              this.loadData(0)
+        this.$confirm({
+          title: this.$t('ConfirmDelete'),
+          content: '',
+          onOk:
+            async () => {
+              deleteAction(`tag/onlCgformTag/delete`, params).then(res => {
+                if (res.success) {
+                  if (this.key == 1) {
+                    this.$message.success(res.message)
+                    this.loadData(1)
+                  } else if (this.key == 2) {
+                    this.$message.success(res.message)
+                    this.loadData(0)
+                  }
+                }else{
+                  this.$message.warning(res.message)
+                }
+              })
             }
-          }
         })
       },
       //新增关闭