From 543c44dcc817902ad4072c4b4f0b7f3536ebddda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=96=87=E5=8F=AF?= <1041367524@qq.com>
Date: Sat, 21 May 2022 16:37:31 +0800
Subject: [PATCH] fix: BUG

---
 src/store/modules/permission/dept/dept.js | 14 ++++++++++++
 src/views/permission/dept/index.vue       |  4 ++--
 src/views/permission/employee/form.vue    |  2 ++
 src/views/permission/employee/index.vue   | 10 +++++++--
 src/views/permission/role/index.vue       | 27 ++++++++++++++++-------
 5 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/src/store/modules/permission/dept/dept.js b/src/store/modules/permission/dept/dept.js
index dfccae3..a908f60 100644
--- a/src/store/modules/permission/dept/dept.js
+++ b/src/store/modules/permission/dept/dept.js
@@ -51,6 +51,20 @@ const actions = {
         }
         return res;
     },
+    enable: async ({ dispatch }, data) => {
+        try {
+            await ElMessageBox.confirm('确定要禁用该组织吗?', '危险操作');
+            let res = await api.update(data);
+            if (res) {
+                ElMessage.success((data.isEnable ? '启用' : '禁用') + '成功');
+            } else {
+                ElMessage.error((data.isEnable ? '启用' : '禁用') + '失败');
+            }
+        } catch (e) {
+            console.info('取消删除', e);
+        }
+        dispatch('search');
+    },
     remove: async ({ dispatch }, idList) => {
         if (!idList.length) {
             ElMessage.warning('请选择要删除的数据');
diff --git a/src/views/permission/dept/index.vue b/src/views/permission/dept/index.vue
index a60a0a1..40c8c98 100644
--- a/src/views/permission/dept/index.vue
+++ b/src/views/permission/dept/index.vue
@@ -71,7 +71,7 @@
                             />
                         </el-form-item>
                         <el-form-item label="组织名称" prop="name">
-                            <el-input v-model="formState.form.name" />
+                            <el-input v-model="formState.form.name" maxlength="10" />
                         </el-form-item>
                     </el-form>
                     <template #footer>
@@ -404,7 +404,7 @@
         formState.formVisible = false;
     };
     const handleEnabled = (row) => {
-        store.dispatch('dept/save', row);
+        store.dispatch('dept/enable', row);
     };
     const handleSave = async () => {
         formState.submitting = true;
diff --git a/src/views/permission/employee/form.vue b/src/views/permission/employee/form.vue
index 776db69..3c59bb0 100644
--- a/src/views/permission/employee/form.vue
+++ b/src/views/permission/employee/form.vue
@@ -133,6 +133,7 @@
     /* 数据 */
     const handleLoad = async () => {
         if (route.params.id) {
+            loading.value = true;
             const id = +route.params.id;
             if (form.id !== id) {
                 let res = await store.dispatch('employee/detail', id);
@@ -141,6 +142,7 @@
             permissionList.splice(0);
             permissionList.push(...(await store.dispatch('employee/permission', id)));
             form.roleIds = permissionList.map((item) => item.id);
+            loading.value = false;
         }
     };
     onActivated(handleLoad);
diff --git a/src/views/permission/employee/index.vue b/src/views/permission/employee/index.vue
index 6f91524..77ed870 100644
--- a/src/views/permission/employee/index.vue
+++ b/src/views/permission/employee/index.vue
@@ -45,6 +45,8 @@
 <script setup lang="jsx">
     import ElButton from '@/components/extra/ElButton.vue';
     import ElSwitch from '@/components/extra/ElSwitch.vue';
+    import { ElTag } from 'element-plus/es/components/tag/index';
+    import 'element-plus/es/components/tag/style/css';
     const router = useRouter();
     const store = useStore();
     const loading = ref(false);
@@ -138,7 +140,7 @@
                 prop: 'roles',
                 minWidth: 160,
                 slots: {
-                    default: ({ row }) => row.roleList?.map((item) => item.roleName).join(',') || '无',
+                    default: ({ row }) => row.roleList?.map((item) => <ElTag>{item.roleName}</ElTag>) || '无',
                 },
             },
             {
@@ -203,4 +205,8 @@
     });
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+    :deep(.el-tag) {
+        margin: 2px @layout-space-small;
+    }
+</style>
diff --git a/src/views/permission/role/index.vue b/src/views/permission/role/index.vue
index 6d2278a..f680f24 100644
--- a/src/views/permission/role/index.vue
+++ b/src/views/permission/role/index.vue
@@ -53,10 +53,10 @@
                             />
                         </el-form-item>
                         <el-form-item label="角色名称" prop="roleName">
-                            <el-input v-model="formState.form.roleName" />
+                            <el-input v-model="formState.form.roleName" maxlength="10" />
                         </el-form-item>
                         <el-form-item label="角色描述" prop="roleDesc">
-                            <el-input v-model="formState.form.roleDesc" />
+                            <el-input v-model="formState.form.roleDesc" maxlength="30" />
                         </el-form-item>
                         <el-form-item label="是否启用" prop="isEnable">
                             <el-switch v-model="formState.form.isEnable" />
@@ -92,7 +92,9 @@
                             />
                         </el-form-item>
                         <el-form-item label="功能权限" prop="permissionIds">
-                            <el-checkbox v-model="checkAll">全选</el-checkbox>
+                            <el-checkbox v-model="checkAll" :indeterminate="isIndeterminate" @change="handleCheckAll">
+                                全选
+                            </el-checkbox>
                             <el-tree
                                 ref="refsTree"
                                 :data="permissionList"
@@ -218,7 +220,7 @@
             isEnable: true,
             menuIds: [],
             permissionIds: [],
-            departmentList: [],
+            departmentList: [2],
         },
         rules1: {
             systemId: [{ required: true, message: '所属系统不能为空' }],
@@ -236,9 +238,18 @@
     });
     const refsTree = ref(null);
     const checkAll = ref(false);
-    watch(checkAll, (value) => {
-        unref(refsTree).setCheckedKeys(value ? unref(permissionList).map((item) => item.id) : []);
-    });
+    const isIndeterminate = ref(false);
+    watch(
+        [permissionList, () => formState.form.permissionIds],
+        (value) => {
+            checkAll.value = value[0].length && value[0].every((item) => value[1].includes(item.id));
+            isIndeterminate.value = !checkAll.value && value[0].some((item) => value[1].includes(item.id));
+        },
+        { immediate: true, deep: true }
+    );
+    const handleCheckAll = () => {
+        unref(refsTree).setCheckedKeys(unref(checkAll) ? unref(permissionList).map((item) => item.id) : []);
+    };
     const handleLoadPermission = async (data) => {
         permissionList.value = await store.dispatch('role/loadPermission', data.id);
     };
@@ -319,7 +330,7 @@
                     isEnable: true,
                     menuIds: [],
                     permissionIds: [],
-                    departmentList: [],
+                    departmentList: [2],
                 }
             )
         );