From a34e64db45c2cd00518d11f419c9dc10bf9b3086 Mon Sep 17 00:00:00 2001 From: caoyang Date: Tue, 8 Mar 2022 17:06:12 +0800 Subject: [PATCH] =?UTF-8?q?ocr=E6=96=87=E6=A1=A3=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 ++++ jero-web/src/common/lang/zh-cn.js | 3 +++ jero-web/src/components/ocrTable/docTable.vue | 2 +- jero-web/src/components/ocrTable/index.vue | 2 +- .../documentManage/ocr/modules/docTable.vue | 3 ++- .../tags/dialog/OnlCgformTagForm.vue | 11 ++++++++--- .../documentManage/tags/dialog/areaManage.vue | 16 ++++++++++------ .../documentManage/tags/dialog/listTable.vue | 1 + .../documentManage/tags/dialog/treeTable.vue | 1 + .../views/documentManage/tags/tabs/tabTable.vue | 1 + .../documentManage/tags/tabs/tagContent.vue | 2 +- .../views/documentManage/tags/tabs/tagItem.vue | 1 + 12 files changed, 34 insertions(+), 13 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 2088ff196..596e3765d 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/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', } \ 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 982d85740..30ab98321 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -504,6 +504,9 @@ module.exports = { ProcessStatus:'流程状态', CompletionTime:'完成时间', draft:'草稿', + CannotExceed100characters:'不能超过100字符', + cantExeed:'不能超过', + characters:'字符', Processing:'办理', See:'查看', } \ 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 dce4b8bae..60c242da8 100644 --- a/jero-web/src/components/ocrTable/docTable.vue +++ b/jero-web/src/components/ocrTable/docTable.vue @@ -16,7 +16,7 @@ - {{record.resultContent=='转换成功'&&record.syncState=='未同步'?ol.text:''}} + {{record.resultContent=='转换成功'&&record.syncState=='未同步'&&record.fileSource=='1'?ol.text:''}} {{record.resultContent=='转换成功'&&record.syncState=='未同步'?ol.text:''}} diff --git a/jero-web/src/components/ocrTable/index.vue b/jero-web/src/components/ocrTable/index.vue index 0f5f258e8..d25438b7c 100644 --- a/jero-web/src/components/ocrTable/index.vue +++ b/jero-web/src/components/ocrTable/index.vue @@ -16,7 +16,7 @@ - {{record.resultContent=='转换成功'&&record.syncState=='未同步'?ol.text:''}} + {{record.resultContent=='转换成功'&&record.syncState=='未同步'&&record.fileSource=='1'?ol.text:''}} {{record.resultContent=='转换成功'&&record.syncState=='未同步'?ol.text:''}} diff --git a/jero-web/src/views/documentManage/ocr/modules/docTable.vue b/jero-web/src/views/documentManage/ocr/modules/docTable.vue index f080108d7..365157bc2 100644 --- a/jero-web/src/views/documentManage/ocr/modules/docTable.vue +++ b/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' diff --git a/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue b/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue index 92d8caa80..36eda5b2b 100644 --- a/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue +++ b/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue @@ -76,8 +76,8 @@ - - + + {{item.showArea}} @@ -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: [ diff --git a/jero-web/src/views/documentManage/tags/dialog/areaManage.vue b/jero-web/src/views/documentManage/tags/dialog/areaManage.vue index fb256919e..a51a0d19d 100644 --- a/jero-web/src/views/documentManage/tags/dialog/areaManage.vue +++ b/jero-web/src/views/documentManage/tags/dialog/areaManage.vue @@ -111,8 +111,8 @@ columns: [ { title: this.$t('DisplayArea'), - dataIndex: 'show_area', - key: 'show_rea', + dataIndex: 'showArea', + 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 } }) diff --git a/jero-web/src/views/documentManage/tags/dialog/listTable.vue b/jero-web/src/views/documentManage/tags/dialog/listTable.vue index 6a4177d13..5aee55af8 100644 --- a/jero-web/src/views/documentManage/tags/dialog/listTable.vue +++ b/jero-web/src/views/documentManage/tags/dialog/listTable.vue @@ -128,6 +128,7 @@ } .page{ margin-top: 20px; + text-align: right; } } \ 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 cff272d13..1f4f2ebd3 100644 --- a/jero-web/src/views/documentManage/tags/dialog/treeTable.vue +++ b/jero-web/src/views/documentManage/tags/dialog/treeTable.vue @@ -293,6 +293,7 @@ .tree-table{ .page{ margin-top: 20px; + text-align: right; } } diff --git a/jero-web/src/views/documentManage/tags/tabs/tabTable.vue b/jero-web/src/views/documentManage/tags/tabs/tabTable.vue index db5ffc38e..80abf37e9 100644 --- a/jero-web/src/views/documentManage/tags/tabs/tabTable.vue +++ b/jero-web/src/views/documentManage/tags/tabs/tabTable.vue @@ -94,6 +94,7 @@ } .page{ margin-top: 20px; + text-align: right; } } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue index 009fcce30..4a30135d6 100644 --- a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue +++ b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue @@ -328,7 +328,7 @@ } .page{ margin-top: 20px; - + text-align: right; } } .type-popover{ diff --git a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue index 11809a02f..15ef6a9be 100644 --- a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue +++ b/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'))