From bee862d47acc558abd75f222e486d807e4cd1394 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Fri, 10 May 2024 10:11:57 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E9=80=89=E6=8B=A9=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=85=A8=E9=80=89=E5=8B=BE=E9=80=89=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/selection/UserSelectByContactModal.vue | 4 ++-- src/components/selection/UserSelectByContactNoMergeModal.vue | 4 ++-- src/components/selection/UserSelectByWorkGroupModal.vue | 4 ++-- src/components/selection/UserSelectModal.vue | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/selection/UserSelectByContactModal.vue b/src/components/selection/UserSelectByContactModal.vue index eb0af599..2d94b6b3 100644 --- a/src/components/selection/UserSelectByContactModal.vue +++ b/src/components/selection/UserSelectByContactModal.vue @@ -106,7 +106,7 @@ export default { 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) { + if (val.length !== 0 && this.currentQueryAllData.length !== 0 && this.dataSourceRight.length >= this.ipagination.total && temp.length === this.currentQueryAllData.length) { // 选中数据长度等于当前表格总长度 this.isCheckedAll = true } else { @@ -125,7 +125,7 @@ export default { 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) { + if (this.dataSourceRight.length !== 0 && this.currentQueryAllData.length !== 0 && this.dataSourceRight.length >= this.ipagination.total && temp.length === this.currentQueryAllData.length) { // 选中数据长度等于当前表格总长度 this.isCheckedAll = true } else { diff --git a/src/components/selection/UserSelectByContactNoMergeModal.vue b/src/components/selection/UserSelectByContactNoMergeModal.vue index f0fc1e84..2cbfc257 100644 --- a/src/components/selection/UserSelectByContactNoMergeModal.vue +++ b/src/components/selection/UserSelectByContactNoMergeModal.vue @@ -133,7 +133,7 @@ export default { 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) { + if (val.length !== 0 && this.currentQueryAllData.length !== 0 && this.dataSourceRight.length >= this.ipagination.total && temp.length === this.currentQueryAllData.length) { this.isCheckedAll = true } else { this.isCheckedAll = false @@ -151,7 +151,7 @@ export default { 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) { + if (this.dataSourceRight.length !== 0 && this.currentQueryAllData.length !== 0 && this.dataSourceRight.length >= this.ipagination.total && temp.length === this.currentQueryAllData.length) { // 选中数据长度和表格总数相等或者和上次查询的总数相等 this.isCheckedAll = true } else { diff --git a/src/components/selection/UserSelectByWorkGroupModal.vue b/src/components/selection/UserSelectByWorkGroupModal.vue index dcdd0d63..e50c3e76 100644 --- a/src/components/selection/UserSelectByWorkGroupModal.vue +++ b/src/components/selection/UserSelectByWorkGroupModal.vue @@ -159,7 +159,7 @@ export default { 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) { + if (val.length !== 0 && this.currentQueryAllData.length !== 0 && this.dataSourceRight.length >= this.ipagination.total && temp.length === this.currentQueryAllData.length) { // 选中数据长度等于当前表格总长度 this.isCheckedAll = true } else { @@ -178,7 +178,7 @@ export default { 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) { + if (this.dataSourceRight.length !== 0 && this.currentQueryAllData.length !== 0 && this.dataSourceRight.length >= this.ipagination.total && temp.length === this.currentQueryAllData.length) { // 选中数据长度等于当前表格总长度 this.isCheckedAll = true } else { diff --git a/src/components/selection/UserSelectModal.vue b/src/components/selection/UserSelectModal.vue index e8dd29f5..aadb959a 100644 --- a/src/components/selection/UserSelectModal.vue +++ b/src/components/selection/UserSelectModal.vue @@ -134,7 +134,7 @@ export default { 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) { + if (val.length !== 0 && this.currentQueryAllData.length !== 0 && this.dataSourceRight.length >= this.ipagination.total && temp.length === this.currentQueryAllData.length) { // 选中数据长度等于当前表格总长度 this.isCheckedAll = true } else { @@ -153,7 +153,7 @@ export default { 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) { + if (this.dataSourceRight.length !== 0 && this.currentQueryAllData.length !== 0 && this.dataSourceRight.length >= this.ipagination.total && temp.length === this.currentQueryAllData.length) { // 选中数据长度等于当前表格总长度 this.isCheckedAll = true } else {