From ee837c64029bce07d4a5b2e44fe561b3bfb80f87 Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Thu, 3 Mar 2022 11:43:59 +0800
Subject: [PATCH] =?UTF-8?q?ocr=E5=90=8C=E6=AD=A5=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/documentManage/ocr/index.vue    |  8 ++--
 .../documentManage/ocr/modules/docTable.vue   |  4 +-
 .../subscribtion/module/subArea.vue           | 22 ++++++++-
 .../documentManage/tags/dialog/areaManage.vue |  2 +-
 .../documentManage/tags/dialog/dicList.vue    | 48 +++++++++++++++++--
 .../documentManage/tags/dialog/treeTable.vue  |  9 ++--
 6 files changed, 76 insertions(+), 17 deletions(-)

diff --git a/jero-web/src/views/documentManage/ocr/index.vue b/jero-web/src/views/documentManage/ocr/index.vue
index e013cb78c..f4ffb8b22 100644
--- a/jero-web/src/views/documentManage/ocr/index.vue
+++ b/jero-web/src/views/documentManage/ocr/index.vue
@@ -229,7 +229,8 @@
       //下载
       actionDown(val){
         // console.log()
-        downloadFile('/sys/common/download', val.fileName, { id: val.id })
+        // downloadFile('/sys/common/download', val.fileName, { id: val.id })
+        downloadFile(val.docRealFile)
       },
       //删除
       actionDelete(record){
@@ -289,11 +290,12 @@
         }
         postAction(`ocr/ocrRecord/syncToDocument`,params).then(res=>{
           if(res.success){
-            this.$message.success(res.result)
+            this.$message.success(res.message)
             this.toVisible=false
+          }else{
+            this.$message.warning(res.message)
           }
         })
-
       },
       //同步至文档库取消
       handleCancelTo(){
diff --git a/jero-web/src/views/documentManage/ocr/modules/docTable.vue b/jero-web/src/views/documentManage/ocr/modules/docTable.vue
index 334ba6ddb..7a92fd11d 100644
--- a/jero-web/src/views/documentManage/ocr/modules/docTable.vue
+++ b/jero-web/src/views/documentManage/ocr/modules/docTable.vue
@@ -24,8 +24,8 @@
           />
         </div>
         <div class="doc-table-footer">
-          <a-button type="primary" class="btn-export" @click="tableExport">导入</a-button>
-          <a-button type="primary" @click="onClose">取消</a-button>
+          <a-button type="primary" class="btn-export" @click="tableExport">{{$t('import')}}</a-button>
+          <a-button type="primary" @click="onClose">{{$t('cancel')}}</a-button>
         </div>
       </a-drawer>
     </div>
diff --git a/jero-web/src/views/documentManage/subscribtion/module/subArea.vue b/jero-web/src/views/documentManage/subscribtion/module/subArea.vue
index 45feb1ac5..4d927cc12 100644
--- a/jero-web/src/views/documentManage/subscribtion/module/subArea.vue
+++ b/jero-web/src/views/documentManage/subscribtion/module/subArea.vue
@@ -93,6 +93,8 @@
       },
     },
     mounted() {
+      this.getSubscribtion()
+      this.loadData()
       this.visible=this.subVisible
       this.generateList(this.treeData)
     },
@@ -100,7 +102,15 @@
       //获取数据
       loadData(){
         let params = {}
-        getAction(``,params).then(res=> {
+        getAction(`sys/category/getSysCategoryTree`,params).then(res=> {
+          if(res.success){
+
+          }
+        })
+      },
+      //获取用户的订阅
+      getSubscribtion(){
+        getAction(`domain/domainUserRel/queryList`,{}).then(res=> {
           if(res.success){
 
           }
@@ -111,7 +121,15 @@
       },
       handleOk(e) {
         this.confirmLoading = true;
-        this.$emit('visible',false)
+
+        let params={
+
+        }
+        postAction(`domain/domainUserRel/insert`,params).then(res=>{
+          if(res.success){
+            this.$emit('visible',false)
+          }
+        })
       },
       handleCancel(e) {
         this.visible = false;
diff --git a/jero-web/src/views/documentManage/tags/dialog/areaManage.vue b/jero-web/src/views/documentManage/tags/dialog/areaManage.vue
index 0367e57c0..194b3d201 100644
--- a/jero-web/src/views/documentManage/tags/dialog/areaManage.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/areaManage.vue
@@ -134,7 +134,7 @@
             title: '所属模块',
             align: "center",
             width: 100,
-            dataIndex: 'isModel',
+            dataIndex: 'isModel_dictText',
             ellipsis: true,
           },
           {
diff --git a/jero-web/src/views/documentManage/tags/dialog/dicList.vue b/jero-web/src/views/documentManage/tags/dialog/dicList.vue
index a3152621d..6eb2f96dc 100644
--- a/jero-web/src/views/documentManage/tags/dialog/dicList.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/dicList.vue
@@ -12,8 +12,15 @@
             <a-button class="form-btn-reset" @click="reset">重置</a-button>
           </div>
         </div>
-        <div class="dic-list-module">
-          <a-button type="primary" class="dic-list-add" @click="dicAdd">{{$t('add')}}</a-button>
+        <div class="table-operator">
+          <div class="operator-text" @click="dicAdd">
+              <a-icon type="plus"  />
+              {{$t('add')}}
+          </div>
+          <div class="operator-text" @click="batDelete">
+            <a-icon type="delete" />
+            {{$t('BatchDelete')}}
+          </div>
         </div>
         <div class="dic-list-table">
           <list-table v-if="dictVal=='list'&&dataFlag" :tableData="tableData" @editDict="editDict" @deleteDict="deleteDict" :total="total"></list-table>
@@ -192,7 +199,6 @@
           }).then(res=>{
             let parentNode=[]
             this.tabletreeData=[...res.result]
-
             let data = this.toTree(this.tabletreeData)
             this.tabletreeData=data
             this.dataFlag=true
@@ -263,6 +269,7 @@
             putAction(`sys/dictItem/edit`, params).then(res => {
               if (res.success) {
                 this.$message.success(res.message)
+                this.form={}
                 this.loadData()
                 this.newVisible = false
               } else {
@@ -286,7 +293,16 @@
             sysDictId: this.record.id
           }
           if (this.isEdit) {
-
+            putAction(`sys/category/edit`,params).then(res=>{
+              if(res.success){
+                this.$message.success(res.message)
+                this.form={}
+                this.loadData()
+                this.newVisible = false
+              }else {
+                this.$message.warning(res.message)
+              }
+            })
           }else{
             //新增
             postAction(`sys/category/add`, params).then(res => {
@@ -313,7 +329,9 @@
         this.parentVisible=false
       },
       //树状编辑
-      editTreeDict(val){
+      editTreeDict(val,form){
+        this.isEdit=true
+        this.form={...form}
         this.newVisible=val
         this.parentVisible=true
       },
@@ -327,12 +345,22 @@
               this.loadData()
             }
          })
+      },
+      //批量删除
+      batDelete(){
+        let params={
+
+        }
+        deleteAction(`sys/category/getChildListBatch`,params).then(res=>{
+
+        })
       }
     }
   }
 </script>
 
 <style lang="less" scoped>
+  @import '~@assets/less/common.less';
   .dic-list{
     .dic-list-content{
       .dic-list-header{
@@ -348,6 +376,9 @@
         margin-bottom: 20px;
 
       }
+      .dic-list-table{
+        margin-top: 20px;
+      }
     }
   }
 .dict-module{
@@ -362,4 +393,11 @@
       text-align:center;
     }
   }
+  .dic-list{
+    .dic-list-content{
+      .table-operator{
+        text-align: right;
+      }
+    }
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/tags/dialog/treeTable.vue b/jero-web/src/views/documentManage/tags/dialog/treeTable.vue
index 28acdb20c..ee86ea85e 100644
--- a/jero-web/src/views/documentManage/tags/dialog/treeTable.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/treeTable.vue
@@ -51,9 +51,9 @@
           },
           {
             title: '描述',
-            dataIndex: 'describe',
+            dataIndex: 'description',
             width: '30%',
-            key: 'describe',
+            key: 'description',
             align: "center",
           },
           {
@@ -65,7 +65,8 @@
           }
         ],
         tabData:[],
-        selectedRowKeys:[]
+        selectedRowKeys:[],
+        selected:{}
       }
     },
     mounted() {
@@ -121,7 +122,7 @@
       },
       //编辑
       actionEdit(val){
-        this.$emit('editDict',true)
+        this.$emit('editDict',true,val)
       },
       onSelectAll(selected) {
         if (selected) {