From beb777a66d96ad64dd7dc2211dc11124c5d902e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Wed, 29 Nov 2023 17:52:52 +0800
Subject: [PATCH] =?UTF-8?q?UAT=E5=8F=98=E6=9B=B4=20=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BA=E8=B5=B7=E8=8D=89=E3=80=81=E5=BE=81?=
 =?UTF-8?q?=E6=B1=82=E6=84=8F=E8=A7=81=E3=80=81=E5=AE=A1=E6=9F=A5=E3=80=81?=
 =?UTF-8?q?=E6=8A=A5=E6=89=B9=E7=AD=89=E7=8A=B6=E6=80=81=E6=97=B6=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E6=97=A5=E6=9C=9F=E3=80=81=E5=AE=9E=E6=96=BD=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E4=B8=8D=E5=BA=94=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9?=
 =?UTF-8?q?=EF=BC=88=E5=9B=BD=E5=86=85=E3=80=81=E6=B5=B7=E5=A4=96=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AE=A1=E6=9F=A5=E7=8A=B6=E6=80=81=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/customField/AddForm.vue                   | 2 +-
 src/enums/commonEnums.js                                 | 9 +++++----
 .../StandardEntryOrChangeProcess.vue                     | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue
index e9f30bf4..0700e61b 100644
--- a/src/components/customField/AddForm.vue
+++ b/src/components/customField/AddForm.vue
@@ -681,7 +681,7 @@ export default {
       let notRequiredStatus = [], fields = []
       // 国内和海外的标准状态是同一个数据字典
       if (this.flag === StandardSource.DOMESTIC.value || this.flag === StandardSource.OVERSEAS.value) {
-        notRequiredStatus = [StandardStatus.DRAFT.value, StandardStatus.SEEK_FOR_OPTIONS.value, StandardStatus.APPROVAL.value]
+        notRequiredStatus = [StandardStatus.DRAFT.value, StandardStatus.SEEK_FOR_OPTIONS.value, StandardStatus.EXAMINE.value, StandardStatus.APPROVAL.value]
         fields = ['release_date', 'implementation_date']
       } else { // 处理企标
         notRequiredStatus = [EnterpriseStandardStatus.DRAFT.value, EnterpriseStandardStatus.SEEK_FOR_OPTIONS.value, EnterpriseStandardStatus.EXAMINE.value, EnterpriseStandardStatus.APPROVAL.value]
diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js
index 1a051f94..8e3a1ac8 100644
--- a/src/enums/commonEnums.js
+++ b/src/enums/commonEnums.js
@@ -137,6 +137,7 @@ export const IsTrial = {
 export const StandardStatus = {
   DRAFT: { text: '起草', value: '1' },
   SEEK_FOR_OPTIONS: { text: '征求意见', value: '2' },
+  EXAMINE: { text: '审查', value: '2.1' },
   APPROVAL: { text: '报批', value: '3' },
   RELEASE: { text: '发布', value: '4' },
   BE_IMPLEMENTED_SOON: { text: '即将实施', value: '5' },
@@ -395,10 +396,10 @@ export const EsStartUseNodes = new EsEnums({
 // 法规合规流程节点
 export const StandardComplianceNodes = new EsEnums({
   initial: { text: '法规工程师发起', value: '1', btn: ['save', 'submit'] },
-  departLeaderIssue: { text: '部所主管级领导下发', value: '2', btn: [] },
-  moduleOwnerIssue: { text: '模块责任人分发', value: '3', btn: [] },
-  designEngineerAssess: { text: '设计工程师评估', value: '4', btn: [] },
-  moduleOwnerReview: { text: '模块责任人审批', value: '5', btn: [] },
+  departLeaderIssue: { text: '部所主管级领导下发', value: '2', btn: ['return', 'save', 'submit'] },
+  moduleOwnerIssue: { text: '模块责任人分发', value: '3', btn: ['return', 'save', 'submit'] },
+  designEngineerAssess: { text: '设计工程师评估', value: '4', btn: ['return', 'save', 'submit'] },
+  moduleOwnerReview: { text: '模块责任人审批', value: '5', btn: ['return', 'save', 'agree', 'reject'] },
   departLeaderApprove: { text: '部所主管级领导审批', value: '6', btn: [] },
   regulatoryEngineerApprove: { text: '法规工程师审批', value: '7', btn: [] },
   designEngineerWriteProject: { text: '设计工程师补充立项项目号', value: '8', btn: [] }
diff --git a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
index 66c0b958..3a7ad655 100644
--- a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
+++ b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
@@ -1094,7 +1094,7 @@ export default {
      * @param val
      */
     handleRequiredByState (val) {
-      const notRequiredStatus = [StandardStatus.DRAFT.value, StandardStatus.SEEK_FOR_OPTIONS.value, StandardStatus.APPROVAL.value]
+      const notRequiredStatus = [StandardStatus.DRAFT.value, StandardStatus.SEEK_FOR_OPTIONS.value, StandardStatus.EXAMINE.value, StandardStatus.APPROVAL.value]
       const fields = ['release_date', 'implementation_date']
       const rules = JSON.parse(JSON.stringify(this.rules))
       if (notRequiredStatus.includes(val)) {