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

---
 jero-web/src/common/lang/en-us.js             |  3 +-
 jero-web/src/common/lang/zh-cn.js             |  2 +
 jero-web/src/components/ocrAddForm/index.vue  | 10 +++++
 .../src/views/documentManage/ocr/index.vue    | 39 +++++++++++++------
 .../documentManage/ocr/modules/docTable.vue   |  2 +-
 .../documentManage/tags/tabs/tagContent.vue   | 20 +++++-----
 6 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 596e3765d..27ee81e7f 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -503,7 +503,8 @@ module.exports = {
   CannotExceed100characters:'cannot exceed 100 characters',
   cantExeed:'cannot exceed ',
   characters:' characters',
-
   Processing:'Processing',
   See:'See',
+  labelNameCannotDuplicate:'Label name cannot be duplicate',
+
 }
\ 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 30ab98321..71cf86c35 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -509,4 +509,6 @@ module.exports = {
   characters:'字符',
   Processing:'办理',
   See:'查看',
+  labelNameCannotDuplicate:'标签名称不能重复',
+
 }
\ No newline at end of file
diff --git a/jero-web/src/components/ocrAddForm/index.vue b/jero-web/src/components/ocrAddForm/index.vue
index 794bdc370..3f93567a8 100644
--- a/jero-web/src/components/ocrAddForm/index.vue
+++ b/jero-web/src/components/ocrAddForm/index.vue
@@ -335,6 +335,16 @@
                 message: res.db_field_txt + '不能为空',
                 trigger: 'blur'
               })
+              if(res.db_field_name=='standNumber'){
+                rule.push(
+                { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
+                )
+              }else if(res.db_field_name=='standName'){
+                rule.push(
+                  { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
+                )
+              }
+
             } else if (res.field_show_type === 'CHECKBOX' || res.field_show_type === 'list_multi' ||
               res.field_show_type === 'date' || res.field_show_type === 'file') {
               rule.push({
diff --git a/jero-web/src/views/documentManage/ocr/index.vue b/jero-web/src/views/documentManage/ocr/index.vue
index b620dcd95..98e803f26 100644
--- a/jero-web/src/views/documentManage/ocr/index.vue
+++ b/jero-web/src/views/documentManage/ocr/index.vue
@@ -176,20 +176,33 @@
       // this.loadData()
     },
     created() {
-      const date = new Date(),
-      year = date.getFullYear(),
-      month = date.getMonth()+1,
-      myDate = date.getDate()
-      this.today = `${year}/${month < 10 ? '0'+month : month}/${myDate < 10 ? '0'+myDate : myDate}`
-      if(this.timer){
-         clearInterval(this.timer)
-      }else{
-         eventBUs.$emit('searchReset')
-         this.initSetTimeout(this.today)//调用每隔10秒刷新数据
+      this.refresh()
+    },
+    watch:{
+      drawVisible(val){
+        if(val&&this.timer){
+          clearInterval(this.timer)
+        }else{
+          clearInterval(this.timer)
+          this.initSetTimeout(this.today)//调用每隔10秒刷新数据
+        }
       }
     },
-
     methods:{
+      // 定时刷新页面
+      refresh(){
+        const date = new Date(),
+          year = date.getFullYear(),
+          month = date.getMonth()+1,
+          myDate = date.getDate()
+        this.today = `${year}/${month < 10 ? '0'+month : month}/${myDate < 10 ? '0'+myDate : myDate}`
+        if(this.timer){
+          clearInterval(this.timer)
+        }else{
+          eventBUs.$emit('searchReset')
+          this.initSetTimeout(this.today)//调用每隔10秒刷新数据
+        }
+      },
       //上传
       handleUpload(){
         // if(this.timer){
@@ -200,6 +213,9 @@
       //调取已入库文件
       handleFileExport(){
         this.drawVisible=true
+        if(this.timer){
+          clearInterval(this.timer)
+        }
       },
       //批量删除
       handleDel(){
@@ -336,6 +352,7 @@
       },
       docVisible(val){
         this.drawVisible=val
+
       },
       //文件详情跳转
       detailClick(val){
diff --git a/jero-web/src/views/documentManage/ocr/modules/docTable.vue b/jero-web/src/views/documentManage/ocr/modules/docTable.vue
index 17f488db6..d05713643 100644
--- a/jero-web/src/views/documentManage/ocr/modules/docTable.vue
+++ b/jero-web/src/views/documentManage/ocr/modules/docTable.vue
@@ -146,7 +146,7 @@
         })
       },
       afterVisibleChange(val) {
-        console.log('visible', val);
+        // console.log('visible', val);
       },
       onClose() {
         this.visible = false;
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
index 01a70ac37..3e8009a2a 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
@@ -136,8 +136,8 @@
             width: 170
           }
         ],
-        labelCol: { span:4 },
-        wrapperCol: { span: 18 },
+        labelCol: { span:6 },
+        wrapperCol: { span: 16 },
         form:{},
         rules:{
           dictName:[{ required: true, message: this.$t('PleaseEnterLabelName'), trigger: 'change' },
@@ -210,7 +210,13 @@
                   this.contentVisible=false
                   this.form={}
                 }else{
-                  this.$message.warning(this.$t('operationFailed'))
+                  if(res.message='标签名称不能重复'){
+                    this.$message.warning(this.$t('labelNameCannotDuplicate'))
+
+                  }else{
+                    this.$message.warning(this.$t('operationFailed'))
+
+                  }
 
                 }
               })
@@ -226,14 +232,10 @@
                   this.form={}
                 }else{
                   this.$message.warning(this.$t('operationFailed'))
-
                 }
               })
             }
-
-
           }
-
         })
 
       },
@@ -356,8 +358,8 @@
 }
 .tag-content{
   .tag-item{
-    .ant-col-4{
-      min-width: 100px;
+    .ant-col-6{
+      min-width: 130px;
     }
   }
 }