diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 9e1082cf..d765d139 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -162,6 +162,7 @@ module.exports = { batchReject: '批量驳回', pleaseSelectDistributeData: '请选择要分发的数据', deadline: '截止时间', + submitAddAdd: '提交并新增', // 树右键 treeRight: { addFolder: 'Create New Folder', diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js index fab37e85..f0b051e5 100644 --- a/src/common/lang/workCenter/en.js +++ b/src/common/lang/workCenter/en.js @@ -157,6 +157,13 @@ module.exports = { relevantFile: '关联文件', degreeOfBidAcquisition: '采标程度', adoptInternationalStandardNumber: '采用国际标准号', + revisedOpinionContent: '修改意见内容', + beforeUpdate: '修改前', + afterUpdate: '修改后', + updateReason: '修改理由', + lookUpdateBeforeContent: '查看修改前内容', + proposingDepartment: '提出部门', + introducer: '提出人' }, // 流程配置 processConfig: { diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index b032170c..942c97bd 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -157,6 +157,13 @@ module.exports = { relevantFile: '关联文件', degreeOfBidAcquisition: '采标程度', adoptInternationalStandardNumber: '采用国际标准号', + revisedOpinionContent: '修改意见内容', + beforeUpdate: '修改前', + afterUpdate: '修改后', + updateReason: '修改理由', + lookUpdateBeforeContent: '查看修改前内容', + proposingDepartment: '提出部门', + introducer: '提出人' }, // 流程配置 processConfig: { diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 2f7eca94..1fb906ee 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -165,6 +165,7 @@ module.exports = { batchReject: '批量驳回', pleaseSelectDistributeData: '请选择要分发的数据', deadline: '截止时间', + submitAddAdd: '提交并新增', // 树右键 treeRight: { addFolder: '新增文件夹', diff --git a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue index 98d268d0..bbe5063e 100644 --- a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue @@ -58,6 +58,7 @@ +
{{ $t('processApprovalInformation') }}
@@ -124,6 +125,7 @@ import { getProcessDataById } from '@/api/workCenter' import MainDrafterInitBaseInfo from './modules/MainDrafterInitBaseInfo' +import ApproveBaseInfo from './modules/ApproveBaseInfo' // 人员信息 const personalInfo = [ // 人员信息的数据 @@ -171,6 +173,7 @@ const personalInfo = [ // 人员信息的数据 export default { name: 'EnterpriseStandardChangeFlow', components: { + ApproveBaseInfo, MainDrafterInitBaseInfo, InternalDetailPage, ProcessDetailList, @@ -450,6 +453,6 @@ export default { } - diff --git a/src/views/workCenter/enterpriseStandardChange/modules/ApproveBaseInfo.vue b/src/views/workCenter/enterpriseStandardChange/modules/ApproveBaseInfo.vue new file mode 100644 index 00000000..4e43504f --- /dev/null +++ b/src/views/workCenter/enterpriseStandardChange/modules/ApproveBaseInfo.vue @@ -0,0 +1,170 @@ + + + + + diff --git a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue index 5943d04e..7de778c4 100644 --- a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue @@ -1,6 +1,6 @@ @@ -154,6 +166,21 @@ export default { handleCancel () { this.close() }, + // 提交并新增 + handleSubmitAddAdd () { + if (this.confirmLoading) return + this.form.validateFields((err, values) => { + if (!err) { + this.confirmLoading = true + const param = Object.assign({}, values) + console.log(param) + this.$emit('ok', param, this.index) + this.form.resetFields() + this.model = {} + this.confirmLoading = false + } + }) + }, handleOk () { if (this.confirmLoading) return this.form.validateFields((err, values) => { diff --git a/src/views/workCenter/processCenter/table/DoneList.vue b/src/views/workCenter/processCenter/table/DoneList.vue index fde48cf5..fc197c90 100644 --- a/src/views/workCenter/processCenter/table/DoneList.vue +++ b/src/views/workCenter/processCenter/table/DoneList.vue @@ -142,7 +142,7 @@ export default { } ], url: { - list: '/process/center/doneTaskList' + list: '/workCenter/getCompletedList' } } }, diff --git a/src/views/workCenter/processCenter/table/DraftList.vue b/src/views/workCenter/processCenter/table/DraftList.vue index 59499173..a69c4914 100644 --- a/src/views/workCenter/processCenter/table/DraftList.vue +++ b/src/views/workCenter/processCenter/table/DraftList.vue @@ -103,7 +103,7 @@ export default { } ], url: { - list: '/process/center/draftList' + list: '/workCenter/getDraftList' } } }, diff --git a/src/views/workCenter/processCenter/table/SentList.vue b/src/views/workCenter/processCenter/table/SentList.vue index 9fb3ef55..16d0d779 100644 --- a/src/views/workCenter/processCenter/table/SentList.vue +++ b/src/views/workCenter/processCenter/table/SentList.vue @@ -162,7 +162,7 @@ export default { } ], url: { - list: '/process/center/sendTaskList' + list: '/workCenter/getSentList' } } }, diff --git a/src/views/workCenter/processCenter/table/TodoList.vue b/src/views/workCenter/processCenter/table/TodoList.vue index 0150d2ab..ca8544eb 100644 --- a/src/views/workCenter/processCenter/table/TodoList.vue +++ b/src/views/workCenter/processCenter/table/TodoList.vue @@ -129,7 +129,7 @@ export default { } ], url: { - list: '/process/center/todoTaskList' + list: '/workCenter/getTodoList' }, currentTurnTo: {} // 当前转办 }