diff --git a/src/api/enterpriseStandardLibraryApi.js b/src/api/enterpriseStandardLibraryApi.js index 25c3156d..94f5e933 100644 --- a/src/api/enterpriseStandardLibraryApi.js +++ b/src/api/enterpriseStandardLibraryApi.js @@ -53,6 +53,8 @@ const initReview = (params) => getAction('', params) // 企标计划-根据id获取计划详情 const getEnterpriseStandardPlanInfoById = (params) => getAction('/enterprise/plan/detail', params) +// 企标计划-分页获取(选择企标计划组件中用) +const getEnterpriseStandardPlanPage = (params) => getAction('/enterprise/plan/page', params) export { getEnterpriseStandardTableHeader, @@ -83,5 +85,6 @@ export { initReview, - getEnterpriseStandardPlanInfoById + getEnterpriseStandardPlanInfoById, + getEnterpriseStandardPlanPage } diff --git a/src/api/workCenter.js b/src/api/workCenter.js index aba92fab..c5cda46f 100644 --- a/src/api/workCenter.js +++ b/src/api/workCenter.js @@ -16,7 +16,8 @@ const enterprisePlanApprovalTurnTo = (params) => postAction('', params) const enterprisePlanApprovalAgree = (params) => postAction('', params) // 驳回 const enterprisePlanApprovalReject = (params) => postAction('', params) - +// 确定 +const enterprisePlanApprovalDetermine = (params) => postAction('', params) export { deployWorkFlow, getFlowNodeList, @@ -25,5 +26,6 @@ export { enterprisePlanApprovalTurnTo, enterprisePlanApprovalAgree, - enterprisePlanApprovalReject + enterprisePlanApprovalReject, + enterprisePlanApprovalDetermine } diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 879b6a92..1d19a0d6 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -500,6 +500,10 @@ module.exports = { releaseDate: 'Release date', textState: 'Text state' }, + // 企标计划选择器 + enterprisePlanSelect: { + title: '企标计划选择' + }, // 用户/组织结构选择器 userOrOrganSelect: { select: 'Select', @@ -515,7 +519,9 @@ module.exports = { selectUser: 'Select User', userList: 'Users List', name: 'name', - post: 'Post' + post: 'Post', + selectedPersonnel: '已选人员', + workGroup: '内部工作组' }, // 弹框上传附件 uploadFile: { diff --git a/src/common/lang/system/en.js b/src/common/lang/system/en.js index 21cfea1d..6daf2c14 100644 --- a/src/common/lang/system/en.js +++ b/src/common/lang/system/en.js @@ -80,5 +80,12 @@ module.exports = { isShelf: 'Shelf Or Not', sort: 'Sort', shelfWarn: 'the link is empty please fill in the link first' + }, + // 联络人管理 + contact: { + departName: '部门名称', + standardizationEngineer: '标准化工程师', + contactPerson: '联络人', + contactPersonSupervisorLevelLeader: '部门联络人主管级领导' } } diff --git a/src/common/lang/system/zh.js b/src/common/lang/system/zh.js index df6ed506..b5688473 100644 --- a/src/common/lang/system/zh.js +++ b/src/common/lang/system/zh.js @@ -81,5 +81,12 @@ module.exports = { isShelf: '是否上架', sort: '排序', shelfWarn: '链接为空,请先填写链接' + }, + // 联络人管理 + contact: { + departName: '部门名称', + standardizationEngineer: '标准化工程师', + contactPerson: '联络人', + contactPersonSupervisorLevelLeader: '部门联络人主管级领导' } } diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js index bde541e4..b7304b50 100644 --- a/src/common/lang/workCenter/en.js +++ b/src/common/lang/workCenter/en.js @@ -72,7 +72,9 @@ module.exports = { originalDraftPlanFinishDate: '原草稿计划完成日期', originalExposureDraftPlanFinishDate: '原征求意见稿计划完成日期', originalPlanSubmissionDate: '原计划报批日期', - changeReason: '变更原因' + changeReason: '变更原因', + superintendent: '所长', + relatedPersonnel: '相关人员' }, // 流程配置 processConfig: { diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index bde541e4..b7304b50 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -72,7 +72,9 @@ module.exports = { originalDraftPlanFinishDate: '原草稿计划完成日期', originalExposureDraftPlanFinishDate: '原征求意见稿计划完成日期', originalPlanSubmissionDate: '原计划报批日期', - changeReason: '变更原因' + changeReason: '变更原因', + superintendent: '所长', + relatedPersonnel: '相关人员' }, // 流程配置 processConfig: { diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 6426de1c..f1883343 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -501,6 +501,10 @@ module.exports = { releaseDate: '发布日期', textState: '文本状态' }, + // 企标计划选择器 + enterprisePlanSelect: { + title: '企标计划选择' + }, // 用户/组织结构选择器 userOrOrganSelect: { select: '选择', @@ -517,7 +521,8 @@ module.exports = { userList: '用户列表', name: '姓名', post: '岗位', - selectedPersonnel: '已选人员' + selectedPersonnel: '已选人员', + workGroup: '内部工作组' }, // 弹框上传附件 uploadFile: { diff --git a/src/components/PersonnelInfo.vue b/src/components/PersonnelInfo.vue index ba08ac61..0ac44d73 100644 --- a/src/components/PersonnelInfo.vue +++ b/src/components/PersonnelInfo.vue @@ -29,7 +29,9 @@
{{ step.userList }}
@@ -48,10 +50,12 @@ + + diff --git a/src/components/selection/EnterprisePlanSelectionModal.vue b/src/components/selection/EnterprisePlanSelectionModal.vue new file mode 100644 index 00000000..fb63b070 --- /dev/null +++ b/src/components/selection/EnterprisePlanSelectionModal.vue @@ -0,0 +1,316 @@ + + + + + diff --git a/src/components/selection/StandardSelection.vue b/src/components/selection/StandardSelection.vue index bf00231e..ff0e77c1 100644 --- a/src/components/selection/StandardSelection.vue +++ b/src/components/selection/StandardSelection.vue @@ -8,7 +8,7 @@ {{this.$t('standardSelect.standardSelection')}} - + @@ -46,9 +46,6 @@ export default { }, modalNameChange (value) { this.$emit('nameChange', value) - }, - modalListChange (value) { - this.$emit('listChange', value) } }, model: { diff --git a/src/components/selection/StandardSelectionModal.vue b/src/components/selection/StandardSelectionModal.vue index 5735380f..4d1dcf50 100644 --- a/src/components/selection/StandardSelectionModal.vue +++ b/src/components/selection/StandardSelectionModal.vue @@ -193,7 +193,6 @@ export default { }) this.$emit('change', serialNumber.join(',')) this.$emit('nameChange', serialNameArr.join(',')) - this.$emit('listChange', this.selectedRowList) this.visible = false } else { this.$message.warning(this.$t('selectLeastOne')) diff --git a/src/components/selection/UserSelectByContact.vue b/src/components/selection/UserSelectByContact.vue new file mode 100644 index 00000000..18a9777c --- /dev/null +++ b/src/components/selection/UserSelectByContact.vue @@ -0,0 +1,116 @@ + + + + + diff --git a/src/components/selection/UserSelectByContactModal.vue b/src/components/selection/UserSelectByContactModal.vue new file mode 100644 index 00000000..5a4dae01 --- /dev/null +++ b/src/components/selection/UserSelectByContactModal.vue @@ -0,0 +1,320 @@ + + + + + diff --git a/src/components/selection/UserSelectByWorkGroup.vue b/src/components/selection/UserSelectByWorkGroup.vue new file mode 100644 index 00000000..ffff8e6c --- /dev/null +++ b/src/components/selection/UserSelectByWorkGroup.vue @@ -0,0 +1,116 @@ + + + + + diff --git a/src/components/selection/UserSelectByWorkGroupModal.vue b/src/components/selection/UserSelectByWorkGroupModal.vue new file mode 100644 index 00000000..c9094a59 --- /dev/null +++ b/src/components/selection/UserSelectByWorkGroupModal.vue @@ -0,0 +1,365 @@ + + + + + diff --git a/src/views/system/contactManage/ContactManageList.vue b/src/views/system/contactManage/ContactManageList.vue new file mode 100644 index 00000000..9a0e508c --- /dev/null +++ b/src/views/system/contactManage/ContactManageList.vue @@ -0,0 +1,121 @@ + + + + + diff --git a/src/views/system/contactManage/modules/ContactManageModal.vue b/src/views/system/contactManage/modules/ContactManageModal.vue new file mode 100644 index 00000000..85a173c0 --- /dev/null +++ b/src/views/system/contactManage/modules/ContactManageModal.vue @@ -0,0 +1,171 @@ + + + + + diff --git a/src/views/workCenter/enterpriseStandardInitChange/flow/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/flow/PlanApprovalChangeFlow.vue index 31c2979f..7b61ccfa 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/flow/PlanApprovalChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/flow/PlanApprovalChangeFlow.vue @@ -11,6 +11,7 @@ +
{{ $t('processInformation') }}
@@ -36,14 +37,16 @@ v-decorator="['expirationDate']" /> - - - - + + + + + + @@ -90,7 +93,6 @@ {{ $t('workCenter.enterpriseInitChangePlan.completionTimeChange') }} {{ $t('workCenter.enterpriseInitChangePlan.terminationOfWork') }} @@ -107,6 +109,7 @@ v-if="formInline.applicationType === 1" ref="approvalBaseInfo" :disabled="disabled" + :currentNode="currentNode" :itemCategory="formInline.itemCategory"> @@ -114,9 +117,34 @@ v-else-if="formInline.applicationType === 2" ref="changeBaseInfo" :disabled="disabled" + :currentNode="currentNode" > + + + + + + + + + + + + + + + + + +
{{ $t('processApprovalInformation') }}
@@ -133,18 +161,33 @@
+
- +
+ -