diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 21a7e7d8..9f6bdcc2 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -168,6 +168,8 @@ module.exports = { pleaseSelectTime: '请选择时间', oneTableAdded: '只能添加一个表格', addATable: '请添加一个表格', + select: '选择', + attach: '附件', // 树右键 treeRight: { addFolder: 'Create New Folder', diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index e99deaac..398630a0 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -172,6 +172,7 @@ module.exports = { oneTableAdded: '只能添加一个表格', addATable: '请添加一个表格', select: '选择', + attach: '附件', // 树右键 treeRight: { addFolder: '新增文件夹', diff --git a/src/mixins/WorkCenterMixin.js b/src/mixins/WorkCenterMixin.js index 5c0193a1..1b99ab9f 100644 --- a/src/mixins/WorkCenterMixin.js +++ b/src/mixins/WorkCenterMixin.js @@ -7,6 +7,7 @@ export const WorkCenterMixin = { return { personnelInfoData: [], // 需要传给PersonnelInfo的数据 switchValue: 'base', + formItemColon: false // a-form不显示冒号 } }, methods: { diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue index 8aa92429..42cc48ba 100644 --- a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue +++ b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue @@ -21,7 +21,7 @@ - + - + - + {{ $t('processApprovalInformation') }} - + - + @@ -159,8 +159,6 @@ import { activelyReportReject, activelyReportGetDataById } from '@/api/workCenter' -import Vue from 'vue' -import { USER_INFO } from '@/store/mutation-types' import pick from 'lodash.pick' import { WorkCenterMixin } from '@/mixins/WorkCenterMixin' import { ProcessKey } from '@/enums/commonEnums' diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskForm.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskForm.vue index dcbe55be..4ce3abf6 100644 --- a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskForm.vue +++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskForm.vue @@ -1,67 +1,65 @@