Merge remote-tracking branch 'origin/develop' into develop

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,12 +533,17 @@ export default {
     },
 
     selectEdit() {
-      this.userId = []
+      this.getTree2()
-      this.manageData.forEach(item=>{
+      if(this.manageData.length){
-        this.userId.push(item.userId)
+        this.userId = []
-      })
+        this.manageData.forEach(item=>{
-      this.drawerTitle = '批量配置岗位'
+          this.userId.push(item.userId)
-      this.modalPost = true
+        })
+        this.drawerTitle = '批量配置岗位'
+        this.modalPost = true
+      }else{
+        this.$message.warning('请选择需要批量配置岗位的角色')
+      }
     },
   },
   computed: {},

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 || []