diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java index 4227e3341..e2864dc65 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java @@ -90,6 +90,21 @@ public class BussDocumentLibraryEOController extends JeroController transPageInfo(@RequestBody Map parameter) { + IPage infoPage = bussDocumentLibraryEOService.ocrPageInfo(parameter); + return Result.OK(infoPage); + } + /** * 列表查询 * diff --git a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue index 4f8a942ee..69a95a94e 100644 --- a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue +++ b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue @@ -223,7 +223,7 @@ ...this.queryParam } this.loading = true - postAction('document/bussDocumentLibraryEO/ocrPageInfo', query).then((res) => { + postAction('document/bussDocumentLibraryEO/transPageInfo', query).then((res) => { if (res.success) { this.dataList = res.result.records || [] this.total = res.result.total diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 2af0965a4..922689d45 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -416,6 +416,7 @@ export default { controlValues: [ { required: true, message: this.$t('PleaseEnter')+this.$t('controlAlternatives'), trigger: 'blur' }, { min:1, max: 500, message: this.$t('cantExeed')+'500'+this.$t('characters'), trigger: 'blur' }, + { validator: this.test } ], titleDefaultValue: [ { required: true, message: this.$t('PleaseEnter')+this.$t('DefaultValue'), trigger: 'blur' }, @@ -453,6 +454,14 @@ export default { } }, methods: { + test(rule, value, callback) { + var money = /^[^##!!]*$/ + if (money.test(value)) { + callback() + } else { + callback(new Error(this.$t('disableInput') + '!#')) + } + }, getcontentListedEdit() { getAction('sys/dict/getDictItems/cert_category', { }).then((res) => { if (res.success) { diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index f5162293b..c33c24de9 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -189,6 +189,7 @@ + @@ -222,6 +223,7 @@ import batchChangeModel from './batchChangeModel' import batchModel from './batchModel' import TaskListModel from './TaskListModel' + import cuibanModel from './cuibanModel' import taskBatSetting from './taskBatSetting' import cuibanModel from './cuibanModel' import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage' @@ -618,6 +620,17 @@ } }, + // 催办 + cuibanClick(){ + if(this.selectionRowsArray.length <1){ + this.$message.warning(this.$t('selectLeastOne')) + }else{ + this.$refs.cModelRef.getData(this.selectionRowsArray) + } + }, + cibanModel(){ + this.getList() + }, cancleoperationFailed(){ this.visibleoperationFailed = false },