[update] 修改选人组件的全选

src/components/selection/UserSelectByContactModal.vue

@@ -114,7 +114,7 @@ export default {
         }
       }
     },
-    dataSource: {
+    currentQueryAllData: {
       immediate: true,
       deep: true,
       handler (val) {
@@ -210,8 +210,11 @@ export default {
     this.loadData()
   },
   methods: {
-    open (value) {
+    async open (value) {
       this.visible = true
+      if (this.type === 'checkbox') {
+        await this.getCurrentAllData()
+      }
       this.loadData()
       if (value) {
         this.selectedRowKeys = value.split(',')
@@ -269,16 +272,16 @@ export default {
       this.queryParam = {}
       this.loadData()
     },
-    searchQuery () {
+    async searchQuery () {
       this.isClickedSearch = true
-      this.loadData()
-    },
-    // 获取用户左侧树列表
-    async loadData () {
-      this.loadingLeft = true
       if (this.type === 'checkbox') {
         await this.getCurrentAllData()
       }
+      this.loadData()
+    },
+    // 获取用户左侧树列表
+    loadData () {
+      this.loadingLeft = true
       const params = Object.assign({}, this.queryParam)
       params.pageNo = this.ipagination.current
       params.pageSize = this.ipagination.pageSize

src/components/selection/UserSelectByContactNoMergeModal.vue

@@ -140,7 +140,7 @@ export default {
         }
       }
     },
-    dataSource: {
+    currentQueryAllData: {
       immediate: true,
       handler (val) {
         console.log(this.currentQueryAllData)
@@ -235,8 +235,11 @@ export default {
     this.loadData()
   },
   methods: {
-    open (value) {
+    async open (value) {
       this.visible = true
+      if (this.type === 'checkbox') {
+        await this.getCurrentAllData()
+      }
       this.loadData()
       if (value) {
         this.selectedRowKeys = value.split(',')
@@ -297,16 +300,16 @@ export default {
       this.queryParam = {}
       this.loadData()
     },
-    searchQuery () {
+    async searchQuery () {
       this.isClickedSearch = true
-      this.loadData()
-    },
-    // 获取用户左侧树列表
-    async loadData () {
-      this.loadingLeft = true
       if (this.type === 'checkbox') {
         await this.getCurrentAllData()
       }
+      this.loadData()
+    },
+    // 获取用户左侧树列表
+    loadData () {
+      this.loadingLeft = true
       const params = Object.assign({}, this.queryParam)
       params.pageNo = this.ipagination.current
       params.pageSize = this.ipagination.pageSize

src/components/selection/UserSelectByWorkGroupModal.vue

@@ -167,7 +167,7 @@ export default {
         }
       }
     },
-    dataSource: {
+    currentQueryAllData: {
       immediate: true,
       handler (val) {
         console.log(this.currentQueryAllData)
@@ -265,8 +265,11 @@ export default {
     this.loadData()
   },
   methods: {
-    open (value) {
+    async open (value) {
       this.visible = true
+      if (this.type === 'checkbox') {
+        await this.getCurrentAllData()
+      }
       this.loadData()
       if (value) {
         this.selectedRowKeys = value.split(',')
@@ -284,10 +287,13 @@ export default {
       })
     },
     // 左侧树点击选中
-    treeSelect (selectedKeys) {
+    async treeSelect (selectedKeys) {
       console.log(selectedKeys)
       this.currentTreeNode = selectedKeys
       this.queryParam.workingGroupId = selectedKeys[0]
+      if (this.type === 'checkbox') {
+        await this.getCurrentAllData()
+      }
       this.loadData()
     },
     // 获取左侧树数据
@@ -362,16 +368,16 @@ export default {
       this.queryParam = {}
       this.loadData()
     },
-    searchQuery () {
+    async searchQuery () {
       this.isClickedSearch = true
-      this.loadData()
-    },
-    // 获取用户左侧树列表
-    async loadData () {
-      this.loadingLeft = true
       if (this.type === 'checkbox') {
         await this.getCurrentAllData()
       }
+      this.loadData()
+    },
+    // 获取用户左侧树列表
+    loadData () {
+      this.loadingLeft = true
       const params = Object.assign({}, this.queryParam)
       params.pageNo = this.ipagination.current
       params.pageSize = this.ipagination.pageSize

src/components/selection/UserSelectModal.vue

@@ -142,7 +142,7 @@ export default {
         }
       }
     },
-    dataSource: {
+    currentQueryAllData: {
       immediate: true,
       handler (val) {
         console.log(this.currentQueryAllData)
@@ -232,9 +232,12 @@ export default {
     }
   },
   methods: {
-    open (value) {
+    async open (value) {
       this.getSysCategoryTree()
       this.initRoleList()
+      if (this.type === 'checkbox') {
+        await this.getCurrentAllData()
+      }
       this.loadData()
       this.visible = true
       if (value) {
@@ -315,16 +318,16 @@ export default {
       this.queryParam = {}
       this.loadData(1)
     },
-    searchQuery () {
+    async searchQuery () {
       this.isClickedSearch = true
-      this.loadData(1)
-    },
-    // 获取用户左侧树列表
-    async loadData (arg) {
-      this.loadingLeft = true
       if (this.type === 'checkbox') {
         await this.getCurrentAllData()
       }
+      this.loadData(1)
+    },
+    // 获取用户左侧树列表
+    loadData (arg) {
+      this.loadingLeft = true
       if (arg) {
         this.ipagination.current = 1
       }