From 9964e443a9262dfd3ba7e1d4f654e1737837cfc0 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Fri, 22 Mar 2024 22:24:15 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=97=A0=E6=B3=95=E5=B0=86=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E6=89=93=E5=9B=9Ebug=E4=BF=AE=E5=A4=8D=202=E3=80=81fo?=
 =?UTF-8?q?rm=E8=A1=A8=E5=8D=95=E6=A0=A1=E9=AA=8C=E5=90=8E=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=203=E3=80=81=E9=A1=B5=E9=9D=A2=E4=B8=A2=E5=A4=B1?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AFbug=E4=BF=AE=E5=A4=8D=204=E3=80=81=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BAexcel=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow/components/sendUtil.vue       | 12 +++++++++++-
 src/views/xgf/insert/components/corpInfoAdd.vue  | 12 ++++++------
 src/views/xgf/insert/components/corpInfoEdit.vue | 13 +++++++------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue
index 1e7f19e..2b39e7a 100644
--- a/src/views/xgf/flow/components/sendUtil.vue
+++ b/src/views/xgf/flow/components/sendUtil.vue
@@ -173,7 +173,8 @@ export default {
         } else {
           this.isShow = false
         }
-      } else {
+      }
+      if (this.info.FLOWS_TYPE === '1') {
         this.isShow = true
         if (this.info.FLOWS_STEP === 2 || this.info.FLOWS_STEP === 3) {
           await this.getDepartmentTree()
@@ -186,6 +187,15 @@ export default {
           this.corpFlag = true
         }
       }
+      if (this.info.FLOWS_TYPE === '2') {
+        if (this.info.FLOWS_STEP === 1) {
+          this.isShow = true
+          await this.getDepartmentTree()
+          this.corpFlag = false
+        } else {
+          this.isShow = false
+        }
+      }
       this.loading = false
     },
     getMenu() {
diff --git a/src/views/xgf/insert/components/corpInfoAdd.vue b/src/views/xgf/insert/components/corpInfoAdd.vue
index db12012..46fe8e2 100644
--- a/src/views/xgf/insert/components/corpInfoAdd.vue
+++ b/src/views/xgf/insert/components/corpInfoAdd.vue
@@ -435,6 +435,12 @@ export default {
     submitForm() {
       this.$refs.form.validate(valid => {
         if (valid) {
+          if (this.form.MAIN_DEPARTMENT.indexOf('0') > -1 && this.form.MAIN_DEPARTMENT.length > 1) {
+            this.listLoading = false
+            this.submitButtonLoading = false
+            this.$message.error('主管部门选无时不能选择其他部门')
+            return
+          }
           this.listLoading = true
           this.submitButtonLoading = true
           if (this.form.POSSESSION && this.form.POSSESSION.length > 0) {
@@ -452,12 +458,6 @@ export default {
             this.form.MANAGER_DEPARTMENT_ID = this.form.MANAGER_DEPARTMENT_ID.join(',')
           }
           this.form.CORP_TYPE = JSON.stringify(this.form.CORP_TYPE)
-          if (this.form.MAIN_DEPARTMENT.indexOf('0') > -1 && this.form.MAIN_DEPARTMENT.length > 1) {
-            this.listLoading = false
-            this.buttonLoading = false
-            this.$message.error('主管部门选无时不能选择其他部门')
-            return
-          }
           this.form.MAIN_DEPARTMENT = JSON.stringify(this.form.MAIN_DEPARTMENT)
           requestFN(
             '/relevantunits/saveCorpInfo',
diff --git a/src/views/xgf/insert/components/corpInfoEdit.vue b/src/views/xgf/insert/components/corpInfoEdit.vue
index c5eb44f..4a1668e 100644
--- a/src/views/xgf/insert/components/corpInfoEdit.vue
+++ b/src/views/xgf/insert/components/corpInfoEdit.vue
@@ -560,6 +560,12 @@ export default {
         if (valid) {
           this.listLoading = true
           this.buttonLoading = true
+          if (this.form.MAIN_DEPARTMENT.indexOf('0') > -1 && this.form.MAIN_DEPARTMENT.length > 1) {
+            this.listLoading = false
+            this.submitButtonLoading = false
+            this.$message.error('主管部门选无时不能选择其他部门')
+            return
+          }
           if (this.form.POSSESSION && this.form.POSSESSION.length > 0) {
             this.form.PROVINCE = this.form.POSSESSION[0] || ''
             this.form.CITY = this.form.POSSESSION[1] || ''
@@ -573,12 +579,7 @@ export default {
           if (this.form.COMPETENT_DEPT_ID) {
             this.form.COMPETENT_DEPT_ID = this.form.COMPETENT_DEPT_ID.join(',')
           }
-          if (this.form.MAIN_DEPARTMENT.indexOf('0') > -1 && this.form.MAIN_DEPARTMENT.length > 1) {
-            this.listLoading = false
-            this.buttonLoading = false
-            this.$message.error('主管部门选无时不能选择其他部门')
-            return
-          }
+          this.form.MAIN_DEPARTMENT = JSON.stringify(this.form.MAIN_DEPARTMENT)
           if (this.form.MANAGER_DEPARTMENT_ID) {
             this.form.MANAGER_DEPARTMENT_ID = JSON.stringify(this.form.MANAGER_DEPARTMENT_ID)
           }