From deaaad462e6fa3e69a89c39d0f12cd6106d9f876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 16 Mar 2022 10:39:57 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E9=85=8D=E7=BD=AE=E5=B2=97=E4=BD=8Dbug=20518?=
 =?UTF-8?q?14?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/mechanismManage/pages/mechanism.vue    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/pages/config/pages/mechanismManage/pages/mechanism.vue b/src/pages/config/pages/mechanismManage/pages/mechanism.vue
index ec4d5f16b..a4d4863ce 100644
--- a/src/pages/config/pages/mechanismManage/pages/mechanism.vue
+++ b/src/pages/config/pages/mechanismManage/pages/mechanism.vue
@@ -531,12 +531,16 @@ export default {
     },
 
     selectEdit() {
-      this.userId = []
-      this.manageData.forEach(item=>{
-        this.userId.push(item.userId)
-      })
-      this.drawerTitle = '批量配置岗位'
-      this.modalPost = true
+      if(this.manageData.length){
+        this.userId = []
+        this.manageData.forEach(item=>{
+          this.userId.push(item.userId)
+        })
+        this.drawerTitle = '批量配置岗位'
+        this.modalPost = true
+      }else{
+        this.$message.warning('请选择需要批量配置岗位的角色')
+      }
     },
   },
   computed: {},

From 911839fa6c25e8a930b16cfe2294a686a8dbf259 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 16 Mar 2022 10:56:49 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=B2=97=E4=BD=8D=E6=9F=A5=E8=AF=A2bug=20518?=
 =?UTF-8?q?16?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/config/pages/mechanismManage/pages/mechanism.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pages/config/pages/mechanismManage/pages/mechanism.vue b/src/pages/config/pages/mechanismManage/pages/mechanism.vue
index a4d4863ce..a0a277786 100644
--- a/src/pages/config/pages/mechanismManage/pages/mechanism.vue
+++ b/src/pages/config/pages/mechanismManage/pages/mechanism.vue
@@ -249,6 +249,7 @@ export default {
   name: 'mechanism',
   data() {
     return {
+      formLoading: true,
       peopleType: '', //1为树结构 2 为全机构
       nodeKeyId: '',
       searchForm: {
@@ -327,6 +328,7 @@ export default {
     searchPostName() {
       this.page = 1;
       this.getTree2();
+      this.sarPost.name = "";
     }, // 查询
     resetSelect() {
       this.sarPost.name = "";
@@ -531,6 +533,7 @@ export default {
     },
 
     selectEdit() {
+      this.getTree2()
       if(this.manageData.length){
         this.userId = []
         this.manageData.forEach(item=>{

From 2cde150dc7f96fd78aafb0dcb688ecd0b60a81c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 16 Mar 2022 11:08:47 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=20=E7=BC=96=E8=BE=91bug=2051818=20?=
 =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86=20=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=BB=84=20=E6=9F=A5=E8=AF=A2bug=2051817?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/config/pages/mechanismManage/pages/workgroup.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/config/pages/mechanismManage/pages/workgroup.vue b/src/pages/config/pages/mechanismManage/pages/workgroup.vue
index 70e06c64a..cbd1110bb 100644
--- a/src/pages/config/pages/mechanismManage/pages/workgroup.vue
+++ b/src/pages/config/pages/mechanismManage/pages/workgroup.vue
@@ -268,7 +268,7 @@ export default {
     },
     //查询
     searchPostName() {
-      this.page = 1;
+      this.workSearch.page = 1;
       this.getWorkData();
     },
     //清空
@@ -448,6 +448,7 @@ export default {
     },
     checkedRole(data) {
         this.addForm = {
+          id: this.addForm.id,
           workGroup: this.addForm.workGroup || "",
           workPeopleGroup:  this.addForm.workPeopleGroup || [],
           workLeaderGroup: this.addForm.workLeaderGroup || []
@@ -466,6 +467,7 @@ export default {
     },
     checkedRole2(data) {
       this.addForm = {
+        id: this.addForm.id,
         workGroup: this.addForm.workGroup || "",
         workPeopleGroup:  this.addForm.workPeopleGroup || [],
         workLeaderGroup: this.addForm.workLeaderGroup || []