From ea8d0246289466521b096c8067d04ec2beddaaad Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Wed, 20 Dec 2023 17:40:38 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7=E4=BA=BA=E5=91=98=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=B2=A1=E5=A1=AB=E8=B7=B3tab=EF=BC=8C=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=87=E6=B3=A8=E6=97=A2=E5=BC=B9=E6=A1=86=E4=B9=9F?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RevisionPlanActivelyReportFlow.vue                        | 4 +++-
 .../RevisionPlanStandardizationInitFlow.vue                   | 4 +++-
 .../enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue   | 4 +++-
 .../enterpriseStandardChange/EnterpriseStandardChangeFlow.vue | 4 +++-
 .../enterpriseStandardInitChange/PlanApprovalChangeFlow.vue   | 3 ++-
 .../EnterpriseStandardRecheckFlow.vue                         | 4 +++-
 .../EnterpriseStandardRevisionFlow.vue                        | 4 +++-
 .../EnterpriseStandardSealSaveFlow.vue                        | 4 +++-
 .../EnterpriseStandardStartUseFlow.vue                        | 4 +++-
 9 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue
index c90844b3..24ff3454 100644
--- a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue
+++ b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue
@@ -498,6 +498,7 @@ export default {
       // 人员信息的数据, 处理成对象
       const personnelObj = this.$refs.personnelInfo.getDataObjVerify()
       if (!personnelObj) {
+        this.switchValue = 'user'
         return
       }
       // 流程信息校验
@@ -529,6 +530,8 @@ export default {
             }).finally(() => {
               this.loading = false
             })
+          } else {
+            this.switchValue = 'base'
           }
         })
       })
@@ -630,7 +633,6 @@ export default {
       this.validatorRules.commitText.rules[0].required = true
       if (!this.approvalInfoForm.getFieldValue('commitText')) {
         this.$message.warning(this.$t('pleaseEnterRemarks'))
-        return
       }
       this.$nextTick(() => {
         this.approvalInfoForm.validateFields((err, values) => {
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
index 9aaf6345..443dd9fe 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
@@ -406,6 +406,7 @@ export default {
       // 人员信息的数据, 处理成对象
       const personnelObj = this.$refs.personnelInfo.getDataObjVerify()
       if (!personnelObj) {
+        this.switchValue = 'user'
         return
       }
       this.processInfoForm.validateFields((err, values) => {
@@ -435,6 +436,8 @@ export default {
             }).finally(() => {
               this.loading = false
             })
+          } else {
+            this.switchValue = 'base'
           }
         })
       })
@@ -528,7 +531,6 @@ export default {
       this.validatorRules.commitText.rules[0].required = true
       if (!this.approvalInfoForm.getFieldValue('commitText')) {
         this.$message.warning(this.$t('pleaseEnterRemarks'))
-        return
       }
       this.$nextTick(() => {
         this.approvalInfoForm.validateFields((err, values) => {
diff --git a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue
index 80e187d4..2481c40e 100644
--- a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue
+++ b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue
@@ -358,6 +358,7 @@ export default {
       // 人员信息的数据, 处理成对象
       const personnelObj = this.$refs.personnelInfo.getDataObjVerify()
       if (!personnelObj) {
+        this.switchValue = 'user'
         return
       }
       // 流程信息的校验
@@ -389,6 +390,8 @@ export default {
             }).finally(() => {
               this.loading = false
             })
+          } else {
+            this.switchValue = 'base'
           }
         })
       })
@@ -452,7 +455,6 @@ export default {
       this.validatorRules.commitText.rules[0].required = true
       if (!this.approvalInfoForm.getFieldValue('commitText')) {
         this.$message.warning(this.$t('pleaseEnterRemarks'))
-        return
       }
       this.$nextTick(() => {
         this.approvalInfoForm.validateFields((err, values) => {
diff --git a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue
index ea5b0a26..28cef3d9 100644
--- a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue
+++ b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue
@@ -370,6 +370,7 @@ export default {
       // 人员信息的数据, 处理成对象
       const personnelObj = this.$refs.personnelInfo.getDataObjVerify()
       if (!personnelObj) {
+        this.switchValue = 'user'
         return
       }
       // 流程信息的校验
@@ -402,6 +403,8 @@ export default {
             }).finally(() => {
               this.loading = false
             })
+          } else {
+            this.switchValue = 'base'
           }
         })
       })
@@ -465,7 +468,6 @@ export default {
       this.validatorRules.commitText.rules[0].required = true
       if (!this.approvalInfoForm.getFieldValue('commitText')) {
         this.$message.warning(this.$t('pleaseEnterRemarks'))
-        return
       }
       this.$nextTick(() => {
         this.approvalInfoForm.validateFields((err, values) => {
diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
index 6103fc43..9999d8eb 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
@@ -782,6 +782,7 @@ export default {
       const personnelObj = this.$refs.personnelInfo.getDataObjVerify()
       // 校验是否填了所有能填的人员信息
       if (!personnelObj) {
+        this.switchValue = 'user'
         return
       }
       // 专家审批至少需要选两个专家 todo: 后端选多人流程进行不下去，暂时不限制传多人
@@ -860,6 +861,7 @@ export default {
               })
             }
             if (haveErr) {
+              this.switchValue = 'base'
               return
             }
             const param = {} // 需要传给后端的数据
@@ -985,7 +987,6 @@ export default {
       this.validatorRules.commitText.rules[0].required = true
       if (!this.approvalInfoForm.getFieldValue('commitText')) {
         this.$message.warning(this.$t('pleaseEnterRemarks'))
-        return
       }
       this.$nextTick(() => {
         this.approvalInfoForm.validateFields((err, values) => {
diff --git a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
index 450ffedd..c9986e68 100644
--- a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
+++ b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
@@ -412,6 +412,7 @@ export default {
       // 人员信息的数据, 处理成对象
       const personnelObj = this.$refs.personnelInfo.getDataObjVerify()
       if (!personnelObj) {
+        this.switchValue = 'user'
         return
       }
       // 流程信息的校验
@@ -443,6 +444,8 @@ export default {
             }).finally(() => {
               this.loading = false
             })
+          } else {
+            this.switchValue = 'base'
           }
         })
       })
@@ -531,7 +534,6 @@ export default {
       this.validatorRules.commitText.rules[0].required = true
       if (!this.approvalInfoForm.getFieldValue('commitText')) {
         this.$message.warning(this.$t('pleaseEnterRemarks'))
-        return
       }
       this.$nextTick(() => {
         this.approvalInfoForm.validateFields((err, values) => {
diff --git a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue
index 668b3600..00f201f3 100644
--- a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue
@@ -477,6 +477,7 @@ export default {
       // 人员信息的数据, 处理成对象
       const personnelObj = this.$refs.personnelInfo.getDataObjVerify()
       if (!personnelObj) {
+        this.switchValue = 'user'
         return
       }
       this.processInfoForm.validateFields((err, values) => {
@@ -511,6 +512,8 @@ export default {
             }).finally(() => {
               this.loading = false
             })
+          } else {
+            this.switchValue = 'base'
           }
         })
       })
@@ -602,7 +605,6 @@ export default {
       this.validatorRules.commitText.rules[0].required = true
       if (!this.approvalInfoForm.getFieldValue('commitText')) {
         this.$message.warning(this.$t('pleaseEnterRemarks'))
-        return
       }
       this.$nextTick(() => {
         this.approvalInfoForm.validateFields((err, values) => {
diff --git a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue
index d3f5a2bb..944ee09b 100644
--- a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue
+++ b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue
@@ -360,6 +360,7 @@ export default {
       // 人员信息的数据, 处理成对象
       const personnelObj = this.$refs.personnelInfo.getDataObjVerify()
       if (!personnelObj) {
+        this.switchValue = 'user'
         return
       }
       // 流程信息的校验
@@ -391,6 +392,8 @@ export default {
             }).finally(() => {
               this.loading = false
             })
+          } else {
+            this.switchValue = 'base'
           }
         })
       })
@@ -454,7 +457,6 @@ export default {
       this.validatorRules.commitText.rules[0].required = true
       if (!this.approvalInfoForm.getFieldValue('commitText')) {
         this.$message.warning(this.$t('pleaseEnterRemarks'))
-        return
       }
       this.$nextTick(() => {
         this.approvalInfoForm.validateFields((err, values) => {
diff --git a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue
index 12666436..08a70e7c 100644
--- a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue
+++ b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue
@@ -358,6 +358,7 @@ export default {
       // 人员信息的数据, 处理成对象
       const personnelObj = this.$refs.personnelInfo.getDataObjVerify()
       if (!personnelObj) {
+        this.switchValue = 'user'
         return
       }
       // 流程信息的校验
@@ -389,6 +390,8 @@ export default {
             }).finally(() => {
               this.loading = false
             })
+          } else {
+            this.switchValue = 'base'
           }
         })
       })
@@ -452,7 +455,6 @@ export default {
       this.validatorRules.commitText.rules[0].required = true
       if (!this.approvalInfoForm.getFieldValue('commitText')) {
         this.$message.warning(this.$t('pleaseEnterRemarks'))
-        return
       }
       this.$nextTick(() => {
         this.approvalInfoForm.validateFields((err, values) => {