From 1aefabb223a1bfdfaed24552231008cf90104046 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 22 Feb 2024 19:26:53 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E9=80=89=E4=BA=BA?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84=E5=85=A8=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../selection/UserSelectByContactModal.vue    | 117 +++++++++++++----
 .../UserSelectByContactNoMergeModal.vue       | 114 ++++++++++++----
 .../selection/UserSelectByWorkGroupModal.vue  | 113 ++++++++++++----
 src/components/selection/UserSelectModal.vue  | 123 ++++++++++++++----
 src/mixins/ConfigurableTableMixin.js          |   1 +
 5 files changed, 361 insertions(+), 107 deletions(-)

diff --git a/src/components/selection/UserSelectByContactModal.vue b/src/components/selection/UserSelectByContactModal.vue
index 48a91e31..a46b0ae9 100644
--- a/src/components/selection/UserSelectByContactModal.vue
+++ b/src/components/selection/UserSelectByContactModal.vue
@@ -1,5 +1,6 @@
 <template>
   <j-modal
+    :title="$t('userSelect.selectUser')"
     :maskClosable="false"
     :width="1000"
     :closable="true"
@@ -8,12 +9,7 @@
     @cancel="handleCancel"
     switchFullscreen
     :visible="visible">
-    <template v-slot:title>
-      <!--  全选所有  -->
-      <a-checkbox v-if="type === 'checkbox'" v-model="isCheckedAll" class="modal-title-check" @change="checkedAllChange"/>
-      <span>{{ $t('userSelect.selectUser') }}</span>
-    </template>
-    <div class="modal-search-wrapper table-page-search-wrapper">
+    <div class="modal-search-wrapper table-page-search-wrapper search-wrap">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :span="6">
@@ -32,6 +28,8 @@
           </span>
         </a-row>
       </a-form>
+      <!--  全选所有  -->
+      <a-checkbox v-if="type === 'checkbox'" v-model="isCheckedAll" class="modal-title-check" @change="checkedAllChange"/>
     </div>
     <div class="modal-content">
       <a-table
@@ -101,14 +99,45 @@ export default {
       immediate: true,
       deep: true,
       handler (val) {
-        console.log(val.length, this.ipagination.total)
-        if (val.length !== 0 && val.length === this.ipagination.total) {
-          // 说明都选中了
+        console.log(this.currentQueryAllData, this.dataSourceRight)
+        const arrOne = this.currentQueryAllData.map(item => item.contactId)
+        const arrTwo = this.dataSourceRight.map(item => item.contactId)
+        const temp = []
+        for (const item of arrTwo) {
+          arrOne.includes(item) ? temp.push(item) : ''
+        }
+        if (val.length !== 0 && this.dataSourceRight.length >= this.ipagination.total && temp.length === this.currentQueryAllData.length) {
+          // 选中数据长度等于当前表格总长度
           this.isCheckedAll = true
         } else {
           this.isCheckedAll = false
         }
       }
+    },
+    dataSource: {
+      immediate: true,
+      deep: true,
+      handler (val) {
+        console.log(this.currentQueryAllData, this.dataSourceRight)
+        const arrOne = this.currentQueryAllData.map(item => item.contactId)
+        const arrTwo = this.dataSourceRight.map(item => item.contactId)
+        const temp = []
+        for (const item of arrTwo) {
+          arrOne.includes(item) ? temp.push(item) : ''
+        }
+        if (this.dataSourceRight.length !== 0 && this.dataSourceRight.length >= this.ipagination.total && temp.length === this.currentQueryAllData.length) {
+          // 选中数据长度等于当前表格总长度
+          this.isCheckedAll = true
+        } else {
+          this.isCheckedAll = false
+        }
+      }
+    },
+    queryParam: {
+      deep: true,
+      handler (val) {
+        this.isClickedSearch = false
+      }
     }
   },
   data () {
@@ -170,7 +199,11 @@ export default {
       url: {
         userList: '/laws/system/lawsContactManage/pageMerge',
         userListByIds: '/sys/user/queryByIds'
-      }
+      },
+      isClickedSearch: false, // 改完搜索条件是否点击过搜索
+      oldQueryParam: {}, // 上一次的搜索条件，用于从一个搜索条件改成另一个搜索条件，但是没有点搜索，这时候全选时传旧的搜索条件
+      oldTotal: 0,
+      currentQueryAllData: [] // 当前查询条件下的所有数据
     }
   },
   mounted () {
@@ -189,40 +222,68 @@ export default {
     checkedAllChange (e) {
       console.log(e.target.checked)
       if (e.target.checked) {
-        this.loadingLeft = true
-        const params = {}
-        params.pageNo = 1
-        params.pageSize = this.ipagination.total + 10
-        params.column = 'createTime'
-        params.order = 'desc'
-        getAction(this.url.userList, params).then(res => {
-          if (res.success) {
-            this.dataSourceRight = res.result.records || []
-            this.selectedRowKeys = (res.result.records || []).map(item => item.contactId)
-          }
-        }).finally(() => {
-          this.loadingLeft = false
-        })
+        this.checkCurrentAll()
       } else {
         this.dataSourceRight = []
         this.selectedRowKeys = []
       }
     },
+    checkCurrentAll () {
+      this.loadingLeft = true
+      let params
+      if (this.isClickedSearch) {
+        // 点击过搜索了，传搜索条件
+        params = Object.assign({}, this.queryParam)
+      } else {
+        // 没点击过搜索，传旧的搜索条件
+        params = Object.assign({}, this.oldQueryParam)
+      }
+      params.pageNo = 1
+      params.pageSize = this.ipagination.total + 10
+      params.column = 'createTime'
+      params.order = 'desc'
+      getAction(this.url.userList, params).then(res => {
+        if (res.success) {
+          this.dataSourceRight = res.result.records || []
+          this.selectedRowKeys = (res.result.records || []).map(item => item.contactId)
+        }
+      }).finally(() => {
+        this.loadingLeft = false
+      })
+    },
+    // 获取当前查询条件的所有数据
+    async getCurrentAllData () {
+      const params = Object.assign({}, this.queryParam)
+      params.pageNo = 1
+      params.pageSize = 100000000
+      params.column = 'createTime'
+      params.order = 'desc'
+      await getAction(this.url.userList, params).then(res => {
+        if (res.success) {
+          this.currentQueryAllData = res.result.records || []
+          console.log('00000000000获取完当前所有数据了', this.currentQueryAllData)
+        }
+      })
+    },
     searchReset () {
       this.queryParam = {}
       this.loadData()
     },
     searchQuery () {
+      this.isClickedSearch = true
       this.loadData()
     },
     // 获取用户左侧树列表
-    loadData () {
+    async loadData () {
+      this.loadingLeft = true
+      if (this.type === 'checkbox') {
+        await this.getCurrentAllData()
+      }
       const params = Object.assign({}, this.queryParam)
       params.pageNo = this.ipagination.current
       params.pageSize = this.ipagination.pageSize
       params.column = 'createTime'
       params.order = 'desc'
-      this.loadingLeft = true
       getAction(this.url.userList, params).then((res) => {
         if (res.success) {
           if (res.result.current > 1 && res.result.records.length === 0) {
@@ -230,6 +291,7 @@ export default {
             this.loadData()
             return
           }
+          this.oldQueryParam = Object.assign({}, this.queryParam)
           this.dataSource = res.result.records || []
           this.ipagination.total = res.result.total
         } else {
@@ -341,7 +403,8 @@ export default {
 
 <style scoped lang="less">
 .modal-title-check {
-  margin-right: 10px;
+  margin-left: 25px;
+  margin-bottom: 10px;
 }
 .modal-content {
   width: 100%;
diff --git a/src/components/selection/UserSelectByContactNoMergeModal.vue b/src/components/selection/UserSelectByContactNoMergeModal.vue
index dbe17472..6d97ad4f 100644
--- a/src/components/selection/UserSelectByContactNoMergeModal.vue
+++ b/src/components/selection/UserSelectByContactNoMergeModal.vue
@@ -1,5 +1,6 @@
 <template>
   <j-modal
+    :title="$t('userSelect.selectUser')"
     :maskClosable="false"
     :width="1000"
     :closable="true"
@@ -8,12 +9,7 @@
     @cancel="handleCancel"
     switchFullscreen
     :visible="visible">
-    <template v-slot:title>
-      <!--  全选所有  -->
-      <a-checkbox v-if="type === 'checkbox'" v-model="isCheckedAll" class="modal-title-check" @change="checkedAllChange"/>
-      <span>{{ $t('userSelect.selectUser') }}</span>
-    </template>
-    <div class="modal-search-wrapper table-page-search-wrapper">
+    <div class="modal-search-wrapper table-page-search-wrapper search-wrap">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :span="6">
@@ -32,6 +28,8 @@
           </span>
         </a-row>
       </a-form>
+      <!--  全选所有  -->
+      <a-checkbox v-if="type === 'checkbox'" v-model="isCheckedAll" class="modal-title-check" @change="checkedAllChange"/>
     </div>
     <div class="modal-content">
       <a-table
@@ -128,14 +126,43 @@ export default {
       immediate: true,
       deep: true,
       handler (val) {
-        console.log(val.length, this.ipagination.total)
-        if (val.length !== 0 && val.length === this.ipagination.total) {
-          // 说明都选中了
+        console.log(this.currentQueryAllData)
+        const arrOne = this.currentQueryAllData.map(item => item.id)
+        const arrTwo = this.dataSourceRight.map(item => item.id)
+        const temp = []
+        for (const item of arrTwo) {
+          arrOne.includes(item) ? temp.push(item) : ''
+        }
+        if (val.length !== 0 && this.dataSourceRight.length >= this.ipagination.total && temp.length === this.currentQueryAllData.length) {
           this.isCheckedAll = true
         } else {
           this.isCheckedAll = false
         }
       }
+    },
+    dataSource: {
+      immediate: true,
+      handler (val) {
+        console.log(this.currentQueryAllData)
+        const arrOne = this.currentQueryAllData.map(item => item.id)
+        const arrTwo = this.dataSourceRight.map(item => item.id)
+        const temp = []
+        for (const item of arrTwo) {
+          arrOne.includes(item) ? temp.push(item) : ''
+        }
+        if (this.dataSourceRight.length !== 0 && this.dataSourceRight.length >= this.ipagination.total && temp.length === this.currentQueryAllData.length) {
+          // 选中数据长度和表格总数相等或者和上次查询的总数相等
+          this.isCheckedAll = true
+        } else {
+          this.isCheckedAll = false
+        }
+      }
+    },
+    queryParam: {
+      deep: true,
+      handler (val) {
+        this.isClickedSearch = false
+      }
     }
   },
   data () {
@@ -197,7 +224,11 @@ export default {
       url: {
         userList: '/laws/system/lawsContactManage/page',
         userListByIds: '/laws/system/lawsContactManage/queryById'
-      }
+      },
+      isClickedSearch: false, // 改完搜索条件是否点击过搜索
+      oldQueryParam: {}, // 上一次的搜索条件，用于从一个搜索条件改成另一个搜索条件，但是没有点搜索，这时候全选时传旧的搜索条件
+      oldTotal: 0,
+      currentQueryAllData: [] // 当前查询条件下的所有数据
     }
   },
   mounted () {
@@ -220,40 +251,67 @@ export default {
     checkedAllChange (e) {
       console.log(e.target.checked)
       if (e.target.checked) {
-        this.loadingLeft = true
-        const params = {}
-        params.pageNo = 1
-        params.pageSize = this.ipagination.total + 10
-        params.column = 'createTime'
-        params.order = 'desc'
-        getAction(this.url.userList, params).then(res => {
-          if (res.success) {
-            this.dataSourceRight = res.result.records || []
-            this.selectedRowKeys = (res.result.records || []).map(item => item.id)
-          }
-        }).finally(() => {
-          this.loadingLeft = false
-        })
+        this.checkCurrentAll()
       } else {
         this.dataSourceRight = []
         this.selectedRowKeys = []
       }
     },
+    checkCurrentAll () {
+      this.loadingLeft = true
+      let params
+      if (this.isClickedSearch) {
+        // 点击过搜索了，传搜索条件
+        params = Object.assign({}, this.queryParam)
+      } else {
+        // 没点击过搜索，传旧的搜索条件
+        params = Object.assign({}, this.oldQueryParam)
+      }
+      params.pageNo = 1
+      params.pageSize = this.ipagination.total + 10
+      params.column = 'createTime'
+      params.order = 'desc'
+      getAction(this.url.userList, params).then(res => {
+        if (res.success) {
+          this.dataSourceRight = res.result.records || []
+          this.selectedRowKeys = (res.result.records || []).map(item => item.id)
+        }
+      }).finally(() => {
+        this.loadingLeft = false
+      })
+    },
+    // 获取当前查询条件的所有数据
+    async getCurrentAllData () {
+      const params = Object.assign({}, this.queryParam)
+      params.pageNo = 1
+      params.pageSize = 100000000
+      params.column = 'createTime'
+      params.order = 'desc'
+      await getAction(this.url.userList, params).then(res => {
+        if (res.success) {
+          this.currentQueryAllData = res.result.records || []
+        }
+      })
+    },
     searchReset () {
       this.queryParam = {}
       this.loadData()
     },
     searchQuery () {
+      this.isClickedSearch = true
       this.loadData()
     },
     // 获取用户左侧树列表
-    loadData () {
+    async loadData () {
+      this.loadingLeft = true
+      if (this.type === 'checkbox') {
+        await this.getCurrentAllData()
+      }
       const params = Object.assign({}, this.queryParam)
       params.pageNo = this.ipagination.current
       params.pageSize = this.ipagination.pageSize
       params.column = 'createTime'
       params.order = 'desc'
-      this.loadingLeft = true
       getAction(this.url.userList, params).then((res) => {
         if (res.success) {
           if (res.result.current > 1 && res.result.records.length === 0) {
@@ -261,6 +319,7 @@ export default {
             this.loadData()
             return
           }
+          this.oldQueryParam = Object.assign({}, this.queryParam)
           this.dataSource = res.result.records || []
           this.ipagination.total = res.result.total
         } else {
@@ -365,7 +424,8 @@ export default {
 
 <style scoped lang="less">
 .modal-title-check {
-  margin-right: 10px;
+  margin-left: 25px;
+  margin-bottom: 10px;
 }
 .modal-content {
   width: 100%;
diff --git a/src/components/selection/UserSelectByWorkGroupModal.vue b/src/components/selection/UserSelectByWorkGroupModal.vue
index ba98fa1b..da466ea9 100644
--- a/src/components/selection/UserSelectByWorkGroupModal.vue
+++ b/src/components/selection/UserSelectByWorkGroupModal.vue
@@ -1,5 +1,6 @@
 <template>
   <j-modal
+    :title="$t('userSelect.selectUser')"
     :maskClosable="false"
     :width="1200"
     :closable="true"
@@ -8,11 +9,6 @@
     @cancel="handleCancel"
     switchFullscreen
     :visible="visible">
-    <template v-slot:title>
-      <!--  全选所有  -->
-      <a-checkbox v-if="type === 'checkbox'" v-model="isCheckedAll" class="modal-title-check" @change="checkedAllChange"/>
-      <span>{{ $t('userSelect.selectUser') }}</span>
-    </template>
     <div class="modal-top-wrapper">
       <div class="modal-left-wrapper">
         <a-spin :spinning="treeLoading">
@@ -39,7 +35,7 @@
         </a-spin>
       </div>
       <div class="modal-right-wrapper">
-        <div class="modal-search-wrapper table-page-search-wrapper">
+        <div class="modal-search-wrapper table-page-search-wrapper search-wrap">
           <a-form layout="inline" @keyup.enter.native="searchQuery">
             <a-row :gutter="24">
               <a-col :span="6">
@@ -82,6 +78,8 @@
           </span>
             </a-row>
           </a-form>
+          <!--  全选所有  -->
+          <a-checkbox v-if="type === 'checkbox'" v-model="isCheckedAll" class="modal-title-check" @change="checkedAllChange"/>
         </div>
         <div class="modal-content">
           <a-table
@@ -154,14 +152,44 @@ export default {
       immediate: true,
       deep: true,
       handler (val) {
-        console.log(val.length, this.ipagination.total)
-        if (val.length !== 0 && val.length === this.ipagination.total) {
-          // 说明都选中了
+        console.log(this.currentQueryAllData)
+        const arrOne = this.currentQueryAllData.map(item => item.userId)
+        const arrTwo = this.dataSourceRight.map(item => item.userId)
+        const temp = []
+        for (const item of arrTwo) {
+          arrOne.includes(item) ? temp.push(item) : ''
+        }
+        if (val.length !== 0 && this.dataSourceRight.length >= this.ipagination.total && temp.length === this.currentQueryAllData.length) {
+          // 选中数据长度等于当前表格总长度
           this.isCheckedAll = true
         } else {
           this.isCheckedAll = false
         }
       }
+    },
+    dataSource: {
+      immediate: true,
+      handler (val) {
+        console.log(this.currentQueryAllData)
+        const arrOne = this.currentQueryAllData.map(item => item.userId)
+        const arrTwo = this.dataSourceRight.map(item => item.userId)
+        const temp = []
+        for (const item of arrTwo) {
+          arrOne.includes(item) ? temp.push(item) : ''
+        }
+        if (this.dataSourceRight.length !== 0 && this.dataSourceRight.length >= this.ipagination.total && temp.length === this.currentQueryAllData.length) {
+          // 选中数据长度等于当前表格总长度
+          this.isCheckedAll = true
+        } else {
+          this.isCheckedAll = false
+        }
+      }
+    },
+    queryParam: {
+      deep: true,
+      handler (val) {
+        this.isClickedSearch = false
+      }
     }
   },
   data () {
@@ -224,7 +252,11 @@ export default {
       url: {
         userList: '/act/user/workGroupPage',
         userListByIds: '/sys/user/queryByIds'
-      }
+      },
+      isClickedSearch: false, // 改完搜索条件是否点击过搜索
+      oldQueryParam: {}, // 上一次的搜索条件，用于从一个搜索条件改成另一个搜索条件，但是没有点搜索，这时候全选时传旧的搜索条件
+      oldTotal: 0,
+      currentQueryAllData: [] // 当前查询条件下的所有数据
     }
   },
   mounted () {
@@ -288,36 +320,61 @@ export default {
     checkedAllChange (e) {
       console.log(e.target.checked)
       if (e.target.checked) {
-        this.loadingLeft = true
-        const params = {}
-        params.pageNo = 1
-        params.pageSize = this.ipagination.total + 10
-        getAction(this.url.userList, params).then(res => {
-          if (res.success) {
-            this.dataSourceRight = res.result.records || []
-            this.selectedRowKeys = (res.result.records || []).map(item => item.userId)
-          }
-        }).finally(() => {
-          this.loadingLeft = false
-        })
+        this.checkCurrentAll()
       } else {
         this.dataSourceRight = []
         this.selectedRowKeys = []
       }
     },
+    checkCurrentAll () {
+      this.loadingLeft = true
+      let params
+      if (this.isClickedSearch) {
+        // 点击过搜索了，传搜索条件
+        params = Object.assign({}, this.queryParam)
+      } else {
+        // 没点击过搜索，传旧的搜索条件
+        params = Object.assign({}, this.oldQueryParam)
+      }
+      params.pageNo = 1
+      params.pageSize = this.ipagination.total + 10
+      getAction(this.url.userList, params).then(res => {
+        if (res.success) {
+          this.dataSourceRight = res.result.records || []
+          this.selectedRowKeys = (res.result.records || []).map(item => item.userId)
+        }
+      }).finally(() => {
+        this.loadingLeft = false
+      })
+    },
+    // 获取当前查询条件的所有数据
+    async getCurrentAllData () {
+      const params = Object.assign({}, this.queryParam)
+      params.pageNo = 1
+      params.pageSize = 100000000
+      await getAction(this.url.userList, params).then(res => {
+        if (res.success) {
+          this.currentQueryAllData = res.result.records || []
+        }
+      })
+    },
     searchReset () {
       this.queryParam = {}
       this.loadData()
     },
     searchQuery () {
+      this.isClickedSearch = true
       this.loadData()
     },
     // 获取用户左侧树列表
-    loadData () {
+    async loadData () {
+      this.loadingLeft = true
+      if (this.type === 'checkbox') {
+        await this.getCurrentAllData()
+      }
       const params = Object.assign({}, this.queryParam)
       params.pageNo = this.ipagination.current
       params.pageSize = this.ipagination.pageSize
-      this.loadingLeft = true
       getAction(this.url.userList, params).then((res) => {
         if (res.success) {
           if (res.result.current > 1 && res.result.records.length === 0) {
@@ -325,6 +382,7 @@ export default {
             this.loadData()
             return
           }
+          this.oldQueryParam = Object.assign({}, this.queryParam)
           this.dataSource = res.result.records || []
           this.ipagination.total = res.result.total
         } else {
@@ -430,8 +488,13 @@ export default {
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
+.search-wrap {
+  position: relative;
+}
 .modal-title-check {
-  margin-right: 10px;
+  position: absolute;
+  left: 25px;
+  bottom: 10px;
 }
 .modal-top-wrapper {
   display: flex;
diff --git a/src/components/selection/UserSelectModal.vue b/src/components/selection/UserSelectModal.vue
index 64c4c4aa..799b58c1 100644
--- a/src/components/selection/UserSelectModal.vue
+++ b/src/components/selection/UserSelectModal.vue
@@ -1,5 +1,6 @@
 <template>
   <j-modal
+    :title="$t('userSelect.selectUser')"
     :maskClosable="false"
     :width="1000"
     :closable="true"
@@ -8,12 +9,7 @@
     @cancel="handleCancel"
     switchFullscreen
     :visible="visible">
-    <template v-slot:title>
-      <!--  全选所有  -->
-      <a-checkbox v-if="type === 'checkbox'" v-model="isCheckedAll" class="modal-title-check" @change="checkedAllChange"/>
-      <span>{{ $t('userSelect.selectUser') }}</span>
-    </template>
-    <div class="modal-search-wrapper table-page-search-wrapper">
+    <div class="modal-search-wrapper table-page-search-wrapper search-wrap">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :span="6">
@@ -57,6 +53,8 @@
           </span>
         </a-row>
       </a-form>
+      <!--  全选所有  -->
+      <a-checkbox v-if="type === 'checkbox'" v-model="isCheckedAll" class="modal-title-check" @change="checkedAllChange">全选</a-checkbox>
     </div>
     <div class="modal-content">
       <a-table
@@ -129,14 +127,44 @@ export default {
       immediate: true,
       deep: true,
       handler (val) {
-        console.log(val.length, this.ipagination.total)
-        if (val.length !== 0 && val.length === this.ipagination.total) {
-          // 说明都选中了
+        console.log(this.currentQueryAllData)
+        const arrOne = this.currentQueryAllData.map(item => item.id)
+        const arrTwo = this.dataSourceRight.map(item => item.id)
+        const temp = []
+        for (const item of arrTwo) {
+          arrOne.includes(item) ? temp.push(item) : ''
+        }
+        if (val.length !== 0 && this.dataSourceRight.length >= this.ipagination.total && temp.length === this.currentQueryAllData.length) {
+          // 选中数据长度等于当前表格总长度
           this.isCheckedAll = true
         } else {
           this.isCheckedAll = false
         }
       }
+    },
+    dataSource: {
+      immediate: true,
+      handler (val) {
+        console.log(this.currentQueryAllData)
+        const arrOne = this.currentQueryAllData.map(item => item.id)
+        const arrTwo = this.dataSourceRight.map(item => item.id)
+        const temp = []
+        for (const item of arrTwo) {
+          arrOne.includes(item) ? temp.push(item) : ''
+        }
+        if (this.dataSourceRight.length !== 0 && this.dataSourceRight.length >= this.ipagination.total && temp.length === this.currentQueryAllData.length) {
+          // 选中数据长度等于当前表格总长度
+          this.isCheckedAll = true
+        } else {
+          this.isCheckedAll = false
+        }
+      }
+    },
+    queryParam: {
+      deep: true,
+      handler (val) {
+        this.isClickedSearch = false
+      }
     }
   },
   data () {
@@ -196,7 +224,11 @@ export default {
       url: {
         userList: '/sys/user/page',
         userListByIds: '/sys/user/queryByIds'
-      }
+      },
+      isClickedSearch: false, // 改完搜索条件是否点击过搜索
+      oldQueryParam: {}, // 上一次的搜索条件，用于从一个搜索条件改成另一个搜索条件，但是没有点搜索，这时候全选时传旧的搜索条件
+      oldTotal: 0,
+      currentQueryAllData: [] // 当前查询条件下的所有数据
     }
   },
   methods: {
@@ -234,35 +266,65 @@ export default {
     checkedAllChange (e) {
       console.log(e.target.checked)
       if (e.target.checked) {
-        this.loadingLeft = true
-        const params = {}
-        params.pageNo = 1
-        params.pageSize = this.ipagination.total + 10
-        params.field = 'id,avatar,username,realname,sex_dictText,phone,orgCodeTxt,roleTxt,status_dictText'
-        params.column = 'createTime'
-        params.order = 'desc'
-        getAction(this.url.userList, params).then(res => {
-          if (res.success) {
-            this.dataSourceRight = res.result.records || []
-            this.selectedRowKeys = (res.result.records || []).map(item => item.id)
-          }
-        }).finally(() => {
-          this.loadingLeft = false
-        })
+        this.checkCurrentAll()
       } else {
         this.dataSourceRight = []
         this.selectedRowKeys = []
       }
     },
+    checkCurrentAll () {
+      this.loadingLeft = true
+      let params
+      if (this.isClickedSearch) {
+        // 点击过搜索了，传搜索条件
+        params = Object.assign({}, this.queryParam)
+      } else {
+        // 没点击过搜索，传旧的搜索条件
+        params = Object.assign({}, this.oldQueryParam)
+      }
+      params.pageNo = 1
+      params.pageSize = this.ipagination.total + 10
+      params.field = 'id,avatar,username,realname,sex_dictText,phone,orgCodeTxt,roleTxt,status_dictText'
+      params.column = 'createTime'
+      params.order = 'desc'
+      getAction(this.url.userList, params).then(res => {
+        if (res.success) {
+          this.dataSourceRight = res.result.records || []
+          this.selectedRowKeys = (res.result.records || []).map(item => item.id)
+          this.oldTotal = res.result.total
+        }
+      }).finally(() => {
+        this.loadingLeft = false
+      })
+    },
+    // 获取当前查询条件的所有数据
+    async getCurrentAllData () {
+      const params = Object.assign({}, this.queryParam)
+      params.pageNo = 1
+      params.pageSize = 100000000
+      params.field = 'id,avatar,username,realname,sex_dictText,phone,orgCodeTxt,roleTxt,status_dictText'
+      params.column = 'createTime'
+      params.order = 'desc'
+      await getAction(this.url.userList, params).then(res => {
+        if (res.success) {
+          this.currentQueryAllData = res.result.records || []
+        }
+      })
+    },
     searchReset () {
       this.queryParam = {}
       this.loadData(1)
     },
     searchQuery () {
+      this.isClickedSearch = true
       this.loadData(1)
     },
     // 获取用户左侧树列表
-    loadData (arg) {
+    async loadData (arg) {
+      this.loadingLeft = true
+      if (this.type === 'checkbox') {
+        await this.getCurrentAllData()
+      }
       if (arg) {
         this.ipagination.current = 1
       }
@@ -272,7 +334,6 @@ export default {
       params.field = 'id,avatar,username,realname,sex_dictText,phone,orgCodeTxt,roleTxt,status_dictText'
       params.column = 'createTime'
       params.order = 'desc'
-      this.loadingLeft = true
       getAction(this.url.userList, params).then((res) => {
         if (res.success) {
           if (res.result.current > 1 && res.result.records.length === 0) {
@@ -280,6 +341,7 @@ export default {
             this.loadData()
             return
           }
+          this.oldQueryParam = Object.assign({}, this.queryParam)
           this.dataSource = res.result.records || []
           this.ipagination.total = res.result.total
         } else {
@@ -385,8 +447,13 @@ export default {
 </script>
 
 <style scoped lang="less">
+.search-wrap {
+  position: relative;
+}
 .modal-title-check {
-  margin-right: 10px;
+  position: absolute;
+  left: 25px;
+  bottom: 10px;
 }
 .modal-content {
   width: 100%;
diff --git a/src/mixins/ConfigurableTableMixin.js b/src/mixins/ConfigurableTableMixin.js
index 5c3a8f39..d311af95 100644
--- a/src/mixins/ConfigurableTableMixin.js
+++ b/src/mixins/ConfigurableTableMixin.js
@@ -228,6 +228,7 @@ export const ConfigurableTableMixin = {
       // debugger;
       console.log(this.$refs.tableRef.resizing)
       if (this.$refs.tableRef.resizing) {
+        // 解决表格调整列宽触发排序的问题
         const classNameOne = window.event.target.parentNode.children[0].children[0].children[1].children[0].children[0].className
         const classNameTwo = window.event.target.parentNode.children[0].children[0].children[1].children[0].children[1].className
         const target = window.event.target