From a9c1b124717a5dd466894964014811de8737d29d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 11 Jan 2022 10:20:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=E6=B5=81=E7=A8=8B=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qbzxdjhgk/component/establish.vue             | 12 +++++++++++-
 .../creatProcess/qbzxdjhgk/component/merge.vue    | 15 ++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
index dd759d443..2c01e202f 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
@@ -283,7 +283,6 @@
             :data="standSystemOptions"
             show-checkbox
             node-key="id"
-            default-expand-all
             check-strictly
             :default-checked-keys="TXJGList"
             :props="defaultProps">
@@ -591,18 +590,26 @@ export default {
       this.modalshowflag2 = true;
     },
     checkedRole2(data) {
+      console.log(data);
       let idList = "", nameList = ""
+      let unitList = "", unitNameList = ""
       data.forEach(item => {
         if (nameList.length) {
           nameList += ",";
           idList += ",";
+          unitList += ",";
+          unitNameList += ",";
         }
         idList += item.id;
         nameList += item.name;
+        unitList += item.institutionId
+        unitNameList += item.institutionName
       });
       if(this.roleType === '1'){
         this.$set(this.qbfsForm, 'drafter', idList)
         this.$set(this.qbfsForm, 'drafterName', nameList)
+        this.$set(this.qbfsForm, 'unit', unitList)
+        this.$set(this.qbfsForm, 'unitName', unitNameList)
       }else if(this.roleType === '2'){
         this.$set(this.qbfsForm, 'resPerson', idList)
         this.$set(this.qbfsForm, 'resPersonName', nameList)
@@ -611,6 +618,9 @@ export default {
       if(this.qbfsForm.drafterName){
         this.$refs.qbfsForm.validateField('drafterName');
       }
+      if(this.qbfsForm.unitName){
+        this.$refs.qbfsForm.validateField('unitName');
+      }
       if(this.qbfsForm.resPersonName){
         this.$refs.qbfsForm.validateField('resPersonName');
       }
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index d40285c76..b407db76d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -447,7 +447,6 @@
             :data="standSystemOptions"
             show-checkbox
             node-key="id"
-            default-expand-all
             check-strictly
             :default-checked-keys="TXJGList"
             :props="defaultProps">
@@ -783,19 +782,26 @@ export default {
       this.modalshowflag2 = true;
     },
     checkedRole2(data) {
-      let idList = "";
-      let nameList = "";
+      let idList = "", nameList = ""
+      let unitList = "", unitNameList = ""
       data.forEach(item => {
         if (nameList.length) {
           nameList += ",";
           idList += ",";
+          unitList += ",";
+          unitNameList += ",";
         }
         idList += item.id;
         nameList += item.name;
+        unitList += item.institutionId
+        unitNameList += item.institutionName
+
       });
       if(this.type === '1'){
         this.$set(this.qbfsForm, 'drafter', idList)
         this.$set(this.qbfsForm, 'drafterName', nameList)
+        this.$set(this.qbfsForm, 'unit', unitList)
+        this.$set(this.qbfsForm, 'unitName', unitNameList)
       }else if(this.type === '2'){
         this.$set(this.qbfsForm, 'resPerson', idList)
         this.$set(this.qbfsForm, 'resPersonName', nameList)
@@ -803,6 +809,9 @@ export default {
       if(this.qbfsForm.drafterName){
         this.$refs.qbfsForm.validateField('drafterName');
       }
+      if(this.qbfsForm.unitName){
+        this.$refs.qbfsForm.validateField('unitName');
+      }
       if(this.qbfsForm.resPersonName){
         this.$refs.qbfsForm.validateField('resPersonName');
       }