From 39fd5eebd0a6756e0c273a9faf27a8d493fb815c Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Mon, 18 Dec 2023 16:24:13 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?=
=?UTF-8?q?=E8=AE=A2=E6=A0=87=E5=87=86=E5=8C=96=E5=8F=91=E8=B5=B7=E6=B5=81?=
=?UTF-8?q?=E7=A8=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/common/lang/workCenter/en.js | 3 ++-
src/common/lang/workCenter/zh.js | 3 ++-
src/enums/commonEnums.js | 3 ++-
.../RevisionPlanStandardizationInitFlow.vue | 7 +++++--
.../modules/ContactSelectApproverBaseInfo.vue | 20 ++++++++++++++++++-
5 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js
index ed3a4f49..07ed12bf 100644
--- a/src/common/lang/workCenter/en.js
+++ b/src/common/lang/workCenter/en.js
@@ -106,7 +106,8 @@ module.exports = {
drafter: '主起草人',
pleaseSelectContact: '请选择联络人',
pleaseSelectApprover: '请选择审批人',
- pleaseSelectDrafter: '请选择主起草人'
+ pleaseSelectDrafter: '请选择主起草人',
+ pleaseSelectSameApprover: '请选择相同的审批人'
},
// 企标制修订流程
enStandardRevision: {
diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js
index c782db32..6b0475ab 100644
--- a/src/common/lang/workCenter/zh.js
+++ b/src/common/lang/workCenter/zh.js
@@ -107,7 +107,8 @@ module.exports = {
drafter: '主起草人',
pleaseSelectContact: '请选择联络人',
pleaseSelectApprover: '请选择审批人',
- pleaseSelectDrafter: '请选择主起草人'
+ pleaseSelectDrafter: '请选择主起草人',
+ pleaseSelectSameApprover: '请选择相同的审批人'
},
// 企标制修订流程
enStandardRevision: {
diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js
index 7ecec49f..17295cc0 100644
--- a/src/enums/commonEnums.js
+++ b/src/enums/commonEnums.js
@@ -446,7 +446,8 @@ export const EsRevisionPlanStandardizationInitNodes = new EsEnums({
mainDrafterEnterInfo: { text: '主起草人填写信息', value: 'sid-E2015AB3-9C52-4E49-A261-DA11CB4BAA7E' },
contactsApproval: { text: '部所联络人汇总', value: 'sid-158523C5-7D8F-4433-B2DB-8A6C09DFDB1B' },
mainDrafterLeaderApproval: { text: '主起草单位主管级领导批准', value: 'sid-57656F2E-0AE1-45D8-85D0-CE3E37D9E926' },
- standardizationSumUp: { text: '标准化归档', value: 'sid-86610E08-1DDB-467A-A32E-C661FE889A57' }
+ standardizationSumUp: { text: '标准化归档', value: 'sid-86610E08-1DDB-467A-A32E-C661FE889A57' },
+ standardizationTwoUpdate: { text: '标准化工程师二次修改调整', value: 'sid-BEAAC29F-17D8-4162-8C0B-01A4A8ED7729' }
})
// 企标制修订流程
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
index df07e3e6..1a329056 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
@@ -55,7 +55,7 @@
{{ $t('basicServiceInformation') }}
-
+
@@ -93,7 +93,7 @@
-
+
{{ $t('preservation') }}
@@ -205,6 +205,9 @@ export default {
} else if (nodeId === EsRevisionPlanStandardizationInitNodes.standardizationSumUp.value) {
// 标准化归档
this.currentNode = 9
+ } else if (nodeId === EsRevisionPlanStandardizationInitNodes.standardizationTwoUpdate.value) {
+ // 标准化归档
+ this.currentNode = 10
} else {
// 预留加签节点
this.currentNode = 999
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue
index e2768557..959dd9c6 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue
@@ -64,6 +64,11 @@ export default {
type: Boolean,
required: false,
default: false
+ },
+ currentNode: {
+ type: Number,
+ required: false,
+ default: 0
}
},
data () {
@@ -242,7 +247,20 @@ export default {
this.$message.warning(this.$t('workCenter.revisionPlanActivelyReport.pleaseSelectApprover'))
data = false
} else {
- data.dataSource = this.dataSource
+ if (this.currentNode === 5) {
+ // 是部所联络人修改调整节点，即被驳回到了部所联络人选审批人，需要审批人是同一个人
+ const arr = this.dataSource.map(item => item.approvalUser)
+ const isEquals = arr.every(item => item === arr[0])
+ if (!isEquals) {
+ // 不是同一个人，提示
+ this.$message.warning(this.$t('workCenter.revisionPlanActivelyReport.pleaseSelectSameApprover'))
+ data = false
+ } else {
+ data.dataSource = this.dataSource
+ }
+ } else {
+ data.dataSource = this.dataSource
+ }
}
return data
},