From 040150f9d5e9539384ce669978c3c90b65c886f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Thu, 28 Apr 2022 20:30:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=91=E5=BD=A2=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/index.vue | 13 ++++++++++---
 src/views/system/user/index.vue | 11 ++++++-----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 4504895..af5fb95 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -47,7 +47,7 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center">
         <template #default="scope">
           <el-button type="text" icon="edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dept:update']">修改</el-button>
           <el-button type="text" icon="plus" @click="handleAdd(scope.row)" v-hasPermi="['system:dept:add']">新增</el-button>
@@ -62,7 +62,14 @@
         <el-row :gutter="20">
           <el-col :lg="24" v-if="form.parentId !== 0">
             <el-form-item label="上级部门" prop="parentId">
-              <TreeSelect v-model:value="form.parentId" :options="deptOptions" :objMap="{ value: 'deptId', label: 'deptName', children: 'children' }" placeholder="选择上级部门" />
+              <el-tree-select
+                v-model="form.parentId"
+                :data="deptOptions"
+                :props="{ value: 'deptId', label: 'deptName', children: 'children' }"
+                value-key="deptId"
+                placeholder="选择上级部门"
+                check-strictly
+              />
             </el-form-item>
           </el-col>
           <el-col :lg="12">
@@ -139,7 +146,7 @@ const state = reactive({
   form: {},
   // 表单校验
   rules: {
-    parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
+    // parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
     deptName: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
     orderNum: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }],
     email: [
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index db9a62a..de1e3be 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -107,12 +107,13 @@
           </el-col>
           <el-col :lg="12">
             <el-form-item label="归属部门" prop="deptId">
-              <tree-select
-                v-model:value="form.deptId"
-                :show-count="true"
-                :options="deptOptions"
+              <el-tree-select
+                v-model="form.deptId"
+                :data="deptOptions"
+                :props="{ value: 'id', label: 'label', children: 'children' }"
+                value-key="id"
                 placeholder="请选择归属部门"
-                :objMap="{ value: 'id', label: 'label', children: 'children' }"
+                check-strictly
               />
             </el-form-item>
           </el-col>