提交

src/api/system/menuInIt.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 根据角色ID查询菜单下拉树结构
+export function roleMenuTreeselect(roleId) {
+  return request({
+    url: '/system/menuInit/roleMenuTreeselect/' + roleId,
+    method: 'get'
+  })
+}

src/views/dialog/DialogEmployeeChoice.vue

@@ -110,8 +110,8 @@ const { width, multiple } = toRefs(props);
 const data = reactive({
   visible: false,
   query: {
-    pn: 1,
-    size: 15,
+    pageNum: 1,
+    pageSize: 20,
     total: 0,
   },
   list: [],
@@ -161,7 +161,7 @@ const handleSelectionChange = (choiceSelections) => {
 const resetQuery = () => {
   query.value = {
     pn: 1,
-    size: 15,
+    pageSize: 20,
     total: 0,
   };
   getList();

src/views/system/inItRole/index.vue

@@ -1,14 +1,34 @@
 <template>
   <div class="page-container list-sontainer">
     <div :gutter="10" class="list-btns-container">
-      <el-button type="primary" size="small" icon="Plus" @click="handleAdd"
-        v-hasPermi="['system:role:add']">新增</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        icon="Plus"
+        @click="handleAdd"
+        v-hasPermi="['system:role:add']"
+        >新增</el-button
+      >
 
-      <el-button type="success" size="small" icon="Edit" :disabled="single" @click="handleUpdate"
-        v-hasPermi="['system:role:edit']">修改</el-button>
+      <el-button
+        type="success"
+        size="small"
+        icon="Edit"
+        :disabled="single"
+        @click="handleUpdate"
+        v-hasPermi="['system:role:edit']"
+        >修改</el-button
+      >
 
-      <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
-        v-hasPermi="['system:role:remove']">删除</el-button>
+      <el-button
+        type="danger"
+        size="small"
+        icon="Delete"
+        :disabled="multiple"
+        @click="handleDelete"
+        v-hasPermi="['system:role:remove']"
+        >删除</el-button
+      >
 
       <!-- <el-button type="warning" size="small" icon="Download" @click="handleExport"
         v-hasPermi="['system:role:export']">导出</el-button> -->
@@ -16,11 +36,22 @@
       <!-- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> -->
     </div>
 
-    <el-form class="list-search-container" :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true"
-      label-width="68px">
+    <el-form
+      class="list-search-container"
+      :model="queryParams"
+      ref="queryRef"
+      v-show="showSearch"
+      :inline="true"
+      label-width="68px"
+    >
       <el-form-item label="角色名称：" prop="roleName" style="width: 220px">
-        <el-input size="small" v-model="queryParams.roleName" placeholder="请输入角色名称" clearable
-          @keyup.enter="handleQuery" />
+        <el-input
+          size="small"
+          v-model="queryParams.roleName"
+          placeholder="请输入角色名称"
+          clearable
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
       <!-- <el-form-item label="权限字符：" prop="roleKey" style="width: 220px">
         <el-input size="small" v-model="queryParams.roleKey" placeholder="请输入权限字符" clearable @keyup.enter="handleQuery" />
@@ -35,34 +66,54 @@
           start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item> -->
       <el-form-item>
-        <el-button size="small" type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button size="small" icon="Refresh" @click="resetQuery">重置</el-button>
+        <el-button
+          size="small"
+          type="primary"
+          icon="Search"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button size="small" icon="Refresh" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
     <!-- 表格数据 -->
-    <el-table size="small" v-loading="loading" border :data="roleList" @selection-change="handleSelectionChange">
+    <el-table
+      size="small"
+      v-loading="loading"
+      border
+      :data="roleList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <!--<el-table-column label="角色编号" prop="roleId" width="120" />-->
-      <el-table-column label="角色名称" align="center" prop="roleName" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="权限字符" align="center" prop="roleKey" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="排序" align="center" prop="roleSort" width="100" />
-      <!-- <el-table-column label="状态" align="center" width="100">
-        <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" width="200">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column
+        label="角色名称"
+        align="center"
+        prop="roleName"
+        :show-overflow-tooltip="true"
+        width="150"
+      />
+
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="200"
+      >
         <template #default="scope">
-          <el-button link size="small" type="warning" @click="handleUpdate(scope.row)" v-hasPermi="['system:role:edit']">
-            修改</el-button>
+          <el-button
+            link
+            size="small"
+            type="warning"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:role:edit']"
+          >
+            修改</el-button
+          >
 
           <!-- <el-tooltip content="删除" placement="top" v-if="scope.row.roleId !== 1">
             <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
@@ -80,11 +131,22 @@
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
+    <el-dialog
+      :title="title"
+      v-model="open"
+      width="500px"
+      append-to-body
+      draggable
+    >
       <el-form ref="roleRef" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="form.roleName" placeholder="请输入角色名称" />
@@ -92,7 +154,10 @@
         <el-form-item prop="roleKey">
           <template #label>
             <span>
-              <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
+              <el-tooltip
+                content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)"
+                placement="top"
+              >
                 <el-icon><question-filled /></el-icon>
               </el-tooltip>
               权限字符
@@ -101,7 +166,11 @@
           <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
         </el-form-item>
         <el-form-item label="角色顺序" prop="roleSort">
-          <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
+          <el-input-number
+            v-model="form.roleSort"
+            controls-position="right"
+            :min="0"
+          />
         </el-form-item>
         <!-- <el-form-item label="状态">
           <el-radio-group v-model="form.status">
@@ -109,16 +178,38 @@
           </el-radio-group>
         </el-form-item> -->
         <el-form-item label="菜单权限">
-          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
-          <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
-          <el-checkbox v-model="form.menuCheckStrictly"
-            @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
-          <el-tree class="tree-border" :data="menuOptions" show-checkbox ref="menuRef" node-key="id"
-            :check-strictly="!form.menuCheckStrictly" empty-text="加载中，请稍候"
-            :props="{ label: 'label', children: 'children' }"></el-tree>
+          <el-checkbox
+            v-model="menuExpand"
+            @change="handleCheckedTreeExpand($event, 'menu')"
+            >展开/折叠</el-checkbox
+          >
+          <el-checkbox
+            v-model="menuNodeAll"
+            @change="handleCheckedTreeNodeAll($event, 'menu')"
+            >全选/全不选</el-checkbox
+          >
+          <el-checkbox
+            v-model="form.menuCheckStrictly"
+            @change="handleCheckedTreeConnect($event, 'menu')"
+            >父子联动</el-checkbox
+          >
+          <el-tree
+            class="tree-border"
+            :data="menuOptions"
+            show-checkbox
+            ref="menuRef"
+            node-key="id"
+            :check-strictly="!form.menuCheckStrictly"
+            empty-text="加载中，请稍候"
+            :props="{ label: 'label', children: 'children' }"
+          ></el-tree>
         </el-form-item>
         <el-form-item label="备注">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+          <el-input
+            v-model="form.remark"
+            type="textarea"
+            placeholder="请输入内容"
+          ></el-input>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -130,7 +221,13 @@
     </el-dialog>
 
     <!-- 分配角色数据权限对话框 -->
-    <el-dialog :title="title" v-model="openDataScope" width="500px" append-to-body draggable>
+    <el-dialog
+      :title="title"
+      v-model="openDataScope"
+      width="500px"
+      append-to-body
+      draggable
+    >
       <el-form :model="form" label-width="80px">
         <el-form-item label="角色名称">
           <el-input v-model="form.roleName" :disabled="true" />
@@ -140,18 +237,41 @@
         </el-form-item>
         <el-form-item label="权限范围">
           <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
-            <el-option v-for="item in dataScopeOptions" :key="item.value" :label="item.label"
-              :value="item.value"></el-option>
+            <el-option
+              v-for="item in dataScopeOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="数据权限" v-show="form.dataScope == 2">
-          <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
-          <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
-          <el-checkbox v-model="form.deptCheckStrictly"
-            @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
-          <el-tree class="tree-border" :data="deptOptions" show-checkbox default-expand-all ref="deptRef" node-key="id"
-            :check-strictly="!form.deptCheckStrictly" empty-text="加载中，请稍候"
-            :props="{ label: 'label', children: 'children' }"></el-tree>
+          <el-checkbox
+            v-model="deptExpand"
+            @change="handleCheckedTreeExpand($event, 'dept')"
+            >展开/折叠</el-checkbox
+          >
+          <el-checkbox
+            v-model="deptNodeAll"
+            @change="handleCheckedTreeNodeAll($event, 'dept')"
+            >全选/全不选</el-checkbox
+          >
+          <el-checkbox
+            v-model="form.deptCheckStrictly"
+            @change="handleCheckedTreeConnect($event, 'dept')"
+            >父子联动</el-checkbox
+          >
+          <el-tree
+            class="tree-border"
+            :data="deptOptions"
+            show-checkbox
+            default-expand-all
+            ref="deptRef"
+            node-key="id"
+            :check-strictly="!form.deptCheckStrictly"
+            empty-text="加载中，请稍候"
+            :props="{ label: 'label', children: 'children' }"
+          ></el-tree>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -175,10 +295,8 @@ import {
   updateRole,
   deptTreeSelect,
 } from "@/api/system/inItRole";
-import {
-  roleMenuTreeselect,
-  treeselect as menuTreeselect,
-} from "@/api/system/menu";
+import { treeselect as menuTreeselect } from "@/api/system/menu";
+import { roleMenuTreeselect } from "@/api/system/menuInIt";
 
 const router = useRouter();
 const { proxy } = getCurrentInstance();
@@ -224,9 +342,6 @@ const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 20,
-    roleName: undefined,
-    roleKey: undefined,
-    status: undefined,
   },
   rules: {
     roleName: [
@@ -249,6 +364,7 @@ function getList() {
       roleList.value = response.rows;
       total.value = response.total;
       loading.value = false;
+      console.log(response);
     }
   );
 }
@@ -275,7 +391,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功");
     })
-    .catch(() => { });
+    .catch(() => {});
 }
 /** 导出按钮操作 */
 function handleExport() {
@@ -374,24 +490,24 @@ function handleAdd() {
 /** 修改角色 */
 function handleUpdate(row) {
   reset();
-  const roleId = row.roleId || ids.value;
+  const roleId = row.id || ids.value;
   const roleMenu = getRoleMenuTreeselect(roleId);
-  getRole(roleId).then((response) => {
-    form.value = response.data;
-    form.value.roleSort = Number(form.value.roleSort);
-    open.value = true;
-    nextTick(() => {
-      roleMenu.then((res) => {
-        let checkedKeys = res.checkedKeys;
-        checkedKeys.forEach((v) => {
-          nextTick(() => {
-            menuRef.value.setChecked(v, true, false);
-          });
-        });
-      });
-    });
-    title.value = "修改角色";
-  });
+  // getRole(roleId).then((response) => {
+  //   form.value = response.data;
+  //   form.value.roleSort = Number(form.value.roleSort);
+  //   open.value = true;
+  // nextTick(() => {
+  //   roleMenu.then((res) => {
+  //     let checkedKeys = res.checkedKeys;
+  //     checkedKeys.forEach((v) => {
+  //       nextTick(() => {
+  //         menuRef.value.setChecked(v, true, false);
+  //       });
+  //     });
+  //   });
+  // });
+  //   title.value = "修改角色";
+  // });
 }
 /** 根据角色ID查询菜单树结构 */
 function getRoleMenuTreeselect(roleId) {

src/views/system/user/index.vue

@@ -16,35 +16,80 @@
       <el-col :span="24" :xs="24">
         <!-- 功能按钮区 -->
         <div :gutter="10" class="list-btns-container">
-          <el-button type="primary" size="small" icon="Plus" @click="handleAdd"
-            v-hasPermi="['system:user:add']">新增</el-button>
+          <el-button
+            type="primary"
+            size="small"
+            icon="Plus"
+            @click="handleAdd"
+            v-hasPermi="['system:user:add']"
+            >新增</el-button
+          >
 
           <!-- <el-button type="success" size="small" icon="Edit" :disabled="single" @click="handleUpdate"
             v-hasPermi="['system:user:edit']">修改</el-button> -->
 
-          <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
-            v-hasPermi="['system:user:remove']">删除</el-button>
+          <el-button
+            type="danger"
+            size="small"
+            icon="Delete"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['system:user:remove']"
+            >删除</el-button
+          >
 
-          <el-button type="info" size="small" icon="Upload" @click="handleImport"
-            v-hasPermi="['system:user:import']">导入</el-button>
+          <el-button
+            type="info"
+            size="small"
+            icon="Upload"
+            @click="handleImport"
+            v-hasPermi="['system:user:import']"
+            >导入</el-button
+          >
 
-          <el-button type="info" size="small" icon="Download" @click="handleExport"
-            v-hasPermi="['system:user:export']">导出</el-button>
+          <el-button
+            type="info"
+            size="small"
+            icon="Download"
+            @click="handleExport"
+            v-hasPermi="['system:user:export']"
+            >导出</el-button
+          >
           <!--
           <el-button type="info" size="small" icon="Download" @click="handleExportQc" v-hasPermi="['business:workpiece:export']">导出二维码</el-button>
           -->
           <!-- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> -->
         </div>
         <!-- 搜索区 -->
-        <el-form :model="queryParams" size="small" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px"
-          class="list-search-container" style="padding-bottom: 10px; padding-top: 10px">
+        <el-form
+          :model="queryParams"
+          size="small"
+          ref="queryRef"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+          class="list-search-container"
+          style="padding-bottom: 10px; padding-top: 10px"
+        >
           <el-form-item label="用户名称：" prop="userName">
-            <el-input v-model="queryParams.userName" size="small" placeholder="请输入用户名称" clearable style="width: 130px"
-              @keyup.enter="handleQuery" />
+            <el-input
+              v-model="queryParams.userName"
+              size="small"
+              placeholder="请输入用户名称"
+              clearable
+              style="width: 130px"
+              @keyup.enter="handleQuery"
+            />
           </el-form-item>
           <el-form-item label="手机号码：" prop="phonenumber">
-            <el-input v-model="queryParams.phonenumber" size="small" placeholder="请输入手机号码" clearable style="width: 130px"
-              @keyup.enter="handleQuery" />
+            <el-input
+              v-model="queryParams.phonenumber"
+              size="small"
+              placeholder="请输入手机号码"
+              clearable
+              style="width: 130px"
+              @keyup.enter="handleQuery"
+            />
           </el-form-item>
           <!-- <el-form-item label="状态：" prop="status">
             <el-select v-model="queryParams.status" size="small" placeholder="用户状态" clearable style="width: 130px">
@@ -63,23 +108,61 @@
           -->
           <el-form-item>
             <span>&emsp;&emsp;</span>
-            <el-button type="primary" size="small" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button>
+            <el-button
+              type="primary"
+              size="small"
+              icon="Search"
+              @click="handleQuery"
+              >搜索</el-button
+            >
+            <el-button icon="Refresh" size="small" @click="resetQuery"
+              >重置</el-button
+            >
           </el-form-item>
         </el-form>
         <!-- 渲染数据区 -->
-        <el-table v-loading="loading" size="small" :data="userList" border height="100%"
-          @selection-change="handleSelectionChange">
+        <el-table
+          v-loading="loading"
+          size="small"
+          :data="userList"
+          border
+          height="100%"
+          @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="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 #default="scope">
               <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
@@ -93,21 +176,50 @@
             </template>
           </el-table-column>
           -->
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+          <el-table-column
+            label="创建时间"
+            align="center"
+            prop="createTime"
+            v-if="columns[6].visible"
+            width="160"
+          >
             <template #default="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+          <el-table-column
+            label="操作"
+            align="center"
+            width="200"
+            class-name="small-padding fixed-width"
+          >
             <template #default="scope">
-              <el-button link type="warning" size="small" @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:user:edit']">修改</el-button>
+              <el-button
+                link
+                type="warning"
+                size="small"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:user:edit']"
+                >修改</el-button
+              >
 
-              <el-button link size="small" type="danger" @click="handleDelete(scope.row)"
-                v-hasPermi="['system:user:remove']">删除</el-button>
+              <el-button
+                link
+                size="small"
+                type="danger"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['system:user:remove']"
+                >删除</el-button
+              >
 
-              <el-button link type="success" size="small" @click="handleResetPwd(scope.row)"
-                v-hasPermi="['system:user:resetPwd']">重置密码</el-button>
+              <el-button
+                link
+                type="success"
+                size="small"
+                @click="handleResetPwd(scope.row)"
+                v-hasPermi="['system:user:resetPwd']"
+                >重置密码</el-button
+              >
 
               <!-- <el-tooltip content="分配角色" placement="top" v-if="scope.row.userId !== 1">
                 <el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)"
@@ -118,47 +230,94 @@
         </el-table>
       </el-col>
     </el-row>
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" v-model="open" width="600px" append-to-body draggable>
+    <el-dialog
+      :title="title"
+      v-model="open"
+      width="600px"
+      append-to-body
+      draggable
+    >
       <el-form :model="form" :rules="rules" ref="userRef" 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-input
+                v-model="form.nickName"
+                placeholder="请输入用户昵称"
+                maxlength="30"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
-              <el-tree-select v-model="form.deptId" :data="deptOptions"
-                :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id" placeholder="请选择归属部门"
-                check-strictly :render-after-expand="false" />
+              <el-tree-select
+                v-model="form.deptId"
+                :data="deptOptions"
+                :props="{ value: 'id', label: 'label', children: 'children' }"
+                value-key="id"
+                placeholder="请选择归属部门"
+                check-strictly
+                :render-after-expand="false"
+              />
             </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-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-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
+              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
+              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>
@@ -166,8 +325,12 @@
           <el-col :span="12">
             <el-form-item label="用户性别">
               <el-select v-model="form.sex" placeholder="请选择">
-                <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label"
-                  :value="dict.value"></el-option>
+                <el-option
+                  v-for="dict in sys_user_sex"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -182,8 +345,13 @@
           <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-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>
@@ -201,7 +369,11 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -215,11 +387,26 @@
     </el-dialog>
 
     <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body draggable>
-      <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-        :fileList="fileList" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false"
-        drag>
+    <el-dialog
+      :title="upload.title"
+      v-model="upload.open"
+      width="400px"
+      append-to-body
+      draggable
+    >
+      <el-upload
+        ref="uploadRef"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :fileList="fileList"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
         <el-icon class="el-icon--upload">
           <upload-filled />
         </el-icon>
@@ -227,11 +414,18 @@
         <template #tip>
           <div class="el-upload__tip text-center">
             <div class="el-upload__tip">
-              <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+              <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>
+            <el-link
+              type="primary"
+              :underline="false"
+              style="font-size: 12px; vertical-align: baseline"
+              @click="importTemplate"
+              >下载模板</el-link
+            >
           </div>
         </template>
       </el-upload>
@@ -419,7 +613,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功");
     })
-    .catch(() => { });
+    .catch(() => {});
 }
 /** 导出按钮操作 */
 function handleExport() {
@@ -480,7 +674,7 @@ function handleResetPwd(row) {
         proxy.$modal.msgSuccess("修改成功，新密码是：" + value);
       });
     })
-    .catch(() => { });
+    .catch(() => {});
 }
 /** 选择条数  */
 function handleSelectionChange(selection) {
@@ -512,8 +706,8 @@ const handleFileSuccess = (response, file, fileList) => {
   proxy.$refs["uploadRef"].handleRemove(file);
   proxy.$alert(
     "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-    response.msg +
-    "</div>",
+      response.msg +
+      "</div>",
     "导入结果",
     { dangerouslyUseHTMLString: true }
   );