From cb6ae97003ad6dc486a1d527cadea6967eb62082 Mon Sep 17 00:00:00 2001
From: kevin jiang <kevin.jiang@kiisoo.com>
Date: Fri, 10 Apr 2020 11:02:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/shop/IncreaseStaffManager.vue   |  3 -
 kiisoo-ic-ui/src/pages/user/RoleManager.vue   | 57 +++++++++++++++++--
 2 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/kiisoo-ic-ui/src/pages/shop/IncreaseStaffManager.vue b/kiisoo-ic-ui/src/pages/shop/IncreaseStaffManager.vue
index 550ae35..b124074 100644
--- a/kiisoo-ic-ui/src/pages/shop/IncreaseStaffManager.vue
+++ b/kiisoo-ic-ui/src/pages/shop/IncreaseStaffManager.vue
@@ -121,9 +121,6 @@
                             <Button>继续添加</Button>
                         </i-col>
                     </Row>
-
-
-
                 </FormItem>
             </Form>
         </Modal>
diff --git a/kiisoo-ic-ui/src/pages/user/RoleManager.vue b/kiisoo-ic-ui/src/pages/user/RoleManager.vue
index b213047..8fb0be8 100644
--- a/kiisoo-ic-ui/src/pages/user/RoleManager.vue
+++ b/kiisoo-ic-ui/src/pages/user/RoleManager.vue
@@ -109,7 +109,9 @@
                             <div v-for="(itemSon, itemSonIndex) in item.sonPermissionList" :key="itemSon.id" style="height: 49px;">
                                 <div style="float: left;width: 20%;border-right: 1px solid #E4E9F1;border-bottom: 1px solid #E4E9F1;height: 49px;line-height: 49px;">
                                     <Checkbox style="margin-left: 30px;color:#697882" :label="itemSon.id"
-                                              @click.prevent.native="handleSonCheckAll(itemSonIndex, index)" :key="itemSon.id"
+                                              @click.prevent.native="handleSonCheckAll(itemSonIndex, index)"
+                                              @on-change="handleSonCheckAllChange(itemSonIndex, index)"
+                                              :key="itemSon.id"
                                               :indeterminate="itemSon.indeterminate" :value="itemSon.check">
                                         {{itemSon.name}}
                                     </Checkbox>
@@ -254,12 +256,12 @@
                                     {
                                         id: 11,
                                         name: '三级权限e',
-                                        level: 3,
+                                        level: 3
                                     },
                                     {
                                         id: 12,
                                         name: '三级权限f',
-                                        level: 3,
+                                        level: 3
                                     }
                                 ]
                             },
@@ -274,12 +276,12 @@
                                     {
                                         id: 13,
                                         name: '三级权限g',
-                                        level: 3,
+                                        level: 3
                                     },
                                     {
                                         id: 14,
                                         name: '三级权限h',
-                                        level: 3,
+                                        level: 3
                                     }
                                 ]
                             }
@@ -306,11 +308,15 @@
                     //全选
                     item.checkArr = [];
                     for(let i = 0; i < item.sonPermissionList.length; i++) {
+                        item.sonPermissionList[i].check = true;
                         item.checkArr.push(item.sonPermissionList[i].id);
                     }
                 } else {
                     //取消全部选择
                     item.checkArr = [];
+                    for(let i = 0; i < item.sonPermissionList.length; i++) {
+                        item.sonPermissionList[i].check = false;
+                    }
                 }
                 //三级权限全选
                 let sonPermission = item.sonPermissionList;
@@ -367,6 +373,47 @@
                     item.indeterminate = false;
                     item.check = false;
                 }
+
+            },
+            handleSonCheckAllChange(itemSonIndex, index) {
+                let item = this.permissionList[index];
+                let itemSon = this.permissionList[index].sonPermissionList[itemSonIndex];
+                if (itemSon.indeterminate) {
+                    itemSon.check = false;
+                } else {
+                    itemSon.check = !itemSon.check;
+                }
+                itemSon.indeterminate = false;
+                //三级权限全选
+                let sonPermission = itemSon.sonPermissionList;
+                if (itemSon.check) {
+                    //全选
+                    itemSon.checkArr = [];
+                    sonPermission.forEach(function (sonItem) {
+                        if (itemSon.checkArr.indexOf(sonItem.id) < 0) {
+                            itemSon.checkArr.push(sonItem.id);
+                        }
+                    });
+                    if (item.checkArr.indexOf(itemSon.id) < 0) {
+                        item.checkArr.push(itemSon.id);
+                    }
+                } else {
+                    //取消全部选择
+                    itemSon.checkArr = [];
+                }
+                //处理一级权限勾选
+                let sonPermissionCount = this.permissionList.length;
+                if (item.checkArr.length === sonPermissionCount) {
+                    item.indeterminate = false;
+                    item.check = true;
+                } else if (item.checkArr.length > 0) {
+                    item.indeterminate = true;
+                    item.check = false;
+                } else {
+                    item.indeterminate = false;
+                    item.check = false;
+                }
+
             },
             //三级权限-点击事件
             handleGrandSonCheckChange (itemSonIndex, index) {