diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index df42f3f1e..1eb58966e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -469,4 +469,23 @@ module.exports = { sentProcess: 'Sent process', monitoringProcess: 'Monitoring process', ConfirmDeployment:'Confirm deployment', + terminationProcess:'termination process', + issue:'issue', + projectInformation:'project information', + standardContent:'standard content', + complianceReview:'compliance review', + reviewResults:'review results', + selectReviewResult:'Please select the review result', + feedback:'feedback', + approvalHistory:'cpproval history', + cannotExceed500characters:'cannot exceed 500 characters', + accord:'conformity', + nonConformity:'non conformity', + Tracked:'to be tracked', + notInvolved:'Not involved', + Operator:'operator', + role:'role', + operationContent:'operation content', + operationTime:'operation time', + } \ 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 ba2df55bc..7759453ee 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -467,6 +467,26 @@ module.exports = { OnlyOneSelected:'只能选择一条数据', OnlyPDF:'只能导入pdf文件', open:'展开', + away:'收起', + terminationProcess:'终止流程', + issue:'下发', + projectInformation:'项目信息', + standardContent:'标准内容', + complianceReview:'符合性审查', + reviewResults:'审查结果', + selectReviewResult:'请选择审查结果', + feedback:'反馈意见', + approvalHistory:'审批历史', + cannotExceed500characters:'不能超过500个字符', + accord:'符合', + nonConformity:'不符合', + Tracked:'待追踪', + notInvolved:'不涉及', + Operator:'操作人', + role:'角色', + operationContent:'操作内容', + operationTime:'操作时间', + away:'收起', toDoProcess: '待办流程', processDone: '已办流程', diff --git a/jero-web/src/components/ocrTable/index.vue b/jero-web/src/components/ocrTable/index.vue index c2c170367..0f5f258e8 100644 --- a/jero-web/src/components/ocrTable/index.vue +++ b/jero-web/src/components/ocrTable/index.vue @@ -25,7 +25,7 @@ {{record.resultContent=='转换成功'?ol.text:''}} - {{record.resultContent=='转换成功'?ol.text:''}} + {{ol.text}} diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index 9b6866dea..02ea81e7a 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -327,6 +327,11 @@ export const constantRouterMap = [ name: 'docIndex', component: () => import(/* webpackChunkName: "user" */ '@/views/documentManage/library/docDetail/index') }, + { + path: '/docManage/form/detail', + name: 'processIndex', + component: () => import(/* webpackChunkName: "process" */ '@/views/documentManage/process/detail') + }, // { // path: '/', // name: 'index', diff --git a/jero-web/src/views/documentManage/tags/dialog/treeTable.vue b/jero-web/src/views/documentManage/tags/dialog/treeTable.vue index 4ffad86d9..49ce0b94c 100644 --- a/jero-web/src/views/documentManage/tags/dialog/treeTable.vue +++ b/jero-web/src/views/documentManage/tags/dialog/treeTable.vue @@ -292,7 +292,7 @@ } .tree-table{ .page{ - margin-text-outline: 20px; + margin-top: 20px; } } diff --git a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue index f77443d22..b763edd95 100644 --- a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue +++ b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue @@ -73,7 +73,8 @@ return{ spinning:false, queryParam:{ - + pageNo:1, + pageSize:10, }, titleTag:this.$t('NewLabelItem'), typeVisible:false, @@ -99,7 +100,7 @@ title: this.$t('AttributeType'), align: "center", width: 100, - dataIndex: 'field_show_type_dict_text', + dataIndex: 'item_text', }, { title: this.$t('FieldLength'), @@ -117,7 +118,7 @@ title: this.$t('DisplayArea'), align: "center", width: 80, - dataIndex: 'show_area_dict_text' + dataIndex: 'show_area' }, { title: this.$t('operation'), @@ -208,7 +209,7 @@ }else if(val==0){ params.isModel=0 } - getAction(`tag/onlCgformTag/page`,params).then(res=>{ + postAction(`tag/onlCgformTag/page`,params).then(res=>{ if(res.success){ this.total=res.result.total this.tableData= [ ...res.result]