diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js
index 58c83b82..43b2ba06 100644
--- a/src/enums/commonEnums.js
+++ b/src/enums/commonEnums.js
@@ -428,13 +428,15 @@ export const EsRevisionPlanActivityReportNodes = new EsEnums({
// 年度制修订计划-标准化发起
export const EsRevisionPlanStandardizationInitNodes = new EsEnums({
- standardizationStart: { text: '标准化工程师发起', value: 'sid-A6DD8A92-30D8-4733-9EE3-D8C6636D73C6' },
- contactSelectApprover: { text: '部所联络人选取审批人', value: 'sid-ECCB8ADE-F528-482C-8714-0D33471EF662' },
- mainDrafterLeaderSend: { text: '主起草单位主管级领导审批下发', value: 'sid-B6F66797-8F09-4B84-AA8E-28B841067217' },
- mainDrafterEnterInfo: { text: '主起草人填写信息', value: 'sid-2A8155BC-4634-4353-BD0E-89CE07F0D335' },
- contactsApproval: { text: '部所联络人汇总', value: 'sid-69F04E36-5EDB-4693-8284-FFF3FCBE2B3D' },
- mainDrafterLeaderApproval: { text: '主起草单位主管级领导批准', value: 'sid-60783E25-8671-404F-9E7D-B9181CA07B69' },
- standardizationSumUp: { text: '标准化归档', value: 'sid-482034AD-DB3C-4A93-9E0D-B8834F4767F0' }
+ standardizationStart: { text: '标准化工程师发起', value: 'sid-880237E7-1735-49AE-B9EC-D7DA5D28E17D' },
+ contactSelectApprover: { text: '部所联络人选取审批人', value: 'sid-C3F65D96-76B0-4901-8C8A-D6B390099381' },
+ standardizationUpdate: { text: '标准化工程师修改调整', value: 'sid-3CB0E6B1-9918-4A21-9C62-9344FF1B7269' },
+ mainDrafterLeaderSend: { text: '主起草单位主管级领导审批下发', value: 'sid-57656F2E-0AE1-45D8-85D0-CE3E37D9E926' },
+ contactUpdate: { text: '部所联络人修改调整', value: 'sid-3AF454B3-1D93-4BF6-B925-98F1A7E125B8' },
+ mainDrafterEnterInfo: { text: '主起草人填写信息', value: 'sid-E2015AB3-9C52-4E49-A261-DA11CB4BAA7E' },
+ contactsApproval: { text: '部所联络人汇总', value: 'sid-158523C5-7D8F-4433-B2DB-8A6C09DFDB1B' },
+ mainDrafterLeaderApproval: { text: '主起草单位主管级领导批准', value: 'sid-050827D6-AA12-4561-8B37-4D2023AF6D7F' },
+ standardizationSumUp: { text: '标准化归档', value: 'sid-86610E08-1DDB-467A-A32E-C661FE889A57' }
})
// 企标制修订流程
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
index c8d691c2..101de1ad 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
@@ -55,11 +55,11 @@
{{ $t('basicServiceInformation') }}
-
+
-
+
-
+
@@ -99,8 +99,8 @@
{{ $t('submit') }}
-
-
+
+
{{ $t('turnTo') }}
@@ -108,7 +108,7 @@
{{ $t('submit') }}
-
+
{{ $t('submit') }}
@@ -183,21 +183,27 @@ export default {
} else if (nodeId === EsRevisionPlanStandardizationInitNodes.contactSelectApprover.value) {
// 部所联络人选取审批人
this.currentNode = 2
+ } else if (nodeId === EsRevisionPlanStandardizationInitNodes.standardizationUpdate.value) {
+ // 标准化工程师修改调整(隐藏节点)
+ this.currentNode = 3
} else if (nodeId === EsRevisionPlanStandardizationInitNodes.mainDrafterLeaderSend.value) {
// 主起草单位主管级领导审批下发
- this.currentNode = 3
+ this.currentNode = 4
+ } else if (nodeId === EsRevisionPlanStandardizationInitNodes.contactUpdate.value) {
+ // 部所联络人修改调整(隐藏节点)
+ this.currentNode = 5
} else if (nodeId === EsRevisionPlanStandardizationInitNodes.mainDrafterEnterInfo.value) {
// 主起草人填写信息
- this.currentNode = 4
+ this.currentNode = 6
} else if (nodeId === EsRevisionPlanStandardizationInitNodes.contactsApproval.value) {
// 部所联络人汇总
- this.currentNode = 5
+ this.currentNode = 7
} else if (nodeId === EsRevisionPlanStandardizationInitNodes.mainDrafterLeaderApproval.value) {
// 主起草单位主管级领导批准
- this.currentNode = 6
+ this.currentNode = 8
} else if (nodeId === EsRevisionPlanStandardizationInitNodes.standardizationSumUp.value) {
// 标准化归档
- this.currentNode = 7
+ this.currentNode = 9
} else {
// 预留加签节点
this.currentNode = 999
@@ -307,8 +313,9 @@ export default {
if (type === 'draft') {
this.approvalInfoForm.setFieldsValue(pick(this.model.common, 'commitText', 'commitFile'))
}
+ // 初始化业务基本信息
+ this.$refs.baseInfoRef.initData(this.model.dataList)
})
- this.$refs.baseInfoRef.initData(this.model.dataList)
} else {
this.$message.warning(res.message)
}
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue
index 210903be..7b8a0d9c 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue
@@ -54,10 +54,11 @@
import JTable from '@/components/jero/JTable'
// 选人弹框
import UserSelectModal from '@/components/selection/UserSelectModal'
+import UserSelectByContact from '@/components/selection/UserSelectByContact'
export default {
name: 'ContactSelectApproverBaseInfo',
- components: { JTable, UserSelectModal },
+ components: { JTable, UserSelectModal, UserSelectByContact },
props: {
disabled: {
type: Boolean,