diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 02c44abed..d28c7bb59 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -561,5 +561,6 @@ module.exports = { mergeTerms:'determine merger terms', documentSplitTemplate:'document split template', batSetting:'batch setting', + selectDirectoryTerms:'please select the directory location to add terms', } \ 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 6dd3623f6..8920a8222 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -565,5 +565,6 @@ module.exports = { mergeTerms:'确定合并条款', documentSplitTemplate:'文档拆分模板', batSetting:'批量设置', + selectDirectoryTerms:'请选择添加条款的目录位置', } \ 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 38a1b95aa..1ddc73b8f 100644 --- a/jero-web/src/components/OcrTable/DocTable.vue +++ b/jero-web/src/components/OcrTable/DocTable.vue @@ -79,6 +79,10 @@ showAction: { type: Boolean, default: false + }, + type:{ + type:String, + default:'' } }, data() { @@ -190,6 +194,7 @@ let pageSize = JSON.parse(JSON.stringify(this.pageSize)) let params = { ...this.searchParmes, + type:this.type, orderBy: this.orderBy, orderByField: this.orderByField, pageNo: pageNo + '', diff --git a/jero-web/src/components/SplitDetailTable/index.vue b/jero-web/src/components/SplitDetailTable/index.vue index 4ab4c0480..93cc88eed 100644 --- a/jero-web/src/components/SplitDetailTable/index.vue +++ b/jero-web/src/components/SplitDetailTable/index.vue @@ -13,8 +13,19 @@ @change="tableOnChange" > - {{record.iterms_conditions}} + + + + + + {{record.iterms_conditions&&record.iterms_conditions!=='null'?record.iterms_conditions.replace(/<.*?>/ig, ' ') : ''}} + + + + + + @@ -92,6 +103,12 @@ orderByField: '' } }, + watch:{ + menuId(oldValue,newValue){ + // console.log('oldnew',oldValue,newValue) + this.getTableList() + } + }, mounted() { eventBUs.$on('searchQuery', search => { Object.keys(search).forEach(res => { @@ -140,15 +157,9 @@ }) if(res.db_field_name=='iterms_conditions'){ this.columns[index].width='35%' - } - if (res.click) { this.columns[index].scopedSlots = { customRender: 'showContent' } - } else { - this.columns[index].scopedSlots = { - customRender: 'detailText' - } } }) // console.log('columns',this.columns) @@ -167,6 +178,7 @@ scopedSlots: { customRender: 'operation' } }) } + } }) }, @@ -245,15 +257,7 @@ height: calc(100% - 100px); overflow: auto; .content-show{ - width: 500px; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: 3; - -webkit-box-orient: vertical; - height: 60px; - line-height: 20px; - white-space: pre-wrap; + /*text-align: center;*/ } } diff --git a/jero-web/src/components/SplitImport/index.vue b/jero-web/src/components/SplitImport/index.vue new file mode 100644 index 000000000..c5ee46392 --- /dev/null +++ b/jero-web/src/components/SplitImport/index.vue @@ -0,0 +1,193 @@ + + + + + + {{ $t('import') }} + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/documentManage/ocr/modules/DocTable.vue b/jero-web/src/views/documentManage/ocr/modules/DocTable.vue index 19ce17805..d4819a58e 100644 --- a/jero-web/src/views/documentManage/ocr/modules/DocTable.vue +++ b/jero-web/src/views/documentManage/ocr/modules/DocTable.vue @@ -18,6 +18,7 @@ - - - - - - - - - - - - - - - {{$t('query')}} - {{$t('reset')}} - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + {{$t('cancel')}} - +