ocr文档同步

jero-web/src/common/lang/en-us.js

@@ -500,6 +500,10 @@ module.exports = {
   ProcessStatus:'Process status',
   CompletionTime:'Completion time',
   draft:'draft',
+  CannotExceed100characters:'cannot exceed 100 characters',
+  cantExeed:'cannot exceed ',
+  characters:' characters',
+
   Processing:'Processing',
   See:'See',
 }

jero-web/src/common/lang/zh-cn.js

@@ -504,6 +504,9 @@ module.exports = {
   ProcessStatus:'流程状态',
   CompletionTime:'完成时间',
   draft:'草稿',
+  CannotExceed100characters:'不能超过100字符',
+  cantExeed:'不能超过',
+  characters:'字符',
   Processing:'办理',
   See:'查看',
 }

jero-web/src/components/ocrTable/docTable.vue

@@ -16,7 +16,7 @@
            <a class="text" v-for="(ol,index) in OperationList"
               @click="OperationClick(ol,record)">
               <span v-if="ol.text==$t('SyncLibrary')">
-                     {{record.resultContent=='转换成功'&&record.syncState=='未同步'?ol.text:''}}
+                     {{record.resultContent=='转换成功'&&record.syncState=='未同步'&&record.fileSource=='1'?ol.text:''}}
               </span>
              <span v-if="ol.text==$t('check')">
                      {{record.resultContent=='转换成功'&&record.syncState=='未同步'?ol.text:''}}

jero-web/src/components/ocrTable/index.vue

@@ -16,7 +16,7 @@
            <a class="text" v-for="(ol,index) in OperationList"
               @click="OperationClick(ol,record)">
               <span v-if="ol.text==$t('SyncLibrary')">
-                     {{record.resultContent=='转换成功'&&record.syncState=='未同步'?ol.text:''}}
+                     {{record.resultContent=='转换成功'&&record.syncState=='未同步'&&record.fileSource=='1'?ol.text:''}}
               </span>
              <span v-if="ol.text==$t('check')">
                      {{record.resultContent=='转换成功'&&record.syncState=='未同步'?ol.text:''}}

jero-web/src/views/documentManage/ocr/modules/docTable.vue

@@ -190,7 +190,8 @@
               let params = {
                 attId: this.rows.id,
                 standName: this.rows.title,
-                standNumber: this.rows.serial_number
+                standNumber: this.rows.serial_number,
+                connect_id:this.rows.connect_id
               }
               if(this.rows.text_info=='发布稿(必读)'){
                 params.fileType='1'

jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue

@@ -76,8 +76,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item :label="$t('DisplayArea')" prop="areaId">
+            <a-form-model-item :label="$t('DisplayArea')" prop="showArea">
-              <a-select :placeholder="$t('SelectDisplayArea')" v-model="form.areaId" @change="handleChange">
+              <a-select :placeholder="$t('SelectDisplayArea')" v-model="form.showArea" @change="handleChange">
                 <a-select-option v-for="(item,index) in areaOptions" :key="item.id" :value="item.id">
                   {{item.showArea}}
                 </a-select-option>
@@ -176,9 +176,14 @@
           ],
           dbFieldTxt:  [
               { required: true, message: this.$t('PleaseEnterPropertyName'),trigger: 'blur'},
+              { min:1, max: 20, message: this.$t('cantExeed')+'20'+this.$t('characters'), trigger: 'blur' },
           ],
           dbFieldName: [
               { required: true, message: this.$t('PleaseEnterYourEnglishName'),trigger: 'blur'},
+              { min:1, max: 20, message: this.$t('cantExeed')+'20'+this.$t('characters'), trigger: 'blur' },
+          ],
+          dbFieldEnName:[
+            { max: 50, message: this.$t('cantExeed')+'50'+this.$t('characters'), trigger: 'blur' },
           ],
           fieldShowType: [
               { required: true, message: this.$t('PleaseSelectAttributeType'),trigger: 'change'},
@@ -198,7 +203,7 @@
           isShowForm: [
               { required: true, message: this.$t('SelectWhetherDisplayList'),trigger: 'change'},
           ],
-          areaId:  [
+          showArea:  [
               { required: true, message: this.$t('SelectDisplayArea'),trigger: 'change'},
           ],
           isQuery: [

jero-web/src/views/documentManage/tags/dialog/areaManage.vue

@@ -111,8 +111,8 @@
         columns: [
           {
             title: this.$t('DisplayArea'),
-            dataIndex: 'show_area',
+            dataIndex: 'showArea',
-            key: 'show_rea',
+            key: 'showArea',
             align: "center",
             width: 100,
           },
@@ -120,13 +120,13 @@
             title: this.$t('enName'),
             align: "center",
             width: 100,
-            dataIndex: 'en_name',
+            dataIndex: 'enName',
           },
           {
             title: this.$t('Module'),
             align: "center",
             width: 100,
-            dataIndex: 'item_text',
+            dataIndex: 'isModel_dictText',
           },
           {
             title: this.$t('SortNumber'),
@@ -162,6 +162,10 @@
             { required: true, message: this.$t('PleaseSelectModule'), trigger: 'change' },
 
             ],
+          enName:[
+            { max: 100, message: this.$t('CannotExceed100characters'), trigger: 'blur' },
+
+          ],
           showArea:[
             { required: true, message: this.$t('enterDisplayArea'), trigger: 'blur' },
             { min:1, max: 50, message: this.$t('charactersLength'), trigger: 'blur' },
@@ -184,9 +188,9 @@
         let params={
           ...this.queryParams
         }
-        getAction(`tag/onlCgformArea/page`,params).then(res=>{
+        postAction(`tag/onlCgformArea/page`,params).then(res=>{
           if(res.success){
-            this.areaTable=res.result
+            this.areaTable=[...res.result.records]
             this.total=res.result.total
           }
         })

jero-web/src/views/documentManage/tags/dialog/listTable.vue

@@ -128,6 +128,7 @@
     }
     .page{
       margin-top: 20px;
+      text-align: right;
     }
   }
 </style>

jero-web/src/views/documentManage/tags/dialog/treeTable.vue

@@ -293,6 +293,7 @@
   .tree-table{
     .page{
       margin-top: 20px;
+      text-align: right;
     }
   }
 

jero-web/src/views/documentManage/tags/tabs/tabTable.vue

@@ -94,6 +94,7 @@
     }
     .page{
       margin-top: 20px;
+      text-align: right;
     }
   }
 </style>

jero-web/src/views/documentManage/tags/tabs/tagContent.vue

@@ -328,7 +328,7 @@
     }
     .page{
       margin-top: 20px;
-
+      text-align: right;
     }
   }
   .type-popover{

jero-web/src/views/documentManage/tags/tabs/tagItem.vue

@@ -282,6 +282,7 @@
                 if (res.success) {
                   if (this.key == 1) {
                     this.$message.success(this.$t('OperationSuccessful'))
+                    this.queryParam.pageNo=1
                     this.loadData(1)
                   } else if (this.key == 2) {
                     this.$message.success(this.$t('OperationSuccessful'))