diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 072b940..d8345a0 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -12,7 +12,7 @@
 
         <div class="right-menu">
             <template v-if="device !== 'mobile'">
-                <search id="header-search" class="right-menu-item" />
+                <!-- <search id="header-search" class="right-menu-item" />
 
                 <el-tooltip content="源码地址" effect="dark" placement="bottom">
                     <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
@@ -20,7 +20,7 @@
 
                 <el-tooltip content="文档地址" effect="dark" placement="bottom">
                     <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-                </el-tooltip>
+                </el-tooltip> -->
 
                 <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
diff --git a/src/views/login.vue b/src/views/login.vue
index 7102b83..406dc7e 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,220 +1,214 @@
 <template>
-  <div class="login">
-    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">{{title}}</h3>
-      <el-form-item prop="username">
-        <el-input
-          v-model="loginForm.username"
-          type="text"
-          auto-complete="off"
-          placeholder="账号"
-        >
-          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="password">
-        <el-input
-          v-model="loginForm.password"
-          type="password"
-          auto-complete="off"
-          placeholder="密码"
-          @keyup.enter.native="handleLogin"
-        >
-          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="code" v-if="captchaEnabled">
-        <el-input
-          v-model="loginForm.code"
-          auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
-          @keyup.enter.native="handleLogin"
-        >
-          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
-        </el-input>
-        <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
-        </div>
-      </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
-      <el-form-item style="width:100%;">
-        <el-button
-          :loading="loading"
-          size="medium"
-          type="primary"
-          style="width:100%;"
-          @click.native.prevent="handleLogin"
-        >
-          <span v-if="!loading">登 录</span>
-          <span v-else>登 录 中...</span>
-        </el-button>
-        <div style="float: right;" v-if="register">
-          <router-link class="link-type" :to="'/register'">立即注册</router-link>
-        </div>
-      </el-form-item>
-    </el-form>
-    <!--  底部  -->
-    <div class="el-login-footer">
-      <span>Copyright © 2018-2025 ruoyi.vip All Rights Reserved.</span>
+    <div class="login">
+        <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
+            <h3 class="title">{{ title }}</h3>
+            <el-form-item prop="username">
+                <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
+                    <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+                </el-input>
+            </el-form-item>
+            <el-form-item prop="password">
+                <el-input
+                    v-model="loginForm.password"
+                    type="password"
+                    auto-complete="off"
+                    placeholder="密码"
+                    @keyup.enter.native="handleLogin"
+                >
+                    <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+                </el-input>
+            </el-form-item>
+            <el-form-item prop="code" v-if="captchaEnabled">
+                <el-input
+                    v-model="loginForm.code"
+                    auto-complete="off"
+                    placeholder="验证码"
+                    style="width: 63%"
+                    @keyup.enter.native="handleLogin"
+                >
+                    <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+                </el-input>
+                <div class="login-code">
+                    <img :src="codeUrl" @click="getCode" class="login-code-img" />
+                </div>
+            </el-form-item>
+            <el-checkbox v-model="loginForm.rememberMe" style="margin: 0px 0px 25px 0px">记住密码</el-checkbox>
+            <el-form-item style="width: 100%">
+                <el-button
+                    :loading="loading"
+                    size="medium"
+                    type="primary"
+                    style="width: 100%"
+                    @click.native.prevent="handleLogin"
+                >
+                    <span v-if="!loading">登 录</span>
+                    <span v-else>登 录 中...</span>
+                </el-button>
+                <div style="float: right" v-if="register">
+                    <router-link class="link-type" :to="'/register'">立即注册</router-link>
+                </div>
+            </el-form-item>
+        </el-form>
+        <!--  底部  -->
+        <!-- <div class="el-login-footer">
+            <span>Copyright © 2018-2025 ruoyi.vip All Rights Reserved.</span>
+        </div> -->
     </div>
-  </div>
 </template>
 
 <script>
-import { getCodeImg } from "@/api/login";
-import Cookies from "js-cookie";
+import { getCodeImg } from '@/api/login'
+import Cookies from 'js-cookie'
 import { encrypt, decrypt } from '@/utils/jsencrypt'
 
 export default {
-  name: "Login",
-  data() {
-    return {
-      title: process.env.VUE_APP_TITLE,
-      codeUrl: "",
-      loginForm: {
-        username: "admin",
-        password: "admin123",
-        rememberMe: false,
-        code: "",
-        uuid: ""
-      },
-      loginRules: {
-        username: [
-          { required: true, trigger: "blur", message: "请输入您的账号" }
-        ],
-        password: [
-          { required: true, trigger: "blur", message: "请输入您的密码" }
-        ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
-      },
-      loading: false,
-      // 验证码开关
-      captchaEnabled: true,
-      // 注册开关
-      register: false,
-      redirect: undefined
-    };
-  },
-  watch: {
-    $route: {
-      handler: function(route) {
-        this.redirect = route.query && route.query.redirect;
-      },
-      immediate: true
-    }
-  },
-  created() {
-    this.getCode();
-    this.getCookie();
-  },
-  methods: {
-    getCode() {
-      getCodeImg().then(res => {
-        this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
-        if (this.captchaEnabled) {
-          this.codeUrl = "data:image/gif;base64," + res.img;
-          this.loginForm.uuid = res.uuid;
+    name: 'Login',
+    data() {
+        return {
+            title: process.env.VUE_APP_TITLE,
+            codeUrl: '',
+            loginForm: {
+                username: 'admin',
+                password: 'admin123',
+                rememberMe: false,
+                code: '',
+                uuid: '',
+            },
+            loginRules: {
+                username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }],
+                password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }],
+                code: [{ required: true, trigger: 'change', message: '请输入验证码' }],
+            },
+            loading: false,
+            // 验证码开关
+            captchaEnabled: true,
+            // 注册开关
+            register: false,
+            redirect: undefined,
         }
-      });
     },
-    getCookie() {
-      const username = Cookies.get("username");
-      const password = Cookies.get("password");
-      const rememberMe = Cookies.get('rememberMe')
-      this.loginForm = {
-        username: username === undefined ? this.loginForm.username : username,
-        password: password === undefined ? this.loginForm.password : decrypt(password),
-        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
-      };
+    watch: {
+        $route: {
+            handler: function (route) {
+                this.redirect = route.query && route.query.redirect
+            },
+            immediate: true,
+        },
     },
-    handleLogin() {
-      this.$refs.loginForm.validate(valid => {
-        if (valid) {
-          this.loading = true;
-          if (this.loginForm.rememberMe) {
-            Cookies.set("username", this.loginForm.username, { expires: 30 });
-            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
-            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
-          } else {
-            Cookies.remove("username");
-            Cookies.remove("password");
-            Cookies.remove('rememberMe');
-          }
-          this.$store.dispatch("Login", this.loginForm).then(() => {
-            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
-          }).catch(() => {
-            this.loading = false;
-            if (this.captchaEnabled) {
-              this.getCode();
+    created() {
+        this.getCode()
+        this.getCookie()
+    },
+    methods: {
+        getCode() {
+            getCodeImg().then((res) => {
+                this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled
+                if (this.captchaEnabled) {
+                    this.codeUrl = 'data:image/gif;base64,' + res.img
+                    this.loginForm.uuid = res.uuid
+                }
+            })
+        },
+        getCookie() {
+            const username = Cookies.get('username')
+            const password = Cookies.get('password')
+            const rememberMe = Cookies.get('rememberMe')
+            this.loginForm = {
+                username: username === undefined ? this.loginForm.username : username,
+                password: password === undefined ? this.loginForm.password : decrypt(password),
+                rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
             }
-          });
-        }
-      });
-    }
-  }
-};
+        },
+        handleLogin() {
+            this.$refs.loginForm.validate((valid) => {
+                if (valid) {
+                    this.loading = true
+                    if (this.loginForm.rememberMe) {
+                        Cookies.set('username', this.loginForm.username, { expires: 30 })
+                        Cookies.set('password', encrypt(this.loginForm.password), { expires: 30 })
+                        Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 })
+                    } else {
+                        Cookies.remove('username')
+                        Cookies.remove('password')
+                        Cookies.remove('rememberMe')
+                    }
+                    this.$store
+                        .dispatch('Login', this.loginForm)
+                        .then(() => {
+                            this.$router.push({ path: this.redirect || '/' }).catch(() => {})
+                        })
+                        .catch(() => {
+                            this.loading = false
+                            if (this.captchaEnabled) {
+                                this.getCode()
+                            }
+                        })
+                }
+            })
+        },
+    },
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
 .login {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
-  background-size: cover;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100%;
+    background-image: url('../assets/images/login-background.jpg');
+    background-size: cover;
 }
 .title {
-  margin: 0px auto 30px auto;
-  text-align: center;
-  color: #707070;
+    margin: 0px auto 30px auto;
+    text-align: center;
+    color: #707070;
 }
 
 .login-form {
-  border-radius: 6px;
-  background: #ffffff;
-  width: 400px;
-  padding: 25px 25px 5px 25px;
-  .el-input {
-    height: 38px;
-    input {
-      height: 38px;
+    border-radius: 6px;
+    background: #ffffff;
+    width: 400px;
+    padding: 25px 25px 5px 25px;
+    .el-input {
+        height: 38px;
+        input {
+            height: 38px;
+        }
+    }
+    .input-icon {
+        height: 39px;
+        width: 14px;
+        margin-left: 2px;
     }
-  }
-  .input-icon {
-    height: 39px;
-    width: 14px;
-    margin-left: 2px;
-  }
 }
 .login-tip {
-  font-size: 13px;
-  text-align: center;
-  color: #bfbfbf;
+    font-size: 13px;
+    text-align: center;
+    color: #bfbfbf;
 }
 .login-code {
-  width: 33%;
-  height: 38px;
-  float: right;
-  img {
-    cursor: pointer;
-    vertical-align: middle;
-  }
+    width: 33%;
+    height: 38px;
+    float: right;
+    img {
+        cursor: pointer;
+        vertical-align: middle;
+    }
 }
 .el-login-footer {
-  height: 40px;
-  line-height: 40px;
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-  text-align: center;
-  color: #fff;
-  font-family: Arial;
-  font-size: 12px;
-  letter-spacing: 1px;
+    height: 40px;
+    line-height: 40px;
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    text-align: center;
+    color: #fff;
+    font-family: Arial;
+    font-size: 12px;
+    letter-spacing: 1px;
 }
 .login-code-img {
-  height: 38px;
+    height: 38px;
 }
 </style>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 1dbc2d1..09ab986 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,553 +1,822 @@
 <template>
-  <div class="app-container">
-    <el-row :gutter="20">
-      <splitpanes :horizontal="this.$store.getters.device === 'mobile'" class="default-theme">
-        <!--部门数据-->
-        <pane size="16">
-          <el-col>
-            <div class="head-container">
-              <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px" />
-            </div>
-            <div class="head-container">
-              <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current @node-click="handleNodeClick" />
-            </div>
-          </el-col>
-        </pane>
-        <!--用户数据-->
-        <pane size="84">
-          <el-col>
-            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-              <el-form-item label="用户名称" prop="userName">
-                <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
-              </el-form-item>
-              <el-form-item label="手机号码" prop="phonenumber">
-                <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px" @keyup.enter.native="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 dict.type.sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
-                </el-select>
-              </el-form-item>
-              <el-form-item label="创建时间">
-                <el-date-picker v-model="dateRange" style="width: 240px" 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" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-              </el-form-item>
+    <div class="app-container">
+        <el-row :gutter="20">
+            <splitpanes :horizontal="this.$store.getters.device === 'mobile'" class="default-theme">
+                <!--部门数据-->
+                <pane size="16">
+                    <el-col>
+                        <div class="head-container">
+                            <el-input
+                                v-model="deptName"
+                                placeholder="请输入部门名称"
+                                clearable
+                                size="small"
+                                prefix-icon="el-icon-search"
+                                style="margin-bottom: 20px"
+                            />
+                        </div>
+                        <div class="head-container">
+                            <el-tree
+                                :data="deptOptions"
+                                :props="defaultProps"
+                                :expand-on-click-node="false"
+                                :filter-node-method="filterNode"
+                                ref="tree"
+                                node-key="id"
+                                default-expand-all
+                                highlight-current
+                                @node-click="handleNodeClick"
+                            />
+                        </div>
+                    </el-col>
+                </pane>
+                <!--用户数据-->
+                <pane size="84">
+                    <el-col>
+                        <el-form
+                            :model="queryParams"
+                            ref="queryForm"
+                            size="small"
+                            :inline="true"
+                            v-show="showSearch"
+                            label-width="68px"
+                        >
+                            <el-form-item label="用户名称" prop="userName">
+                                <el-input
+                                    v-model="queryParams.userName"
+                                    placeholder="请输入用户名称"
+                                    clearable
+                                    style="width: 240px"
+                                    @keyup.enter.native="handleQuery"
+                                />
+                            </el-form-item>
+                            <el-form-item label="手机号码" prop="phonenumber">
+                                <el-input
+                                    v-model="queryParams.phonenumber"
+                                    placeholder="请输入手机号码"
+                                    clearable
+                                    style="width: 240px"
+                                    @keyup.enter.native="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 dict.type.sys_normal_disable"
+                                        :key="dict.value"
+                                        :label="dict.label"
+                                        :value="dict.value"
+                                    />
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="创建时间">
+                                <el-date-picker
+                                    v-model="dateRange"
+                                    style="width: 240px"
+                                    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" icon="el-icon-search" size="mini" @click="handleQuery"
+                                    >搜索</el-button
+                                >
+                                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                            </el-form-item>
+                        </el-form>
+
+                        <el-row :gutter="10" class="mb8">
+                            <el-col :span="1.5">
+                                <el-button
+                                    type="primary"
+                                    plain
+                                    icon="el-icon-plus"
+                                    size="mini"
+                                    @click="handleAdd"
+                                    v-hasPermi="['system:user:add']"
+                                    >新增</el-button
+                                >
+                            </el-col>
+                            <el-col :span="1.5">
+                                <el-button
+                                    type="success"
+                                    plain
+                                    icon="el-icon-edit"
+                                    size="mini"
+                                    :disabled="single"
+                                    @click="handleUpdate"
+                                    v-hasPermi="['system:user:edit']"
+                                    >修改</el-button
+                                >
+                            </el-col>
+                            <el-col :span="1.5">
+                                <el-button
+                                    type="danger"
+                                    plain
+                                    icon="el-icon-delete"
+                                    size="mini"
+                                    :disabled="multiple"
+                                    @click="handleDelete"
+                                    v-hasPermi="['system:user:remove']"
+                                    >删除</el-button
+                                >
+                            </el-col>
+                            <el-col :span="1.5">
+                                <el-button
+                                    type="info"
+                                    plain
+                                    icon="el-icon-upload2"
+                                    size="mini"
+                                    @click="handleImport"
+                                    v-hasPermi="['system:user:import']"
+                                    >导入</el-button
+                                >
+                            </el-col>
+                            <el-col :span="1.5">
+                                <el-button
+                                    type="warning"
+                                    plain
+                                    icon="el-icon-download"
+                                    size="mini"
+                                    @click="handleExport"
+                                    v-hasPermi="['system:user:export']"
+                                    >导出</el-button
+                                >
+                            </el-col>
+                            <right-toolbar
+                                :showSearch.sync="showSearch"
+                                @queryTable="getList"
+                                :columns="columns"
+                            ></right-toolbar>
+                        </el-row>
+
+                        <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">
+                                <template slot-scope="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"
+                            >
+                                <template slot-scope="scope">
+                                    <span>{{ parseTime(scope.row.createTime) }}</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                label="操作"
+                                align="center"
+                                width="160"
+                                class-name="small-padding fixed-width"
+                            >
+                                <template slot-scope="scope" v-if="scope.row.userId !== 1">
+                                    <el-button
+                                        size="mini"
+                                        type="text"
+                                        icon="el-icon-edit"
+                                        @click="handleUpdate(scope.row)"
+                                        v-hasPermi="['system:user:edit']"
+                                        >修改</el-button
+                                    >
+                                    <el-button
+                                        size="mini"
+                                        type="text"
+                                        icon="el-icon-delete"
+                                        @click="handleDelete(scope.row)"
+                                        v-hasPermi="['system:user:remove']"
+                                        >删除</el-button
+                                    >
+                                    <el-dropdown
+                                        size="mini"
+                                        @command="(command) => handleCommand(command, scope.row)"
+                                        v-hasPermi="['system:user:resetPwd', 'system:user:edit']"
+                                    >
+                                        <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
+                                        <el-dropdown-menu slot="dropdown">
+                                            <el-dropdown-item
+                                                command="handleResetPwd"
+                                                icon="el-icon-key"
+                                                v-hasPermi="['system:user:resetPwd']"
+                                                >重置密码</el-dropdown-item
+                                            >
+                                            <el-dropdown-item
+                                                command="handleAuthRole"
+                                                icon="el-icon-circle-check"
+                                                v-hasPermi="['system:user:edit']"
+                                                >分配角色</el-dropdown-item
+                                            >
+                                        </el-dropdown-menu>
+                                    </el-dropdown>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+
+                        <pagination
+                            v-show="total > 0"
+                            :total="total"
+                            :page.sync="queryParams.pageNum"
+                            :limit.sync="queryParams.pageSize"
+                            @pagination="getList"
+                        />
+                    </el-col>
+                </pane>
+            </splitpanes>
+        </el-row>
+
+        <!-- 添加或修改用户配置对话框 -->
+        <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="用户昵称" prop="nickName">
+                            <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="归属部门" prop="deptId">
+                            <treeselect
+                                v-model="form.deptId"
+                                :options="enabledDeptOptions"
+                                :show-count="true"
+                                placeholder="请选择归属部门"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="手机号码" prop="phonenumber">
+                            <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="邮箱" prop="email">
+                            <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
+                            <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
+                            <el-input
+                                v-model="form.password"
+                                placeholder="请输入用户密码"
+                                type="password"
+                                maxlength="20"
+                                show-password
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="用户性别">
+                            <el-select v-model="form.sex" placeholder="请选择性别">
+                                <el-option
+                                    v-for="dict in dict.type.sys_user_sex"
+                                    :key="dict.value"
+                                    :label="dict.label"
+                                    :value="dict.value"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="状态">
+                            <el-radio-group v-model="form.status">
+                                <el-radio
+                                    v-for="dict in dict.type.sys_normal_disable"
+                                    :key="dict.value"
+                                    :label="dict.value"
+                                    >{{ dict.label }}</el-radio
+                                >
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="岗位">
+                            <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
+                                <el-option
+                                    v-for="item in postOptions"
+                                    :key="item.postId"
+                                    :label="item.postName"
+                                    :value="item.postId"
+                                    :disabled="item.status == 1"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="角色">
+                            <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
+                                <el-option
+                                    v-for="item in roleOptions"
+                                    :key="item.roleId"
+                                    :label="item.roleName"
+                                    :value="item.roleId"
+                                    :disabled="item.status == 1"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="24">
+                        <el-form-item label="备注">
+                            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
             </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
 
-            <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
-                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:user:add']">新增</el-button>
-              </el-col>
-              <el-col :span="1.5">
-                <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['system:user:edit']">修改</el-button>
-              </el-col>
-              <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:user:remove']">删除</el-button>
-              </el-col>
-              <el-col :span="1.5">
-                <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['system:user:import']">导入</el-button>
-              </el-col>
-              <el-col :span="1.5">
-                <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button>
-              </el-col>
-              <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-            </el-row>
-
-            <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">
-                <template slot-scope="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">
-                <template slot-scope="scope">
-                  <span>{{ parseTime(scope.row.createTime) }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
-                <template slot-scope="scope" v-if="scope.row.userId !== 1">
-                  <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']">修改</el-button>
-                  <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">删除</el-button>
-                  <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
-                    <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
-                    <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
-                      <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check" v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
-                    </el-dropdown-menu>
-                  </el-dropdown>
-                </template>
-              </el-table-column>
-            </el-table>
-
-            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
-          </el-col>
-        </pane>
-      </splitpanes>
-    </el-row>
-
-    <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户昵称" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="enabledDeptOptions" :show-count="true" placeholder="请选择归属部门" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户性别">
-              <el-select v-model="form.sex" placeholder="请选择性别">
-                <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="岗位">
-              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
-                <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId" :disabled="item.status == 1" ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="角色">
-              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
-                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId" :disabled="item.status == 1"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
-        <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-        <div class="el-upload__tip text-center" slot="tip">
-          <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-          </div>
-          <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
-        </div>
-      </el-upload>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFileForm">确 定</el-button>
-        <el-button @click="upload.open = false">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
+        <!-- 用户导入对话框 -->
+        <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+            <el-upload
+                ref="upload"
+                :limit="1"
+                accept=".xlsx, .xls"
+                :headers="upload.headers"
+                :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                :disabled="upload.isUploading"
+                :on-progress="handleFileUploadProgress"
+                :on-success="handleFileSuccess"
+                :auto-upload="false"
+                drag
+            >
+                <i class="el-icon-upload"></i>
+                <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+                <div class="el-upload__tip text-center" slot="tip">
+                    <div class="el-upload__tip" slot="tip">
+                        <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                    </div>
+                    <span>仅允许导入xls、xlsx格式文件。</span>
+                    <el-link
+                        type="primary"
+                        :underline="false"
+                        style="font-size: 12px; vertical-align: baseline"
+                        @click="importTemplate"
+                        >下载模板</el-link
+                    >
+                </div>
+            </el-upload>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitFileForm">确 定</el-button>
+                <el-button @click="upload.open = false">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { Splitpanes, Pane } from "splitpanes";
-import "splitpanes/dist/splitpanes.css";
+import {
+    listUser,
+    getUser,
+    delUser,
+    addUser,
+    updateUser,
+    resetUserPwd,
+    changeUserStatus,
+    deptTreeSelect,
+} from '@/api/system/user'
+import { getToken } from '@/utils/auth'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { Splitpanes, Pane } from 'splitpanes'
+import 'splitpanes/dist/splitpanes.css'
 
 export default {
-  name: "User",
-  dicts: ['sys_normal_disable', 'sys_user_sex'],
-  components: { Treeselect, Splitpanes, Pane },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 用户表格数据
-      userList: null,
-      // 弹出层标题
-      title: "",
-      // 所有部门树选项
-      deptOptions: undefined,
-      // 过滤掉已禁用部门树选项
-      enabledDeptOptions: undefined,
-      // 是否显示弹出层
-      open: false,
-      // 部门名称
-      deptName: undefined,
-      // 默认密码
-      initPassword: undefined,
-      // 日期范围
-      dateRange: [],
-      // 岗位选项
-      postOptions: [],
-      // 角色选项
-      roleOptions: [],
-      // 表单参数
-      form: {},
-      defaultProps: {
-        children: "children",
-        label: "label"
-      },
-      // 用户导入参数
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/system/user/importData"
-      },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        userName: undefined,
-        phonenumber: undefined,
-        status: undefined,
-        deptId: undefined
-      },
-      // 列信息
-      columns: [
-        { key: 0, label: `用户编号`, visible: true },
-        { 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 }
-      ],
-      // 表单校验
-      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"
-          }
-        ]
-      }
-    };
-  },
-  watch: {
-    // 根据名称筛选部门树
-    deptName(val) {
-      this.$refs.tree.filter(val);
-    }
-  },
-  created() {
-    this.getList();
-    this.getDeptTree();
-    this.getConfigKey("sys.user.initPassword").then(response => {
-      this.initPassword = response.msg;
-    });
-  },
-  methods: {
-    /** 查询用户列表 */
-    getList() {
-      this.loading = true;
-      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.userList = response.rows;
-          this.total = response.total;
-          this.loading = false;
+    name: 'User',
+    dicts: ['sys_normal_disable', 'sys_user_sex'],
+    components: { Treeselect, Splitpanes, Pane },
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 用户表格数据
+            userList: null,
+            // 弹出层标题
+            title: '',
+            // 所有部门树选项
+            deptOptions: undefined,
+            // 过滤掉已禁用部门树选项
+            enabledDeptOptions: undefined,
+            // 是否显示弹出层
+            open: false,
+            // 部门名称
+            deptName: undefined,
+            // 默认密码
+            initPassword: undefined,
+            // 日期范围
+            dateRange: [],
+            // 岗位选项
+            postOptions: [],
+            // 角色选项
+            roleOptions: [],
+            // 表单参数
+            form: {},
+            defaultProps: {
+                children: 'children',
+                label: 'label',
+            },
+            // 用户导入参数
+            upload: {
+                // 是否显示弹出层（用户导入）
+                open: false,
+                // 弹出层标题（用户导入）
+                title: '',
+                // 是否禁用上传
+                isUploading: false,
+                // 是否更新已经存在的用户数据
+                updateSupport: 0,
+                // 设置上传的请求头部
+                headers: { Authorization: 'Bearer ' + getToken() },
+                // 上传的地址
+                url: process.env.VUE_APP_BASE_API + '/system/user/importData',
+            },
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                userName: undefined,
+                phonenumber: undefined,
+                status: undefined,
+                deptId: undefined,
+            },
+            // 列信息
+            columns: [
+                { key: 0, label: `用户编号`, visible: true },
+                { 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 },
+            ],
+            // 表单校验
+            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' },
+                    {
+                        pattern: /^(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,16}$/,
+                        message: '密码要求8-16位，包含大小写字母、数字、特殊字符',
+                        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',
+                    },
+                ],
+            },
         }
-      );
     },
-    /** 查询部门下拉树结构 */
-    getDeptTree() {
-      deptTreeSelect().then(response => {
-        this.deptOptions = response.data;
-        this.enabledDeptOptions = this.filterDisabledDept(JSON.parse(JSON.stringify(response.data)));
-      });
-    },
-    // 过滤禁用的部门
-    filterDisabledDept(deptList) {
-      return deptList.filter(dept => {
-        if (dept.disabled) {
-          return false;
-        }
-        if (dept.children && dept.children.length) {
-          dept.children = this.filterDisabledDept(dept.children);
-        }
-        return true;
-      });
-    },
-    // 筛选节点
-    filterNode(value, data) {
-      if (!value) return true;
-      return data.label.indexOf(value) !== -1;
-    },
-    // 节点单击事件
-    handleNodeClick(data) {
-      this.queryParams.deptId = data.id;
-      this.handleQuery();
-    },
-    // 用户状态修改
-    handleStatusChange(row) {
-      let text = row.status === "0" ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
-        return changeUserStatus(row.userId, row.status);
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.status = row.status === "0" ? "1" : "0";
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        userId: undefined,
-        deptId: undefined,
-        userName: undefined,
-        nickName: undefined,
-        password: undefined,
-        phonenumber: undefined,
-        email: undefined,
-        sex: undefined,
-        status: "0",
-        remark: undefined,
-        postIds: [],
-        roleIds: []
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.queryParams.deptId = undefined;
-      this.$refs.tree.setCurrentKey(null);
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.userId);
-      this.single = selection.length != 1;
-      this.multiple = !selection.length;
-    },
-    // 更多操作触发
-    handleCommand(command, row) {
-      switch (command) {
-        case "handleResetPwd":
-          this.handleResetPwd(row);
-          break;
-        case "handleAuthRole":
-          this.handleAuthRole(row);
-          break;
-        default:
-          break;
-      }
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      getUser().then(response => {
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
-        this.open = true;
-        this.title = "添加用户";
-        this.form.password = this.initPassword;
-      });
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const userId = row.userId || this.ids;
-      getUser(userId).then(response => {
-        this.form = response.data;
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
-        this.$set(this.form, "postIds", response.postIds);
-        this.$set(this.form, "roleIds", response.roleIds);
-        this.open = true;
-        this.title = "修改用户";
-        this.form.password = "";
-      });
-    },
-    /** 重置密码按钮操作 */
-    handleResetPwd(row) {
-      this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        closeOnClickModal: false,
-        inputPattern: /^.{5,20}$/,
-        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
-        inputValidator: (value) => {
-          if (/<|>|"|'|\||\\/.test(value)) {
-            return "不能包含非法字符：< > \" ' \\\ |"
-          }
+    watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val)
         },
-      }).then(({ value }) => {
-          resetUserPwd(row.userId, value).then(response => {
-            this.$modal.msgSuccess("修改成功，新密码是：" + value);
-          });
-        }).catch(() => {});
     },
-    /** 分配角色操作 */
-    handleAuthRole: function(row) {
-      const userId = row.userId;
-      this.$router.push("/system/user-auth/role/" + userId);
+    created() {
+        this.getList()
+        this.getDeptTree()
+        this.getConfigKey('sys.user.initPassword').then((response) => {
+            this.initPassword = response.msg
+        })
     },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.userId != undefined) {
-            updateUser(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addUser(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
+    methods: {
+        /** 查询用户列表 */
+        getList() {
+            this.loading = true
+            listUser(this.addDateRange(this.queryParams, this.dateRange)).then((response) => {
+                this.userList = response.rows
+                this.total = response.total
+                this.loading = false
+            })
+        },
+        /** 查询部门下拉树结构 */
+        getDeptTree() {
+            deptTreeSelect().then((response) => {
+                this.deptOptions = response.data
+                this.enabledDeptOptions = this.filterDisabledDept(JSON.parse(JSON.stringify(response.data)))
+            })
+        },
+        // 过滤禁用的部门
+        filterDisabledDept(deptList) {
+            return deptList.filter((dept) => {
+                if (dept.disabled) {
+                    return false
+                }
+                if (dept.children && dept.children.length) {
+                    dept.children = this.filterDisabledDept(dept.children)
+                }
+                return true
+            })
+        },
+        // 筛选节点
+        filterNode(value, data) {
+            if (!value) return true
+            return data.label.indexOf(value) !== -1
+        },
+        // 节点单击事件
+        handleNodeClick(data) {
+            this.queryParams.deptId = data.id
+            this.handleQuery()
+        },
+        // 用户状态修改
+        handleStatusChange(row) {
+            let text = row.status === '0' ? '启用' : '停用'
+            this.$modal
+                .confirm('确认要"' + text + '""' + row.userName + '"用户吗？')
+                .then(function () {
+                    return changeUserStatus(row.userId, row.status)
+                })
+                .then(() => {
+                    this.$modal.msgSuccess(text + '成功')
+                })
+                .catch(function () {
+                    row.status = row.status === '0' ? '1' : '0'
+                })
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                userId: undefined,
+                deptId: undefined,
+                userName: undefined,
+                nickName: undefined,
+                password: 'YNsbd@123456',
+                phonenumber: undefined,
+                email: undefined,
+                sex: undefined,
+                status: '0',
+                remark: undefined,
+                postIds: [],
+                roleIds: [],
+            }
+            this.resetForm('form')
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.dateRange = []
+            this.resetForm('queryForm')
+            this.queryParams.deptId = undefined
+            this.$refs.tree.setCurrentKey(null)
+            this.handleQuery()
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map((item) => item.userId)
+            this.single = selection.length != 1
+            this.multiple = !selection.length
+        },
+        // 更多操作触发
+        handleCommand(command, row) {
+            switch (command) {
+                case 'handleResetPwd':
+                    this.handleResetPwd(row)
+                    break
+                case 'handleAuthRole':
+                    this.handleAuthRole(row)
+                    break
+                default:
+                    break
+            }
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset()
+            getUser().then((response) => {
+                this.postOptions = response.posts
+                this.roleOptions = response.roles
+                this.open = true
+                this.title = '添加用户'
+                // this.form.password = this.initPassword
+            })
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset()
+            const userId = row.userId || this.ids
+            getUser(userId).then((response) => {
+                this.form = response.data
+                this.postOptions = response.posts
+                this.roleOptions = response.roles
+                this.$set(this.form, 'postIds', response.postIds)
+                this.$set(this.form, 'roleIds', response.roleIds)
+                this.open = true
+                this.title = '修改用户'
+                this.form.password = ''
+            })
+        },
+        /** 重置密码按钮操作 */
+        handleResetPwd(row) {
+            this.$prompt('请输入"' + row.userName + '"的新密码', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                closeOnClickModal: false,
+                inputPattern: /^.{5,20}$/,
+                inputErrorMessage: '用户密码长度必须介于 5 和 20 之间',
+                inputValidator: (value) => {
+                    // if (/<|>|"|'|\||\\/.test(value)) {
+                    //     return '不能包含非法字符：< > " \' \\\ |'
+                    // }
+                    if (!/^(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,16}$/.test(value)) {
+                        return '密码要求8-16位，包含大小写字母、数字、特殊字符'
+                    }
+                },
+            })
+                .then(({ value }) => {
+                    resetUserPwd(row.userId, value).then((response) => {
+                        this.$modal.msgSuccess('修改成功，新密码是：' + value)
+                    })
+                })
+                .catch(() => {})
+        },
+        /** 分配角色操作 */
+        handleAuthRole: function (row) {
+            const userId = row.userId
+            this.$router.push('/system/user-auth/role/' + userId)
+        },
+        /** 提交按钮 */
+        submitForm: function () {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    if (this.form.userId != undefined) {
+                        updateUser(this.form).then((response) => {
+                            this.$modal.msgSuccess('修改成功')
+                            this.open = false
+                            this.getList()
+                        })
+                    } else {
+                        addUser(this.form).then((response) => {
+                            this.$modal.msgSuccess('新增成功')
+                            this.open = false
+                            this.getList()
+                        })
+                    }
+                }
+            })
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const userIds = row.userId || this.ids
+            this.$modal
+                .confirm('是否确认删除用户编号为"' + userIds + '"的数据项？')
+                .then(function () {
+                    return delUser(userIds)
+                })
+                .then(() => {
+                    this.getList()
+                    this.$modal.msgSuccess('删除成功')
+                })
+                .catch(() => {})
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download(
+                'system/user/export',
+                {
+                    ...this.queryParams,
+                },
+                `user_${new Date().getTime()}.xlsx`,
+            )
+        },
+        /** 导入按钮操作 */
+        handleImport() {
+            this.upload.title = '用户导入'
+            this.upload.open = true
+        },
+        /** 下载模板操作 */
+        importTemplate() {
+            this.download('system/user/importTemplate', {}, `user_template_${new Date().getTime()}.xlsx`)
+        },
+        // 文件上传中处理
+        handleFileUploadProgress(event, file, fileList) {
+            this.upload.isUploading = true
+        },
+        // 文件上传成功处理
+        handleFileSuccess(response, file, fileList) {
+            this.upload.open = false
+            this.upload.isUploading = false
+            this.$refs.upload.clearFiles()
+            this.$alert(
+                "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+                    response.msg +
+                    '</div>',
+                '导入结果',
+                { dangerouslyUseHTMLString: true },
+            )
+            this.getList()
+        },
+        // 提交上传文件
+        submitFileForm() {
+            this.$refs.upload.submit()
+        },
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const userIds = row.userId || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
-        return delUser(userIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/user/export', {
-        ...this.queryParams
-      }, `user_${new Date().getTime()}.xlsx`)
-    },
-    /** 导入按钮操作 */
-    handleImport() {
-      this.upload.title = "用户导入";
-      this.upload.open = true;
-    },
-    /** 下载模板操作 */
-    importTemplate() {
-      this.download('system/user/importTemplate', {
-      }, `user_template_${new Date().getTime()}.xlsx`)
-    },
-    // 文件上传中处理
-    handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true;
-    },
-    // 文件上传成功处理
-    handleFileSuccess(response, file, fileList) {
-      this.upload.open = false;
-      this.upload.isUploading = false;
-      this.$refs.upload.clearFiles();
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
-      this.getList();
-    },
-    // 提交上传文件
-    submitFileForm() {
-      this.$refs.upload.submit();
-    }
-  }
-};
-</script>
\ No newline at end of file
+}
+</script>
diff --git a/src/views/system/user/profile/resetPwd.vue b/src/views/system/user/profile/resetPwd.vue
index f329e6e..631a690 100644
--- a/src/views/system/user/profile/resetPwd.vue
+++ b/src/views/system/user/profile/resetPwd.vue
@@ -1,69 +1,72 @@
 <template>
-  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
-    <el-form-item label="旧密码" prop="oldPassword">
-      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password/>
-    </el-form-item>
-    <el-form-item label="新密码" prop="newPassword">
-      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password/>
-    </el-form-item>
-    <el-form-item label="确认密码" prop="confirmPassword">
-      <el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password/>
-    </el-form-item>
-    <el-form-item>
-      <el-button type="primary" size="mini" @click="submit">保存</el-button>
-      <el-button type="danger" size="mini" @click="close">关闭</el-button>
-    </el-form-item>
-  </el-form>
+    <el-form ref="form" :model="user" :rules="rules" label-width="80px">
+        <el-form-item label="旧密码" prop="oldPassword">
+            <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password />
+        </el-form-item>
+        <el-form-item label="新密码" prop="newPassword">
+            <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password />
+        </el-form-item>
+        <el-form-item label="确认密码" prop="confirmPassword">
+            <el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password />
+        </el-form-item>
+        <el-form-item>
+            <el-button type="primary" size="mini" @click="submit">保存</el-button>
+            <el-button type="danger" size="mini" @click="close">关闭</el-button>
+        </el-form-item>
+    </el-form>
 </template>
 
 <script>
-import { updateUserPwd } from "@/api/system/user";
+import { updateUserPwd } from '@/api/system/user'
 
 export default {
-  data() {
-    const equalToPassword = (rule, value, callback) => {
-      if (this.user.newPassword !== value) {
-        callback(new Error("两次输入的密码不一致"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      user: {
-        oldPassword: undefined,
-        newPassword: undefined,
-        confirmPassword: undefined
-      },
-      // 表单校验
-      rules: {
-        oldPassword: [
-          { required: true, message: "旧密码不能为空", trigger: "blur" }
-        ],
-        newPassword: [
-          { required: true, message: "新密码不能为空", trigger: "blur" },
-          { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" },
-          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
-        ],
-        confirmPassword: [
-          { required: true, message: "确认密码不能为空", trigger: "blur" },
-          { required: true, validator: equalToPassword, trigger: "blur" }
-        ]
-      }
-    };
-  },
-  methods: {
-    submit() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
-            this.$modal.msgSuccess("修改成功");
-          });
+    data() {
+        const equalToPassword = (rule, value, callback) => {
+            if (this.user.newPassword !== value) {
+                callback(new Error('两次输入的密码不一致'))
+            } else {
+                callback()
+            }
+        }
+        return {
+            user: {
+                oldPassword: undefined,
+                newPassword: undefined,
+                confirmPassword: undefined,
+            },
+            // 表单校验
+            rules: {
+                oldPassword: [{ required: true, message: '旧密码不能为空', trigger: 'blur' }],
+                newPassword: [
+                    { required: true, message: '新密码不能为空', trigger: 'blur' },
+                    // { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" },
+                    // { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" },
+                    {
+                        pattern: /^(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,16}$/,
+                        message: '密码要求8-16位，包含大小写字母、数字、特殊字符',
+                        trigger: 'blur',
+                    },
+                ],
+                confirmPassword: [
+                    { required: true, message: '确认密码不能为空', trigger: 'blur' },
+                    { required: true, validator: equalToPassword, trigger: 'blur' },
+                ],
+            },
         }
-      });
     },
-    close() {
-      this.$tab.closePage();
-    }
-  }
-};
+    methods: {
+        submit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    updateUserPwd(this.user.oldPassword, this.user.newPassword).then((response) => {
+                        this.$modal.msgSuccess('修改成功')
+                    })
+                }
+            })
+        },
+        close() {
+            this.$tab.closePage()
+        },
+    },
+}
 </script>