From a06c857cf8159498c9c03d083c46698cad58972a Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Thu, 15 Dec 2022 14:03:11 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=85=A8=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Report/ReportManager.vue | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/views/Report/ReportManager.vue b/src/views/Report/ReportManager.vue
index ea1231f..f8f2d67 100644
--- a/src/views/Report/ReportManager.vue
+++ b/src/views/Report/ReportManager.vue
@@ -341,8 +341,13 @@
                         </el-row>
                     </el-form-item>
                     <el-form-item label="权限:" required>
-                        <el-select v-model="reportF.reportUserIdList" class="icon-auth" multiple collapse-tags
+                        <el-select v-model="reportF.reportUserIdList"
+                                   class="icon-auth"
+                                   multiple
+                                   collapse-tags
+                                   @change="changeSelect"
                                    placeholder="请选择">
+                          <el-checkbox class="check-all" v-model="checked" @change='selectAll'>全选</el-checkbox>
                             <template v-for="item in userList">
                                 <el-option :label="item.ACCOUNT" :value="item.USID" :key="item.USID"></el-option>
                             </template>
@@ -474,10 +479,27 @@ export default {
             tableData: [],
             yearList: [],
             dialogPreview: false,
-            content: ''
+            content: '',
+            /*  权限全选  */
+            checked: false,
+            mulSelecteds: [], // 已选中选项
         }
     },
     methods: {
+        /*  权限全选  */
+        selectAll() {
+            this.reportF.reportUserIdList = [];
+            if (this.checked) {
+                this.userList.forEach((item) => { this.reportF.reportUserIdList.push(item.USID )});
+            } else {
+                this.reportF.reportUserIdList = [];
+            }
+            // this.$emit('update:updateMultipleSelect',this.reportF.reportUserIdList);
+        },
+        changeSelect(val) {
+            this.checked = val.length === this.userList.length;
+            // this.$emit('update:updateMultipleSelect',this.reportF.reportUserIdList);
+        },
         init() {
             this.labelList();
             this.reset();
@@ -978,6 +1000,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.check-all {
+    text-align: right;
+    width: 95%;
+}
 .report-manager {
     .title {
         border-bottom: 1px solid #EBEEF5;

From f89cfcca4d337e5b71b0049ab848137f42009649 Mon Sep 17 00:00:00 2001
From: yangjianze <yangjianze@syxysoft.com>
Date: Thu, 15 Dec 2022 14:15:52 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=8A=A5=E5=91=8A=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?-=E6=9D=83=E9=99=90=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=8F=8D?=
 =?UTF-8?q?=E6=98=BE=E6=94=B9=E4=B8=BA=E7=94=A8=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Report/ReportManager.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Report/ReportManager.vue b/src/views/Report/ReportManager.vue
index f8f2d67..18fc108 100644
--- a/src/views/Report/ReportManager.vue
+++ b/src/views/Report/ReportManager.vue
@@ -349,7 +349,7 @@
                                    placeholder="请选择">
                           <el-checkbox class="check-all" v-model="checked" @change='selectAll'>全选</el-checkbox>
                             <template v-for="item in userList">
-                                <el-option :label="item.ACCOUNT" :value="item.USID" :key="item.USID"></el-option>
+                                <el-option :label="item.USNAME" :value="item.USID" :key="item.USID"></el-option>
                             </template>
                         </el-select>
                     </el-form-item>

From b7cfcfa52571e382fa0ad68dd665fee1c716715c Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Thu, 15 Dec 2022 15:05:31 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=EF=BC=9A=E5=85=A8=E9=80=89=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Report/ReportManager.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/Report/ReportManager.vue b/src/views/Report/ReportManager.vue
index f8f2d67..ec486a5 100644
--- a/src/views/Report/ReportManager.vue
+++ b/src/views/Report/ReportManager.vue
@@ -346,8 +346,9 @@
                                    multiple
                                    collapse-tags
                                    @change="changeSelect"
+                                   @visible-change="changeSelect"
                                    placeholder="请选择">
-                          <el-checkbox class="check-all" v-model="checked" @change='selectAll'>全选</el-checkbox>
+                          <el-checkbox class="check-all" v-model="checked" @change="selectAll">全选</el-checkbox>
                             <template v-for="item in userList">
                                 <el-option :label="item.ACCOUNT" :value="item.USID" :key="item.USID"></el-option>
                             </template>
@@ -497,7 +498,7 @@ export default {
             // this.$emit('update:updateMultipleSelect',this.reportF.reportUserIdList);
         },
         changeSelect(val) {
-            this.checked = val.length === this.userList.length;
+            this.checked = (val.length || this.reportF.reportUserIdList.length) === this.userList.length;
             // this.$emit('update:updateMultipleSelect',this.reportF.reportUserIdList);
         },
         init() {