From d657ae845f4dbe8ec98cc0de529329e9da7baebf Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Tue, 26 Jul 2022 12:00:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=9E=B6=E6=9E=84=E9=87=8D=E7=BD=AE,=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E7=BB=84=E7=BB=87bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/core/auth.js      | 16 +---------------
 src/views/permission/dept/index.vue |  7 +++++++
 src/views/permission/menu/index.vue |  2 +-
 src/views/permission/role/index.vue |  2 ++
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/store/modules/core/auth.js b/src/store/modules/core/auth.js
index 3330b67..bd98323 100644
--- a/src/store/modules/core/auth.js
+++ b/src/store/modules/core/auth.js
@@ -19,20 +19,6 @@ const _verifyPermission = (data, permissionData) => {
     });
 };
 
-/**
- * 临时展开数据 高玉需要把资源接口改成一维数组
- */
-const _getData = (data) => {
-    let newData = [];
-    data.forEach((i) => {
-        if (i.menuChild) {
-            newData = newData.concat(_getData(i.menuChild));
-        }
-        newData.push(i);
-    });
-
-    return newData;
-};
 const state = () => ({
     userInfo: null,
     permission: [],
@@ -140,7 +126,7 @@ const actions = {
     },
     getPermission: async ({ commit }) => {
         let res = await getPermission({ systemId: 1 });
-        const permissionData = _verifyPermission(routerData, _getData(res));
+        const permissionData = _verifyPermission(routerData, res);
         console.log(permissionData, 'permissionData');
         if (permissionData) {
             commit('setPermission', permissionData);
diff --git a/src/views/permission/dept/index.vue b/src/views/permission/dept/index.vue
index 709d0fe..f36c10d 100644
--- a/src/views/permission/dept/index.vue
+++ b/src/views/permission/dept/index.vue
@@ -95,6 +95,7 @@
                         :config="employeeConfig"
                         :data="employeeList"
                         :operation="['search']"
+                        :reset="handleResetEmployee"
                         @search="handleSearchEmployee"
                     >
                         <template #search>
@@ -234,9 +235,15 @@
             proxy.$message.error('请先选择部门');
         }
     };
+    const handleResetEmployee = () => {
+        state.condition2.employeeName = '';
+        state.condition2.userName = '';
+        state.condition2.phone = '';
+    };
     watch(
         () => state.condition2,
         (value) => {
+            console.log(value, 'xxxxxx');
             let search = value?.departmentId && value?.departmentId !== store.state.deptEmployee.condition.departmentId;
             store.commit('deptEmployee/setCondition', _.cloneDeep(value));
             if (search) {
diff --git a/src/views/permission/menu/index.vue b/src/views/permission/menu/index.vue
index de5a28b..5183929 100644
--- a/src/views/permission/menu/index.vue
+++ b/src/views/permission/menu/index.vue
@@ -104,7 +104,7 @@
                     </el-row>
 
                     <el-form-item label="菜单排序" prop="sort">
-                        <el-input-number v-model="menuState.form.sort" />
+                        <el-input-number v-model="menuState.form.sort" :min="0" />
                     </el-form-item>
                     <el-scrollbar maxHeight="180px">
                         <el-form-item label="接口权限" v-if="!menuState.form.permissionListVO.length">
diff --git a/src/views/permission/role/index.vue b/src/views/permission/role/index.vue
index 469fab2..ec63bf4 100644
--- a/src/views/permission/role/index.vue
+++ b/src/views/permission/role/index.vue
@@ -138,6 +138,7 @@
                                 :props="{
                                     label: 'name',
                                     value: 'id',
+                                    children: 'childDepartment',
                                 }"
                                 show-checkbox
                                 @check-change="handleCheckDept"
@@ -191,6 +192,7 @@
         };
     };
     const handleSearch = async () => {
+        console.log(opts, 'opts,opts,opts,opts');
         loading.value = true;
         await store.dispatch('role/search');
         loading.value = false;