From 7802ed69d6662877718a621f53649dca98bc0e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 23 Jul 2021 15:07:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/config/pages/linkManage/index.vue   |  2 +-
 .../pages/creatProcess/bzqdfb/step1.vue       | 85 ++++++++++---------
 .../pages/creatProcess/xmpg/step1.vue         | 55 ++++--------
 3 files changed, 63 insertions(+), 79 deletions(-)

diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue
index 89846f4df..f23611502 100644
--- a/src/pages/config/pages/linkManage/index.vue
+++ b/src/pages/config/pages/linkManage/index.vue
@@ -103,7 +103,7 @@
 </template>
 
 <script>
-    import Sortable from 'sortablejs'
+ import Sortable from 'sortablejs'
     export default {
         name: "linkManage",
         data () {
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 5722564a6..b6bf495c3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -177,7 +177,7 @@
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
                     <el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"
-                              @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">
+                              @click.native="choiceZRRS">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -664,36 +664,19 @@
     >
     </ProcessFooter>
     <!--    选择责任人-->
-    <el-drawer
-      :title="drawerTitle"
-      :visible.sync="modalshowflag"
-      :wrapperClosable="false"
-      size="800px">
-      <el-tree
-        v-if="modalshowflag"
-        style="height: 100%; overflow: auto;"
-        node-key="id"
-        class="filter-tree"
-        :data="treeData"
-        :props="defaultProps"
-        :default-checked-keys="nodeList"
-        highlight-current
-        check-strictly
-        @check="drawerCheck"
-        default-expand-all
-        :expand-on-click-node="false"
-        show-checkbox
-        ref="tree">
-      </el-tree>
-      <div id="roleFormButton" class="demo-drawer-footer">
-        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary"
-                   @click="saveUserInfo">
-          确定
-        </el-button>
-        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消
-        </el-button>
-      </div>
-    </el-drawer>
+    <Role-tree
+      is-title="选择责任部门对接人"
+      :is-visible.sync="modalshowflag2"
+      @checkedRole="checkedRole2"
+      :nodeList="nodeList2"
+    ></Role-tree>
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
     <el-dialog width="400px" :visible.sync="fileMadel" title="上传文件">
       <el-upload
         multiple
@@ -738,8 +721,6 @@ export default {
       sarSarAccessEOSearch: {
         countryArea: "",
         detailedListName: "",
-        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent
       },
       //查询添加标准相关数据
       standardSearch: {
@@ -750,6 +731,8 @@ export default {
       },
       standList: [], //新添加的标准
       modalshowflag: false, // drawer开关
+      modalshowflag2: false,
+      nodeList2: [],
       drawerTitle: "", //drawer标题
       nodeList: [],
       defaultProps: {
@@ -858,22 +841,36 @@ export default {
     };
   },
   methods: {
-    saveUserInfo() {
+    checkedRole(data) {
       if (this.type === "dockUser") {
         this.roleForm.dockUser = this.roleRow.id;
         this.roleForm.dockUserName = this.roleRow.name;
       } else if (this.type === "ministerUser") {
-        this.roleForm.ministerUser = this.roleRow.id;
-        this.roleForm.ministerUserName = this.roleRow.name;
+        this.roleForm.ministerUser = data[0].id;
+        this.roleForm.ministerUserName = data[0].name;
       } else if (this.type === "directorUser") {
-        this.roleForm.directorUser = this.roleRow.id;
-        this.roleForm.directorUserName = this.roleRow.name;
+        this.roleForm.directorUser = data[0].id;
+        this.roleForm.directorUserName = data[0].name;
       } else if (this.type === "presidentUser") {
-        this.roleForm.presidentUser = this.roleRow.id;
-        this.roleForm.presidentUserName = this.roleRow.name;
+        this.roleForm.presidentUser = data[0].id;
+        this.roleForm.presidentUserName = data[0].name;
       }
       this.modalshowflag = false;
     },
+    checkedRole2(data) {
+      var idList = "";
+      var nameList = "";
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ",";
+          idList += ",";
+        }
+        idList += item.id;
+        nameList += item.name;
+      });
+      this.roleForm.dockUser = idList;
+      this.roleForm.dockUserName = nameList;
+    },
     cancleUserInfo() {
       this.modalshowflag = false;
     },
@@ -1306,12 +1303,20 @@ export default {
       this.drawerTitle = title;
       this.modalshowflag = true;
     },
+    choiceZRRS() {
+      this.nodeList2 = [];
+      if (this.roleForm.dockUser.length > 0) {
+        this.nodeList2 = this.roleForm.dockUser.split(",");
+      }
+      this.modalshowflag2 = true;
+    },
     getTree() {
       this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
         this.treeData = res.data;
       });
     },
     pageChange(page) {
+      console.log(page);
       this.page = page;
       this.selectionList();
     },
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index d06cd4287..37e8159fe 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -336,34 +336,13 @@
     >
     </ProcessFooter>
     <!--    选择责任人-->
-    <el-drawer
-      :title="drawerTitle"
-      :visible.sync="modalshowflag"
-      :wrapperClosable="false"
-      size="800px">
-      <el-tree
-        v-if="modalshowflag"
-        style="height: 100%; overflow: auto;"
-        node-key="id"
-        class="filter-tree"
-        :data="treeData"
-        :props="defaultProps"
-        :default-checked-keys="nodeList"
-        highlight-current
-        check-strictly
-        @check="drawerCheck"
-        default-expand-all
-        :expand-on-click-node="false"
-        show-checkbox
-        ref="tree">
-      </el-tree>
-      <div id="roleFormButton" class="demo-drawer-footer">
-        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">
-          确定
-        </el-button>
-        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
-      </div>
-    </el-drawer>
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -507,25 +486,25 @@ export default {
     };
   },
   methods: {
-    saveUserInfo() {
+    checkedRole(data) {
       if (this.type === "dockUser") {
-        this.roleForm.dockUser = this.roleRow.id;
-        this.roleForm.dockUserName = this.roleRow.name;
+        this.roleForm.dockUser = data[0].id;
+        this.roleForm.dockUserName = data[0].name;
       } else if (this.type === "ministerUser") {
-        this.roleForm.ministerUser = this.roleRow.id;
-        this.roleForm.ministerUserName = this.roleRow.name;
+        this.roleForm.ministerUser = data[0].id;
+        this.roleForm.ministerUserName =  data[0].name;
       } else if (this.type === "qualityEngineer") {
-        this.roleForm.qualityEngineer = this.roleRow.id;
-        this.roleForm.qualityEngineerName = this.roleRow.name;
+        this.roleForm.qualityEngineer = data[0].id;
+        this.roleForm.qualityEngineerName =  data[0].name;
         this.listForm.qualityEngineer = this.roleForm.qualityEngineer;
         this.listForm.qualityEngineerName = this.roleForm.qualityEngineerName;
       } else if (this.type === "certifiedEngineer") {
-        this.roleForm.certifiedEngineer = this.roleRow.id;
-        this.roleForm.certifiedEngineerName = this.roleRow.name;
+        this.roleForm.certifiedEngineer = data[0].id;
+        this.roleForm.certifiedEngineerName = data[0].name;
         this.listForm.certifiedEngineer = this.roleForm.certifiedEngineer;
         this.listForm.certifiedEngineerName = this.roleForm.certifiedEngineerName;
       } else if (this.type === "distributePerson") {
-        this.listForm.distributePerson = this.roleRow.name;
+        this.listForm.distributePerson = data[0].name;
         this.listForm.dataList[this.dsadadadsada].distributePersonId=this.roleRow.id
         this.listForm.dataList[this.dsadadadsada].distributePerson=this.roleRow.name
         this.showColumn = false;