From 7a9ccedadcd7f6a27d6c2a40b2083a899dae4732 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 11 十二月 2024 15:30:44 +0800
Subject: [PATCH] update 优化 新增编辑用户 过滤禁用的部门

---
 src/views/system/user/index.vue |  654 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 353 insertions(+), 301 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 63c2adf..572f50c 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -6,8 +6,9 @@
         <el-card shadow="hover">
           <el-input v-model="deptName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" prefix-icon="Search" clearable />
           <el-tree
-            class="mt-2"
             ref="deptTreeRef"
+            class="mt-2"
+            node-key="id"
             :data="deptOptions"
             :props="{ label: 'label', children: 'children' }"
             :expand-on-click-node="false"
@@ -15,40 +16,43 @@
             highlight-current
             default-expand-all
             @node-click="handleNodeClick"
-          ></el-tree>
+          />
         </el-card>
       </el-col>
       <el-col :lg="20" :xs="24">
         <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-          <div class="search" v-show="showSearch">
-            <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px">
-              <el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
-                <el-input v-model="queryParams.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" clearable style="width: 240px" @keyup.enter="handleQuery" />
-              </el-form-item>
-              <el-form-item label="鎵嬫満鍙风爜" prop="phonenumber">
-                <el-input v-model="queryParams.phonenumber" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" clearable style="width: 240px" @keyup.enter="handleQuery" />
-              </el-form-item>
+          <div v-show="showSearch" class="mb-[10px]">
+            <el-card shadow="hover">
+              <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+                <el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
+                  <el-input v-model="queryParams.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+                <el-form-item label="鎵嬫満鍙风爜" prop="phonenumber">
+                  <el-input v-model="queryParams.phonenumber" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
 
-              <el-form-item label="鐘舵��" prop="status">
-                <el-select v-model="queryParams.status" placeholder="鐢ㄦ埛鐘舵��" clearable style="width: 240px">
-                  <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
-                </el-select>
-              </el-form-item>
-              <el-form-item label="鍒涘缓鏃堕棿" style="width: 308px;">
-                <el-date-picker
-                  v-model="dateRange"
-                  value-format="YYYY-MM-DD"
-                  type="daterange"
-                  range-separator="-"
-                  start-placeholder="寮�濮嬫棩鏈�"
-                  end-placeholder="缁撴潫鏃ユ湡"
-                ></el-date-picker>
-              </el-form-item>
-              <el-form-item>
-                <el-button type="primary" @click="handleQuery" icon="Search">鎼滅储</el-button>
-                <el-button @click="resetQuery" icon="Refresh">閲嶇疆</el-button>
-              </el-form-item>
-            </el-form>
+                <el-form-item label="鐘舵��" prop="status">
+                  <el-select v-model="queryParams.status" placeholder="鐢ㄦ埛鐘舵��" clearable>
+                    <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="鍒涘缓鏃堕棿" style="width: 308px">
+                  <el-date-picker
+                    v-model="dateRange"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                    type="daterange"
+                    range-separator="-"
+                    start-placeholder="寮�濮嬫棩鏈�"
+                    end-placeholder="缁撴潫鏃ユ湡"
+                    :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+                  ></el-date-picker>
+                </el-form-item>
+                <el-form-item>
+                  <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+                  <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+                </el-form-item>
+              </el-form>
+            </el-card>
           </div>
         </transition>
 
@@ -56,15 +60,15 @@
           <template #header>
             <el-row :gutter="10">
               <el-col :span="1.5">
-                <el-button type="primary" plain @click="handleAdd()" v-has-permi="['system:user:add']" icon="Plus">鏂板</el-button>
+                <el-button v-has-permi="['system:user:add']" type="primary" plain icon="Plus" @click="handleAdd()">鏂板</el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button type="success" plain @click="handleUpdate()" :disabled="single" v-has-permi="['system:user:add']" icon="Edit">
+                <el-button v-has-permi="['system:user:add']" type="success" plain :disabled="single" icon="Edit" @click="handleUpdate()">
                   淇敼
                 </el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button type="danger" plain @click="handleDelete()" :disabled="multiple" v-has-permi="['system:user:delete']" icon="Delete">
+                <el-button v-has-permi="['system:user:delete']" type="danger" plain :disabled="multiple" icon="Delete" @click="handleDelete()">
                   鍒犻櫎
                 </el-button>
               </el-col>
@@ -76,38 +80,31 @@
                   ></el-button>
                   <template #dropdown>
                     <el-dropdown-menu>
-                      <el-dropdown-item @click="importTemplate" icon="Download">涓嬭浇妯℃澘</el-dropdown-item>
-                      <el-dropdown-item @click="handleImport" icon="Top"> 瀵煎叆鏁版嵁</el-dropdown-item>
-                      <el-dropdown-item @click="handleExport" icon="Download"> 瀵煎嚭鏁版嵁</el-dropdown-item>
+                      <el-dropdown-item icon="Download" @click="importTemplate">涓嬭浇妯℃澘</el-dropdown-item>
+                      <el-dropdown-item icon="Top" @click="handleImport">瀵煎叆鏁版嵁</el-dropdown-item>
+                      <el-dropdown-item icon="Download" @click="handleExport"> 瀵煎嚭鏁版嵁</el-dropdown-item>
                     </el-dropdown-menu>
                   </template>
                 </el-dropdown>
               </el-col>
-              <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns" :search="true"></right-toolbar>
+              <right-toolbar v-model:show-search="showSearch" :columns="columns" :search="true" @query-table="getList"></right-toolbar>
             </el-row>
           </template>
 
           <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="50" align="center" />
-            <el-table-column label="鐢ㄦ埛缂栧彿" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-            <el-table-column label="鐢ㄦ埛鍚嶇О" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="鐢ㄦ埛鏄电О" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-            <el-table-column
-              label="閮ㄩ棬"
-              align="center"
-              key="deptName"
-              prop="dept.deptName"
-              v-if="columns[3].visible"
-              :show-overflow-tooltip="true"
-            />
-            <el-table-column label="鎵嬫満鍙风爜" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-            <el-table-column label="鐘舵��" align="center" key="status" v-if="columns[5].visible">
+            <el-table-column v-if="columns[0].visible" key="userId" label="鐢ㄦ埛缂栧彿" align="center" prop="userId" />
+            <el-table-column v-if="columns[1].visible" key="userName" label="鐢ㄦ埛鍚嶇О" align="center" prop="userName" :show-overflow-tooltip="true" />
+            <el-table-column v-if="columns[2].visible" key="nickName" label="鐢ㄦ埛鏄电О" align="center" prop="nickName" :show-overflow-tooltip="true" />
+            <el-table-column v-if="columns[3].visible" key="deptName" label="閮ㄩ棬" align="center" prop="deptName" :show-overflow-tooltip="true" />
+            <el-table-column v-if="columns[4].visible" key="phonenumber" label="鎵嬫満鍙风爜" align="center" prop="phonenumber" width="120" />
+            <el-table-column v-if="columns[5].visible" key="status" label="鐘舵��" align="center">
               <template #default="scope">
                 <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
               </template>
             </el-table-column>
 
-            <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+            <el-table-column v-if="columns[6].visible" label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="160">
               <template #default="scope">
                 <span>{{ scope.row.createTime }}</span>
               </template>
@@ -115,19 +112,19 @@
 
             <el-table-column label="鎿嶄綔" fixed="right" width="180" class-name="small-padding fixed-width">
               <template #default="scope">
-                <el-tooltip content="淇敼" placement="top" v-if="scope.row.userId !== 1">
-                  <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
+                <el-tooltip v-if="scope.row.userId !== 1" content="淇敼" placement="top">
+                  <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
                 </el-tooltip>
-                <el-tooltip content="鍒犻櫎" placement="top" v-if="scope.row.userId !== 1">
-                  <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']"></el-button>
+                <el-tooltip v-if="scope.row.userId !== 1" content="鍒犻櫎" placement="top">
+                  <el-button v-hasPermi="['system:user:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
                 </el-tooltip>
 
-                <el-tooltip content="閲嶇疆瀵嗙爜" placement="top" v-if="scope.row.userId !== 1">
-                  <el-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']"></el-button>
+                <el-tooltip v-if="scope.row.userId !== 1" content="閲嶇疆瀵嗙爜" placement="top">
+                  <el-button v-hasPermi="['system:user:resetPwd']" link type="primary" icon="Key" @click="handleResetPwd(scope.row)"></el-button>
                 </el-tooltip>
 
-                <el-tooltip content="鍒嗛厤瑙掕壊" placement="top" v-if="scope.row.userId !== 1">
-                  <el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
+                <el-tooltip v-if="scope.row.userId !== 1" content="鍒嗛厤瑙掕壊" placement="top">
+                  <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)"></el-button>
                 </el-tooltip>
               </template>
             </el-table-column>
@@ -135,9 +132,9 @@
 
           <pagination
             v-show="total > 0"
-            :total="total"
             v-model:page="queryParams.pageNum"
             v-model:limit="queryParams.pageSize"
+            :total="total"
             @pagination="getList"
           />
         </el-card>
@@ -145,8 +142,8 @@
     </el-row>
 
     <!-- 娣诲姞鎴栦慨鏀圭敤鎴烽厤缃璇濇 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="600px" append-to-body @close="closeDialog">
-      <el-form :model="form" :rules="rules" ref="userFormRef" label-width="80px">
+    <el-dialog ref="formDialogRef" v-model="dialog.visible" :title="dialog.title" width="600px" append-to-body @close="closeDialog">
+      <el-form ref="userFormRef" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="鐢ㄦ埛鏄电О" prop="nickName">
@@ -157,11 +154,12 @@
             <el-form-item label="褰掑睘閮ㄩ棬" prop="deptId">
               <el-tree-select
                 v-model="form.deptId"
-                :data="deptOptions"
+                :data="enabledDeptOptions"
                 :props="{ value: 'id', label: 'label', children: 'children' }"
                 value-key="id"
                 placeholder="璇烽�夋嫨褰掑睘閮ㄩ棬"
                 check-strictly
+                @change="handleDeptChange"
               />
             </el-form-item>
           </el-col>
@@ -201,8 +199,7 @@
           <el-col :span="12">
             <el-form-item label="鐘舵��">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{
-                    dict.label }}</el-radio>
+                <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -222,8 +219,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="瑙掕壊">
-              <el-select v-model="form.roleIds" multiple placeholder="璇烽�夋嫨">
+            <el-form-item label="瑙掕壊" prop="roleIds">
+              <el-select v-model="form.roleIds" filterable multiple placeholder="璇烽�夋嫨">
                 <el-option
                   v-for="item in roleOptions"
                   :key="item.roleId"
@@ -252,7 +249,7 @@
     </el-dialog>
 
     <!-- 鐢ㄦ埛瀵煎叆瀵硅瘽妗� -->
-    <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
+    <el-dialog v-model="upload.open" :title="upload.title" width="400px" append-to-body>
       <el-upload
         ref="uploadRef"
         :limit="1"
@@ -273,7 +270,7 @@
           <div class="text-center el-upload__tip">
             <div class="el-upload__tip"><el-checkbox v-model="upload.updateSupport" />鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹�</div>
             <span>浠呭厑璁稿鍏ls銆亁lsx鏍煎紡鏂囦欢銆�</span>
-            <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">涓嬭浇妯℃澘</el-link>
+            <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">涓嬭浇妯℃澘</el-link>
           </div>
         </template>
       </el-upload>
@@ -288,336 +285,391 @@
 </template>
 
 <script setup name="User" lang="ts">
-import {
-    changeUserStatus,
-    listUser,
-    resetUserPwd,
-    delUser,
-    getUser,
-    updateUser,
-    addUser,
-    deptTreeSelect
-} from "@/api/system/user"
+import api from '@/api/system/user';
 import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
-import { ComponentInternalInstance } from "vue";
-import { getToken } from "@/utils/auth";
-import { treeselect } from "@/api/system/dept";
-import { DeptVO } from "@/api/system/dept/types";
-import { RoleVO } from "@/api/system/role/types";
-import { PostVO } from "@/api/system/post/types";
-import { DateModelType, ElTree, ElUpload, UploadFile, ElForm } from 'element-plus';
-import { to } from "await-to-js";
+import {DeptTreeVO, DeptVO} from '@/api/system/dept/types';
+import { RoleVO } from '@/api/system/role/types';
+import { PostQuery, PostVO } from '@/api/system/post/types';
+import { treeselect } from '@/api/system/dept';
+import { globalHeaders } from '@/utils/request';
+import { to } from 'await-to-js';
+import { optionselect } from '@/api/system/post';
+
 const router = useRouter();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_normal_disable, sys_user_sex } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'sys_user_sex'));
-
-
 const userList = ref<UserVO[]>();
 const loading = ref(true);
-const showSearch = ref(true)
+const showSearch = ref(true);
 const ids = ref<Array<number | string>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const dateRange = ref<[DateModelType, DateModelType]>(['','']);
+const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
 const deptName = ref('');
-const deptOptions = ref<DeptVO[]>([]);
-const initPassword = ref('123456');
+const deptOptions = ref<DeptTreeVO[]>([]);
+const enabledDeptOptions = ref<DeptTreeVO[]>([]);
+const initPassword = ref<string>('');
 const postOptions = ref<PostVO[]>([]);
 const roleOptions = ref<RoleVO[]>([]);
 /*** 鐢ㄦ埛瀵煎叆鍙傛暟 */
 const upload = reactive<ImportOption>({
-    // 鏄惁鏄剧ず寮瑰嚭灞傦紙鐢ㄦ埛瀵煎叆锛�
-    open: false,
-    // 寮瑰嚭灞傛爣棰橈紙鐢ㄦ埛瀵煎叆锛�
-    title: "",
-    // 鏄惁绂佺敤涓婁紶
-    isUploading: false,
-    // 鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹�
-    updateSupport: 0,
-    // 璁剧疆涓婁紶鐨勮姹傚ご閮�
-    headers: { Authorization: "Bearer " + getToken() },
-    // 涓婁紶鐨勫湴鍧�
-    url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData"
-})
+  // 鏄惁鏄剧ず寮瑰嚭灞傦紙鐢ㄦ埛瀵煎叆锛�
+  open: false,
+  // 寮瑰嚭灞傛爣棰橈紙鐢ㄦ埛瀵煎叆锛�
+  title: '',
+  // 鏄惁绂佺敤涓婁紶
+  isUploading: false,
+  // 鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹�
+  updateSupport: 0,
+  // 璁剧疆涓婁紶鐨勮姹傚ご閮�
+  headers: globalHeaders(),
+  // 涓婁紶鐨勫湴鍧�
+  url: import.meta.env.VITE_APP_BASE_API + '/system/user/importData'
+});
 // 鍒楁樉闅愪俊鎭�
 const columns = ref<FieldOption[]>([
-    { key: 0, label: `鐢ㄦ埛缂栧彿`, visible: false },
-    { key: 1, label: `鐢ㄦ埛鍚嶇О`, visible: true },
-    { key: 2, label: `鐢ㄦ埛鏄电О`, visible: true },
-    { key: 3, label: `閮ㄩ棬`, visible: true },
-    { key: 4, label: `鎵嬫満鍙风爜`, visible: true },
-    { key: 5, label: `鐘舵�乣, visible: true },
-    { key: 6, label: `鍒涘缓鏃堕棿`, visible: true }
-])
+  { key: 0, label: `鐢ㄦ埛缂栧彿`, visible: false, children: [] },
+  { key: 1, label: `鐢ㄦ埛鍚嶇О`, visible: true, children: [] },
+  { key: 2, label: `鐢ㄦ埛鏄电О`, visible: true, children: [] },
+  { key: 3, label: `閮ㄩ棬`, visible: true, children: [] },
+  { key: 4, label: `鎵嬫満鍙风爜`, visible: true, children: [] },
+  { key: 5, label: `鐘舵�乣, visible: true, children: [] },
+  { key: 6, label: `鍒涘缓鏃堕棿`, visible: true, children: [] }
+]);
 
-
-const deptTreeRef = ref(ElTree);
-const queryFormRef = ref(ElForm);
-const userFormRef = ref(ElForm);
-const uploadRef = ref(ElUpload);
+const deptTreeRef = ref<ElTreeInstance>();
+const queryFormRef = ref<ElFormInstance>();
+const userFormRef = ref<ElFormInstance>();
+const uploadRef = ref<ElUploadInstance>();
+const formDialogRef = ref<ElDialogInstance>();
 
 const dialog = reactive<DialogOption>({
-    visible: false,
-    title: ''
+  visible: false,
+  title: ''
 });
 
 const initFormData: UserForm = {
-    userId: undefined,
-    deptId: undefined,
-    userName: '',
-    nickName: undefined,
-    password: '',
-    phonenumber: undefined,
-    email: undefined,
-    sex: undefined,
-    status: "0",
-    remark: '',
-    postIds: [],
-    roleIds: []
-}
-const data = reactive<PageData<UserForm, UserQuery>>({
-    form: { ...initFormData },
-    queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        userName: '',
-        phonenumber: '',
-        status: '',
-        deptId: ''
-    },
-    rules: {
-        userName: [{ required: true, message: "鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }, { min: 2, max: 20, message: "鐢ㄦ埛鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿", trigger: "blur" }],
-        nickName: [{ required: true, message: "鐢ㄦ埛鏄电О涓嶈兘涓虹┖", trigger: "blur" }],
-        password: [{ required: true, message: "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" }, { min: 5, max: 20, message: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿", trigger: "blur" }],
-        email: [{ type: "email", message: "璇疯緭鍏ユ纭殑閭鍦板潃", trigger: ["blur", "change"] }],
-        phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "璇疯緭鍏ユ纭殑鎵嬫満鍙风爜", trigger: "blur" }]
-    }
-})
+  userId: undefined,
+  deptId: undefined,
+  userName: '',
+  nickName: undefined,
+  password: '',
+  phonenumber: undefined,
+  email: undefined,
+  sex: undefined,
+  status: '0',
+  remark: '',
+  postIds: [],
+  roleIds: []
+};
 
-const { queryParams, form, rules } = toRefs<PageData<UserForm, UserQuery>>(data)
+const initData: PageData<UserForm, UserQuery> = {
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    userName: '',
+    phonenumber: '',
+    status: '',
+    deptId: '',
+    roleId: ''
+  },
+  rules: {
+    userName: [
+      { required: true, message: '鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' },
+      {
+        min: 2,
+        max: 20,
+        message: '鐢ㄦ埛鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿',
+        trigger: 'blur'
+      }
+    ],
+    nickName: [{ required: true, message: '鐢ㄦ埛鏄电О涓嶈兘涓虹┖', trigger: 'blur' }],
+    password: [
+      { required: true, message: '鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖', trigger: 'blur' },
+      {
+        min: 5,
+        max: 20,
+        message: '鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿',
+        trigger: 'blur'
+      },
+      { pattern: /^[^<>"'|\\]+$/, message: '涓嶈兘鍖呭惈闈炴硶瀛楃锛�< > " \' \\ |', trigger: 'blur' }
+    ],
+    email: [
+      {
+        type: 'email',
+        message: '璇疯緭鍏ユ纭殑閭鍦板潃',
+        trigger: ['blur', 'change']
+      }
+    ],
+    phonenumber: [
+      {
+        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        message: '璇疯緭鍏ユ纭殑鎵嬫満鍙风爜',
+        trigger: 'blur'
+      }
+    ],
+    roleIds: [{ required: true, message: '鐢ㄦ埛瑙掕壊涓嶈兘涓虹┖', trigger: 'blur' }]
+  }
+};
+const data = reactive<PageData<UserForm, UserQuery>>(initData);
+
+const { queryParams, form, rules } = toRefs<PageData<UserForm, UserQuery>>(data);
 
 /** 閫氳繃鏉′欢杩囨护鑺傜偣  */
 const filterNode = (value: string, data: any) => {
-    if (!value) return true
-    return data.label.indexOf(value) !== -1
-}
+  if (!value) return true;
+  return data.label.indexOf(value) !== -1;
+};
 /** 鏍规嵁鍚嶇О绛涢�夐儴闂ㄦ爲 */
 watchEffect(
-    () => {deptTreeRef.value.filter(deptName.value);},
-    {
-        flush: 'post' // watchEffect浼氬湪DOM鎸傝浇鎴栬�呮洿鏂颁箣鍓嶅氨浼氳Е鍙戯紝姝ゅ睘鎬ф帶鍒跺湪DOM鍏冪礌鏇存柊鍚庤繍琛�
-    }
+  () => {
+    deptTreeRef.value?.filter(deptName.value);
+  },
+  {
+    flush: 'post' // watchEffect浼氬湪DOM鎸傝浇鎴栬�呮洿鏂颁箣鍓嶅氨浼氳Е鍙戯紝姝ゅ睘鎬ф帶鍒跺湪DOM鍏冪礌鏇存柊鍚庤繍琛�
+  }
 );
-
-/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
-const getTreeSelect = async () => {
-    const res = await deptTreeSelect();
-    deptOptions.value = res.data;
-};
 
 /** 鏌ヨ鐢ㄦ埛鍒楄〃 */
 const getList = async () => {
-    loading.value = true;
-    const res = await listUser(proxy?.addDateRange(queryParams.value, dateRange.value));
-    loading.value = false;
-    userList.value = res.rows;
-    total.value = res.total;
-}
+  loading.value = true;
+  const res = await api.listUser(proxy?.addDateRange(queryParams.value, dateRange.value));
+  loading.value = false;
+  userList.value = res.rows;
+  total.value = res.total;
+};
+
+/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
+const getDeptTree = async () => {
+  const res = await api.deptTreeSelect();
+  deptOptions.value = res.data;
+  enabledDeptOptions.value = filterDisabledDept(res.data);
+};
+
+/** 杩囨护绂佺敤鐨勯儴闂� */
+const filterDisabledDept = (deptList: DeptTreeVO[]) => {
+  return deptList.filter(dept => {
+    if (dept.disabled) {
+      return false;
+    }
+    if (dept.children && dept.children.length) {
+      dept.children = filterDisabledDept(dept.children);
+    }
+    return true;
+  });
+};
 
 /** 鑺傜偣鍗曞嚮浜嬩欢 */
 const handleNodeClick = (data: DeptVO) => {
-    queryParams.value.deptId = data.id;
-    handleQuery()
-}
-
+  queryParams.value.deptId = data.id;
+  handleQuery();
+};
 
 /** 鎼滅储鎸夐挳鎿嶄綔 */
 const handleQuery = () => {
-    queryParams.value.pageNum = 1
-    getList()
-}
+  queryParams.value.pageNum = 1;
+  getList();
+};
 /** 閲嶇疆鎸夐挳鎿嶄綔 */
 const resetQuery = () => {
-    dateRange.value = ['','']
-    queryFormRef.value.resetFields();
-    queryParams.value.pageNum = 1;
-    handleQuery();
-}
+  dateRange.value = ['', ''];
+  queryFormRef.value?.resetFields();
+  queryParams.value.pageNum = 1;
+  queryParams.value.deptId = undefined;
+  deptTreeRef.value?.setCurrentKey(undefined);
+  handleQuery();
+};
 
 /** 鍒犻櫎鎸夐挳鎿嶄綔 */
 const handleDelete = async (row?: UserVO) => {
-    const userIds = row?.userId || ids.value;
-    const [err] = await to(proxy?.$modal.confirm('鏄惁纭鍒犻櫎鐢ㄦ埛缂栧彿涓�"' + userIds + '"鐨勬暟鎹」锛�') as any);
-    if (!err) {
-        await delUser(userIds);
-        await getList();
-        proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-    }
-}
+  const userIds = row?.userId || ids.value;
+  const [err] = await to(proxy?.$modal.confirm('鏄惁纭鍒犻櫎鐢ㄦ埛缂栧彿涓�"' + userIds + '"鐨勬暟鎹」锛�') as any);
+  if (!err) {
+    await api.delUser(userIds);
+    await getList();
+    proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
+  }
+};
 
 /** 鐢ㄦ埛鐘舵�佷慨鏀�  */
 const handleStatusChange = async (row: UserVO) => {
-    let text = row.status === "0" ? "鍚敤" : "鍋滅敤"
-    try {
-        await proxy?.$modal.confirm('纭瑕�"' + text + '""' + row.userName + '"鐢ㄦ埛鍚�?');
-        await changeUserStatus(row.userId, row.status);
-        proxy?.$modal.msgSuccess(text + "鎴愬姛");
-    } catch (err) {
-        row.status = row.status === "0" ? "1" : "0";
-    }
-}
+  let text = row.status === '0' ? '鍚敤' : '鍋滅敤';
+  try {
+    await proxy?.$modal.confirm('纭瑕�"' + text + '""' + row.userName + '"鐢ㄦ埛鍚�?');
+    await api.changeUserStatus(row.userId, row.status);
+    proxy?.$modal.msgSuccess(text + '鎴愬姛');
+  } catch (err) {
+    row.status = row.status === '0' ? '1' : '0';
+  }
+};
 /** 璺宠浆瑙掕壊鍒嗛厤 */
 const handleAuthRole = (row: UserVO) => {
-    const userId = row.userId;
-    router.push("/system/user-auth/role/" + userId);
-}
+  const userId = row.userId;
+  router.push('/system/user-auth/role/' + userId);
+};
 
 /** 閲嶇疆瀵嗙爜鎸夐挳鎿嶄綔 */
 const handleResetPwd = async (row: UserVO) => {
-    const [err, res] = await to(ElMessageBox.prompt('璇疯緭鍏�"' + row.userName + '"鐨勬柊瀵嗙爜', "鎻愮ず", {
-        confirmButtonText: "纭畾",
-        cancelButtonText: "鍙栨秷",
-        closeOnClickModal: false,
-        inputPattern: /^.{5,20}$/,
-        inputErrorMessage: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿",
-    }))
-    if (!err) {
-        await resetUserPwd(row.userId, res.value);
-        proxy?.$modal.msgSuccess("淇敼鎴愬姛锛屾柊瀵嗙爜鏄細" + res.value);
-    }
-}
+  const [err, res] = await to(
+    ElMessageBox.prompt('璇疯緭鍏�"' + row.userName + '"鐨勬柊瀵嗙爜', '鎻愮ず', {
+      confirmButtonText: '纭畾',
+      cancelButtonText: '鍙栨秷',
+      closeOnClickModal: false,
+      inputPattern: /^.{5,20}$/,
+      inputErrorMessage: '鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿',
+      inputValidator: (value) => {
+        if (/<|>|"|'|\||\\/.test(value)) {
+          return '涓嶈兘鍖呭惈闈炴硶瀛楃锛�< > " \' \\ |';
+        }
+      }
+    })
+  );
+  if (!err && res) {
+    await api.resetUserPwd(row.userId, res.value);
+    proxy?.$modal.msgSuccess('淇敼鎴愬姛锛屾柊瀵嗙爜鏄細' + res.value);
+  }
+};
 
 /** 閫夋嫨鏉℃暟  */
 const handleSelectionChange = (selection: UserVO[]) => {
-    ids.value = selection.map((item) => item.userId);
-    single.value = selection.length != 1;
-    multiple.value = !selection.length;
-}
+  ids.value = selection.map((item) => item.userId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
 
 /** 瀵煎叆鎸夐挳鎿嶄綔 */
 const handleImport = () => {
-    upload.title = "鐢ㄦ埛瀵煎叆";
-    upload.open = true;
-}
+  upload.title = '鐢ㄦ埛瀵煎叆';
+  upload.open = true;
+};
 /** 瀵煎嚭鎸夐挳鎿嶄綔 */
 const handleExport = () => {
-    proxy?.download("system/user/export", {
-        ...queryParams.value,
-    }, `user_${new Date().getTime()}.xlsx`);
+  proxy?.download(
+    'system/user/export',
+    {
+      ...queryParams.value
+    },
+    `user_${new Date().getTime()}.xlsx`
+  );
 };
 /** 涓嬭浇妯℃澘鎿嶄綔 */
 const importTemplate = () => {
-    proxy?.download("system/user/importTemplate", {
-    }, `user_template_${new Date().getTime()}.xlsx`);
-}
+  proxy?.download('system/user/importTemplate', {}, `user_template_${new Date().getTime()}.xlsx`);
+};
 
 /**鏂囦欢涓婁紶涓鐞� */
 const handleFileUploadProgress = () => {
-    upload.isUploading = true;
-}
+  upload.isUploading = true;
+};
 /** 鏂囦欢涓婁紶鎴愬姛澶勭悊 */
 const handleFileSuccess = (response: any, file: UploadFile) => {
-    upload.open = false;
-    upload.isUploading = false;
-    uploadRef.value.handleRemove(file);
-    ElMessageBox.alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "瀵煎叆缁撴灉", { dangerouslyUseHTMLString: true });
-    getList();
-}
+  upload.open = false;
+  upload.isUploading = false;
+  uploadRef.value?.handleRemove(file);
+  ElMessageBox.alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + '</div>', '瀵煎叆缁撴灉', {
+    dangerouslyUseHTMLString: true
+  });
+  getList();
+};
 
 /** 鎻愪氦涓婁紶鏂囦欢 */
 function submitFileForm() {
-    uploadRef.value.submit();
+  uploadRef.value?.submit();
 }
 
 /** 鍒濆鍖栭儴闂ㄦ暟鎹� */
 const initTreeData = async () => {
-    // 鍒ゆ柇閮ㄩ棬鐨勬暟鎹槸鍚﹀瓨鍦紝瀛樺湪涓嶈幏鍙栵紝涓嶅瓨鍦ㄥ垯鑾峰彇
-    if (deptOptions.value === undefined) {
-        const { data } = await treeselect();
-        deptOptions.value = data;
-    }
-}
-
+  // 鍒ゆ柇閮ㄩ棬鐨勬暟鎹槸鍚﹀瓨鍦紝瀛樺湪涓嶈幏鍙栵紝涓嶅瓨鍦ㄥ垯鑾峰彇
+  if (deptOptions.value === undefined) {
+    const { data } = await treeselect();
+    deptOptions.value = data;
+  }
+};
 
 /** 閲嶇疆鎿嶄綔琛ㄥ崟 */
 const reset = () => {
-    form.value = { ...initFormData };
-    userFormRef.value.resetFields();
-}
+  form.value = { ...initFormData };
+  userFormRef.value?.resetFields();
+};
 /** 鍙栨秷鎸夐挳 */
 const cancel = () => {
-    reset();
-    dialog.visible = false;
-}
+  dialog.visible = false;
+  reset();
+};
 
 /** 鏂板鎸夐挳鎿嶄綔 */
-const handleAdd = () => {
-    dialog.visible = true;
-    dialog.title = "鏂板鐢ㄦ埛";
-    nextTick(async () => {
-        reset();
-        await initTreeData();
-        const { data } = await getUser();
-        postOptions.value = data.posts;
-        roleOptions.value = data.roles;
-        form.value.password = initPassword.value;
-    })
-}
-/** 淇敼鎸夐挳鎿嶄綔 */
-const handleUpdate = (row?: UserForm) => {
-    dialog.visible = true;
-    dialog.title = "淇敼鐢ㄦ埛";
-    nextTick(async () => {
-        reset();
-        await initTreeData();
-        const userId = row?.userId || ids.value[0]
-        const { data } = await getUser(userId)
-        Object.assign(form.value, data.user);
-        postOptions.value = data.posts;
-        roleOptions.value = data.roles;
-        form.value.postIds = data.postIds;
-        form.value.roleIds = data.roleIds;
-        form.value.password = "";
-    })
+const handleAdd = async () => {
+  reset();
+  const { data } = await api.getUser();
+  dialog.visible = true;
+  dialog.title = '鏂板鐢ㄦ埛';
+  await initTreeData();
+  postOptions.value = data.posts;
+  roleOptions.value = data.roles;
+  form.value.password = initPassword.value.toString();
+};
 
-}
+/** 淇敼鎸夐挳鎿嶄綔 */
+const handleUpdate = async (row?: UserForm) => {
+  reset();
+  const userId = row?.userId || ids.value[0];
+  const { data } = await api.getUser(userId);
+  dialog.visible = true;
+  dialog.title = '淇敼鐢ㄦ埛';
+  await initTreeData();
+  Object.assign(form.value, data.user);
+  postOptions.value = data.posts;
+  roleOptions.value = data.roles;
+  form.value.postIds = data.postIds;
+  form.value.roleIds = data.roleIds;
+  form.value.password = '';
+};
 
 /** 鎻愪氦鎸夐挳 */
 const submitForm = () => {
-    userFormRef.value.validate(async (valid: boolean) => {
-        if (valid) {
-            form.value.userId ? await updateUser(form.value) : await addUser(form.value);
-            proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
-            dialog.visible = false;
-            await getList();
-        }
-    })
-}
-
+  userFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      form.value.userId ? await api.updateUser(form.value) : await api.addUser(form.value);
+      proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
 
 /**
  * 鍏抽棴鐢ㄦ埛寮圭獥
  */
 const closeDialog = () => {
-    dialog.visible = false;
-    resetForm();
-}
+  dialog.visible = false;
+  resetForm();
+};
 
 /**
  * 閲嶇疆琛ㄥ崟
  */
 const resetForm = () => {
-    userFormRef.value.resetFields();
-    userFormRef.value.clearValidate();
+  userFormRef.value?.resetFields();
+  userFormRef.value?.clearValidate();
 
-    form.value.id = undefined;
-    form.value.status = '1';
-}
+  form.value.id = undefined;
+  form.value.status = '1';
+};
 onMounted(() => {
-    getTreeSelect() // 鍒濆鍖栭儴闂ㄦ暟鎹�
-    getList() // 鍒濆鍖栧垪琛ㄦ暟鎹�
+  getDeptTree(); // 鍒濆鍖栭儴闂ㄦ暟鎹�
+  getList(); // 鍒濆鍖栧垪琛ㄦ暟鎹�
+  proxy?.getConfigKey('sys.user.initPassword').then((response) => {
+    initPassword.value = response.data;
+  });
 });
+
+async function handleDeptChange(value: number | string) {
+  const response = await optionselect(value);
+  postOptions.value = response.data;
+  form.value.postIds = [];
+}
 </script>
 
 <style lang="scss" scoped></style>

--
Gitblit v1.9.3