负责人选择

src/api/flowable/process.js

@@ -1,141 +1,144 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 查询流程列表
 export function listProcess(query) {
   return request({
-    url: '/workflow/process/list',
+    url: "/workflow/process/list",
-    method: 'get',
+    method: "get",
-    params: query
+    params: query,
-  })
+  });
 }
 
 // 查询流程列表
 export function getProcessForm(query) {
   return request({
-    url: '/workflow/process/getProcessForm',
+    url: "/workflow/process/getProcessForm",
-    method: 'get',
+    method: "get",
-    params: query
+    params: query,
-  })
+  });
 }
 
 // 部署流程实例
 export function startProcess(processDefId, data) {
   return request({
-    url: '/workflow/process/start/' + processDefId,
+    url: `/workflow/process/start`,
-    method: 'post',
+    method: "post",
-    data: data
+    params: {
-  })
+      processDefId,
+    },
+    data,
+  });
 }
 
 // 获取流程图
 export function getBpmnXml(processDefId) {
   return request({
-    url: '/workflow/process/bpmnXml/' + processDefId,
+    url: "/workflow/process/bpmnXml/" + processDefId,
-    method: 'get'
+    method: "get",
-  })
+  });
 }
 
 export function detailProcess(query) {
   return request({
-    url: '/workflow/process/detail',
+    url: "/workflow/process/detail",
-    method: 'get',
+    method: "get",
-    params: query
+    params: query,
-  })
+  });
 }
 
 // 我的发起的流程
 export function listOwnProcess(query) {
   return request({
-    url: '/workflow/process/ownList',
+    url: "/workflow/process/ownList",
-    method: 'get',
+    method: "get",
-    params: query
+    params: query,
-  })
+  });
 }
 
 // 我待办的流程
 export function listTodoProcess(query) {
   return request({
-    url: '/workflow/process/todoList',
+    url: "/workflow/process/todoList",
-    method: 'get',
+    method: "get",
-    params: query
+    params: query,
-  })
+  });
 }
 
 // 我待签的流程
 export function listClaimProcess(query) {
   return request({
-    url: '/workflow/process/claimList',
+    url: "/workflow/process/claimList",
-    method: 'get',
+    method: "get",
-    params: query
+    params: query,
-  })
+  });
 }
 
 // 我已办的流程
 export function listFinishedProcess(query) {
   return request({
-    url: '/workflow/process/finishedList',
+    url: "/workflow/process/finishedList",
-    method: 'get',
+    method: "get",
-    params: query
+    params: query,
-  })
+  });
 }
 
 // 查询流程抄送列表
 export function listCopyProcess(query) {
   return request({
-    url: '/workflow/process/copyList',
+    url: "/workflow/process/copyList",
-    method: 'get',
+    method: "get",
-    params: query
+    params: query,
-  })
+  });
 }
 
 // 完成任务
 export function complete(data) {
   return request({
-    url: '/workflow/task/complete',
+    url: "/workflow/task/complete",
-    method: 'post',
+    method: "post",
-    data: data
+    data: data,
-  })
+  });
 }
 
 // 取消申请
 export function stopProcess(data) {
   return request({
-    url: '/workflow/task/stopProcess',
+    url: "/workflow/task/stopProcess",
-    method: 'post',
+    method: "post",
-    data: data
+    data: data,
-  })
+  });
 }
 
 // 驳回任务
 export function rejectTask(data) {
   return request({
-    url: '/workflow/task/reject',
+    url: "/workflow/task/reject",
-    method: 'post',
+    method: "post",
-    data: data
+    data: data,
-  })
+  });
 }
 
 // 可退回任务列表
 export function returnList(data) {
   return request({
-    url: '/workflow/task/returnList',
+    url: "/workflow/task/returnList",
-    method: 'post',
+    method: "post",
-    data: data
+    data: data,
-  })
+  });
 }
 
 // 部署流程实例
 export function deployStart(deployId) {
   return request({
-    url: '/workflow/process/startFlow/' + deployId,
+    url: "/workflow/process/startFlow/" + deployId,
-    method: 'get',
+    method: "get",
-  })
+  });
 }
 
 // 删除流程实例
 export function delProcess(id) {
   return request({
-    url: '/workflow/instance/delete/?instanceId=' + id,
+    url: "/workflow/instance/delete/?instanceId=" + id,
-    method: 'delete'
+    method: "delete",
-  })
+  });
 }

src/plugins/package/penal/base/ElementBaseInfo.vue

@@ -1,15 +1,22 @@
 <template>
   <div class="panel-tab__content">
-    <el-form size="small" label-width="90px" @submit.native.prevent>
+    <el-form
-      <el-form-item label="ID">
+      size="small"
+      label-width="90px"
+      :model="elementBaseInfo"
+      ref="formRef"
+      :rules="rules"
+      @submit.native.prevent
+    >
+      <!-- <el-form-item label="ID">
         <el-input
           v-model="elementBaseInfo.id"
           :disabled="idEditDisabled || elementBaseInfo.$type === 'bpmn:Process'"
           clearable
           @change="updateBaseInfo('id')"
         />
-      </el-form-item>
+      </el-form-item> -->
-      <el-form-item label="名称">
+      <el-form-item label="节点名称" prop="name">
         <el-input
           v-model="elementBaseInfo.name"
           clearable
@@ -39,8 +46,9 @@
 </template>
 
 <script setup name="ElementBaseInfo">
-import { nextTick, onBeforeUnmount, toRefs } from "vue";
+import { nextTick, onBeforeUnmount, toRefs, ref } from "vue";
 let bpmnElement;
+const formRef = ref();
 const props = defineProps({
   businessObject: Object,
   type: String,
@@ -52,9 +60,12 @@ const props = defineProps({
 const { businessObject, type, idEditDisabled } = toRefs(props);
 const data = reactive({
   elementBaseInfo: {},
-  bpmnElement: undefined,
+  rules: {
+    name: [{ required: true, trigger: "blur", message: "节点名称必填" }],
+  },
 });
-const { elementBaseInfo } = toRefs(data);
+const { elementBaseInfo, rules } = toRefs(data);
+
 watch(
   businessObject,
   (val) => {
@@ -72,6 +83,11 @@ function resetBaseInfo() {
   elementBaseInfo.value = JSON.parse(
     JSON.stringify(bpmnElement.businessObject)
   );
+  if (type.value === "StartEvent") {
+    elementBaseInfo.value.name = "开始";
+  } else if (type.value === "EndEvent") {
+    elementBaseInfo.value.name = "结束";
+  }
 }
 function updateBaseInfo(key) {
   const attrObj = Object.create(null);

src/views/system/dept/index.vue

@@ -1,6 +1,11 @@
 <template>
   <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+    <el-form
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      v-show="showSearch"
+    >
       <el-form-item label="部门名称" prop="deptName">
         <el-input
           v-model="queryParams.deptName"
@@ -11,7 +16,12 @@
         />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-            <el-select v-model="queryParams.status" placeholder="部门状态" clearable style="width: 200px">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="部门状态"
+          clearable
+          style="width: 200px"
+        >
           <el-option
             v-for="dict in sys_normal_disable"
             :key="dict.value"
@@ -21,7 +31,9 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="Search" @click="handleQuery"
+          >搜索</el-button
+        >
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -34,17 +46,18 @@
           icon="Plus"
           @click="handleAdd"
           v-hasPermi="['system:dept:add']"
-            >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
-            <el-button
+        <el-button type="info" plain icon="Sort" @click="toggleExpandAll"
-               type="info"
+          >展开/折叠</el-button
-               plain
+        >
-               icon="Sort"
-               @click="toggleExpandAll"
-            >展开/折叠</el-button>
       </el-col>
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        v-model:showSearch="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
     <el-table
@@ -55,23 +68,66 @@
       :default-expand-all="isExpandAll"
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
     >
-         <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
+      <el-table-column
-         <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
+        prop="deptName"
+        label="部门名称"
+        width="260"
+      ></el-table-column>
+      <el-table-column
+        prop="orderNum"
+        label="排序"
+        width="200"
+      ></el-table-column>
       <el-table-column prop="status" label="状态" width="100">
         <template #default="scope">
           <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
         </template>
       </el-table-column>
-         <el-table-column label="创建时间" align="center" prop="createTime" width="200">
+      <el-table-column prop="leaderName" label="负责人" width="100">
+        <template #default="{ row }">
+          <el-tag type="success">{{ row.leaderName }}</el-tag>
+        </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" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template #default="scope">
-               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dept:edit']">修改</el-button>
+          <el-button
-               <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['system:dept:add']">新增</el-button>
+            link
-               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
+            type="primary"
+            icon="Edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:dept:edit']"
+            >修改</el-button
+          >
+          <el-button
+            link
+            type="primary"
+            icon="Plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['system:dept:add']"
+            >新增</el-button
+          >
+          <el-button
+            link
+            type="primary"
+            icon="Delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:dept:remove']"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -85,7 +141,11 @@
               <el-tree-select
                 v-model="form.parentId"
                 :data="deptOptions"
-                        :props="{ value: 'deptId', label: 'deptName', children: 'children' }"
+                :props="{
+                  value: 'deptId',
+                  label: 'deptName',
+                  children: 'children',
+                }"
                 value-key="deptId"
                 placeholder="选择上级部门"
                 check-strictly
@@ -100,24 +160,50 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="显示排序" prop="orderNum">
-                     <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+              <el-input-number
+                v-model="form.orderNum"
+                controls-position="right"
+                :min="0"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-                  <el-form-item label="负责人" prop="leader">
+            <el-form-item label="负责人" prop="leaderId">
-                     <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
+              <el-tag
+                v-if="form.leaderId"
+                closable
+                @close="form.leaderId = undefined"
+                >{{ form.leaderName }}</el-tag
+              >
+              <el-button
+                v-else
+                type="primary"
+                size="small"
+                icon="pointer"
+                @click="userOpen = true"
+                >选择负责人</el-button
+              >
+              <!-- <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" /> -->
             </el-form-item>
           </el-col>
-               <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="联系电话" prop="phone">
-                     <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
+              <el-input
+                v-model="form.phone"
+                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-col> -->
           <el-col :span="12">
             <el-form-item label="部门状态">
               <el-radio-group v-model="form.status">
@@ -125,7 +211,8 @@
                   v-for="dict in sys_normal_disable"
                   :key="dict.value"
                   :label="dict.value"
-                        >{{ dict.label }}</el-radio>
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -138,15 +225,86 @@
         </div>
       </template>
     </el-dialog>
+    <!-- 候选用户弹窗 -->
+    <el-dialog title="选择负责人" v-model="userOpen" width="60%" append-to-body>
+      <el-row type="flex" :gutter="20">
+        <!--部门数据-->
+        <el-col :span="7">
+          <el-card shadow="never" style="height: 100%">
+            <div slot="header">
+              <span>部门列表</span>
+            </div>
+            <div class="head-container">
+              <!-- TODO: -->
+              <el-input
+                v-model="selectDeptOpts.deptName"
+                placeholder="请输入部门名称"
+                clearable
+                size="small"
+                prefix-icon="search"
+                style="margin-bottom: 20px"
+              />
+              <el-tree
+                :data="selectDeptOpts.deptOptions"
+                :props="selectDeptOpts.deptProps"
+                :expand-on-click-node="false"
+                ref="tree"
+                default-expand-all
+                :filter-node-method="filterNode"
+                @node-click="handleNodeClick"
+              />
+            </div>
+          </el-card>
+        </el-col>
+        <!-- TODO: -->
+        <el-col :span="17">
+          <el-table
+            ref="multipleTable"
+            height="600"
+            :data="selectDeptOpts.userTableList"
+            highlight-current-row
+            @row-click="handleCurrentChange"
+            border
+          >
+            <!-- @selection-change="handleSelectionChange" -->
+            <!-- <el-table-column type="selection" width="50" align="center" /> -->
+            <el-table-column label="用户名" align="center" prop="nickName" />
+            <el-table-column label="部门" align="center" prop="dept.deptName" />
+          </el-table>
+          <pagination
+            :total="selectDeptOpts.userTotal"
+            v-model:page="selectDeptOpts.queryParams.pageNum"
+            v-model:limit="selectDeptOpts.queryParams.pageSize"
+            @pagination="getUserList"
+          />
+        </el-col>
+      </el-row>
+      <!-- TODO: -->
+      <!-- <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handleTaskUserComplete"
+          >确 定</el-button
+        >
+        <el-button @click="userOpen = false">取 消</el-button>
+      </div> -->
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="Dept">
-import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept";
+import {
+  listDept,
+  getDept,
+  delDept,
+  addDept,
+  updateDept,
+  listDeptExcludeChild,
+} from "@/api/system/dept";
+import { listUser, deptTreeSelect } from "@/api/system/user";
+import { addDateRange } from "@/utils/ruoyi";
 
 const { proxy } = getCurrentInstance();
 const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
-
+const userOpen = ref(false); // 负责人选择窗口
 const deptList = ref([]);
 const open = ref(false);
 const loading = ref(true);
@@ -158,28 +316,149 @@ const refreshTable = ref(true);
 
 const data = reactive({
   form: {},
+  selectDeptOpts: {
+    queryParams: {
+      deptId: undefined,
+    },
+    deptName: "",
+    deptTreeData: [],
+    deptOptions: [],
+    deptTempOptions: [],
+    userTableList: [],
+    userTotal: 0,
+    deptProps: {
+      children: "children",
+      label: "label",
+    },
+  },
   queryParams: {
     deptName: undefined,
-    status: undefined
+    status: undefined,
   },
   rules: {
-    deptName: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
+    deptName: [
-    orderNum: [{ required: true, message: "显示排序不能为空", trigger: "blur" }],
+      { required: true, message: "部门名称不能为空", trigger: "blur" },
-    email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
+    ],
-    phone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
+    orderNum: [
+      { required: true, message: "显示排序不能为空", trigger: "blur" },
+    ],
+    leaderId: [
+      { required: true, message: "部门负责人不能为空", trigger: "change" },
+    ],
+    email: [
+      {
+        type: "email",
+        message: "请输入正确的邮箱地址",
+        trigger: ["blur", "change"],
+      },
+    ],
+    phone: [
+      {
+        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        message: "请输入正确的手机号码",
+        trigger: "blur",
+      },
+    ],
   },
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const { queryParams, form, rules, selectDeptOpts } = toRefs(data);
 
 /** 查询部门列表 */
 function getList() {
   loading.value = true;
-  listDept(queryParams.value).then(response => {
+  listDept(queryParams.value).then((response) => {
     deptList.value = proxy.handleTree(response.data, "deptId");
     loading.value = false;
   });
 }
+
+/**
+ * 查询部门下拉树结构（含部门前缀）
+ */
+function getDeptTreeData() {
+  function refactorTree(data) {
+    return data.map((node) => {
+      let treeData = {
+        id: `DEPT${node.id}`,
+        label: node.label,
+        parentId: node.parentId,
+        weight: node.weight,
+      };
+      if (node.children && node.children.length > 0) {
+        treeData.children = refactorTree(node.children);
+      }
+      return treeData;
+    });
+  }
+  return new Promise((resolve, reject) => {
+    if (
+      !selectDeptOpts.value.deptTreeData ||
+      selectDeptOpts.value.deptTreeData.length <= 0
+    ) {
+      getDeptOptions()
+        .then(() => {
+          selectDeptOpts.value.deptTreeData = refactorTree(
+            selectDeptOpts.value.deptOptions
+          );
+          resolve();
+        })
+        .catch(() => {
+          reject();
+        });
+    } else {
+      resolve();
+    }
+  });
+}
+
+/**
+ * 查询部门下拉树结构
+ */
+function getDeptOptions() {
+  return new Promise((resolve, reject) => {
+    if (
+      !selectDeptOpts.value.deptOptions ||
+      selectDeptOpts.value.deptOptions.length <= 0
+    ) {
+      deptTreeSelect().then((response) => {
+        selectDeptOpts.value.deptTempOptions = response.data;
+        selectDeptOpts.value.deptOptions = response.data;
+        resolve();
+      });
+    } else {
+      reject();
+    }
+  });
+}
+// 筛选节点
+function filterNode(value, data) {
+  if (!value) return true;
+  return data.label.indexOf(value) !== -1;
+}
+
+// 节点单击事件
+function handleNodeClick(data) {
+  selectDeptOpts.value.queryParams.deptId = data.id;
+  getUserList();
+}
+let dateRange;
+/** 查询用户列表 */
+function getUserList() {
+  listUser(addDateRange(selectDeptOpts.value.queryParams, dateRange)).then(
+    (response) => {
+      selectDeptOpts.value.userTableList = response.rows;
+      selectDeptOpts.value.userTotal = response.total;
+    }
+  );
+}
+function handleCurrentChange(currentRow) {
+  form.value.leaderId = currentRow.userId;
+  form.value.leaderName = currentRow.nickName;
+  userOpen.value = false;
+}
+// function getLeaderName(leaderId) {}
+getDeptTreeData();
 /** 取消按钮 */
 function cancel() {
   open.value = false;
@@ -195,7 +474,7 @@ function reset() {
     leader: undefined,
     phone: undefined,
     email: undefined,
-    status: "0"
+    status: "0",
   };
   proxy.resetForm("deptRef");
 }
@@ -211,7 +490,7 @@ function resetQuery() {
 /** 新增按钮操作 */
 function handleAdd(row) {
   reset();
-  listDept().then(response => {
+  listDept().then((response) => {
     deptOptions.value = proxy.handleTree(response.data, "deptId");
   });
   if (row != undefined) {
@@ -231,10 +510,10 @@ function toggleExpandAll() {
 /** 修改按钮操作 */
 function handleUpdate(row) {
   reset();
-  listDeptExcludeChild(row.deptId).then(response => {
+  listDeptExcludeChild(row.deptId).then((response) => {
     deptOptions.value = proxy.handleTree(response.data, "deptId");
   });
-  getDept(row.deptId).then(response => {
+  getDept(row.deptId).then((response) => {
     form.value = response.data;
     open.value = true;
     title.value = "修改部门";
@@ -242,16 +521,16 @@ function handleUpdate(row) {
 }
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs["deptRef"].validate(valid => {
+  proxy.$refs["deptRef"].validate((valid) => {
     if (valid) {
       if (form.value.deptId != undefined) {
-        updateDept(form.value).then(response => {
+        updateDept(form.value).then((response) => {
           proxy.$modal.msgSuccess("修改成功");
           open.value = false;
           getList();
         });
       } else {
-        addDept(form.value).then(response => {
+        addDept(form.value).then((response) => {
           proxy.$modal.msgSuccess("新增成功");
           open.value = false;
           getList();
@@ -262,12 +541,16 @@ function submitForm() {
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  proxy.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function() {
+  proxy.$modal
+    .confirm('是否确认删除名称为"' + row.deptName + '"的数据项?')
+    .then(function () {
       return delDept(row.deptId);
-  }).then(() => {
+    })
+    .then(() => {
       getList();
       proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {});
+    })
+    .catch(() => {});
 }
 
 getList();

src/views/system/user/index.vue

@@ -28,7 +28,13 @@
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
-            <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form
+          :model="queryParams"
+          ref="queryRef"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+        >
           <el-form-item label="用户名称" prop="userName">
             <el-input
               v-model="queryParams.userName"
@@ -62,7 +68,7 @@
               />
             </el-select>
           </el-form-item>
-               <el-form-item label="创建时间" style="width: 308px;">
+          <el-form-item label="创建时间" style="width: 308px">
             <el-date-picker
               v-model="dateRange"
               value-format="YYYY-MM-DD"
@@ -73,7 +79,9 @@
             ></el-date-picker>
           </el-form-item>
           <el-form-item>
-                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button type="primary" icon="Search" @click="handleQuery"
+              >搜索</el-button
+            >
             <el-button icon="Refresh" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
@@ -86,7 +94,8 @@
               icon="Plus"
               @click="handleAdd"
               v-hasPermi="['system:user:add']"
-                  >新增</el-button>
+              >新增</el-button
+            >
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -96,7 +105,8 @@
               :disabled="single"
               @click="handleUpdate"
               v-hasPermi="['system:user:edit']"
-                  >修改</el-button>
+              >修改</el-button
+            >
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -106,7 +116,8 @@
               :disabled="multiple"
               @click="handleDelete"
               v-hasPermi="['system:user:remove']"
-                  >删除</el-button>
+              >删除</el-button
+            >
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -115,7 +126,8 @@
               icon="Upload"
               @click="handleImport"
               v-hasPermi="['system:user:import']"
-                  >导入</el-button>
+              >导入</el-button
+            >
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -124,19 +136,67 @@
               icon="Download"
               @click="handleExport"
               v-hasPermi="['system:user:export']"
-                  >导出</el-button>
+              >导出</el-button
+            >
           </el-col>
-               <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+          <right-toolbar
+            v-model:showSearch="showSearch"
+            @queryTable="getList"
+            :columns="columns"
+          ></right-toolbar>
         </el-row>
 
-            <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+        <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
-               <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+            label="用户编号"
-               <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+            align="center"
-               <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+            key="userId"
-               <el-table-column label="手机号码" align="center" key="phone" prop="phone" v-if="columns[4].visible" width="120" />
+            prop="userId"
-               <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+            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="phone"
+            prop="phone"
+            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"
@@ -146,24 +206,75 @@
               ></el-switch>
             </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="150" class-name="small-padding fixed-width">
+          <el-table-column
+            label="操作"
+            align="center"
+            width="150"
+            class-name="small-padding fixed-width"
+          >
             <template #default="scope">
-                     <el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
+              <el-tooltip
-                        <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
+                content="修改"
+                placement="top"
+                v-if="scope.row.userId !== 1"
+              >
+                <el-button
+                  link
+                  type="primary"
+                  icon="Edit"
+                  @click="handleUpdate(scope.row)"
+                  v-hasPermi="['system:user:edit']"
+                ></el-button>
               </el-tooltip>
-                     <el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
+              <el-tooltip
-                        <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']"></el-button>
+                content="删除"
+                placement="top"
+                v-if="scope.row.userId !== 1"
+              >
+                <el-button
+                  link
+                  type="primary"
+                  icon="Delete"
+                  @click="handleDelete(scope.row)"
+                  v-hasPermi="['system:user:remove']"
+                ></el-button>
               </el-tooltip>
-                     <el-tooltip content="重置密码" placement="top" v-if="scope.row.userId !== 1">
+              <el-tooltip
-                         <el-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']"></el-button>
+                content="重置密码"
+                placement="top"
+                v-if="scope.row.userId !== 1"
+              >
+                <el-button
+                  link
+                  type="primary"
+                  icon="Key"
+                  @click="handleResetPwd(scope.row)"
+                  v-hasPermi="['system:user:resetPwd']"
+                ></el-button>
               </el-tooltip>
-                     <el-tooltip content="分配角色" placement="top" v-if="scope.row.userId !== 1">
+              <el-tooltip
-                        <el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
+                content="分配角色"
+                placement="top"
+                v-if="scope.row.userId !== 1"
+              >
+                <el-button
+                  link
+                  type="primary"
+                  icon="CircleCheck"
+                  @click="handleAuthRole(scope.row)"
+                  v-hasPermi="['system:user:edit']"
+                ></el-button>
               </el-tooltip>
             </template>
           </el-table-column>
@@ -184,7 +295,11 @@
         <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">
@@ -204,24 +319,50 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="手机号码" prop="phone">
-                     <el-input v-model="form.phone" placeholder="请输入手机号码" maxlength="11" />
+              <el-input
+                v-model="form.phone"
+                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-form-item
-                     <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
+              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-form-item
-                     <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
+              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>
@@ -245,7 +386,8 @@
                   v-for="dict in sys_normal_disable"
                   :key="dict.value"
                   :label="dict.value"
-                        >{{ dict.label }}</el-radio>
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -281,7 +423,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>
@@ -295,7 +441,12 @@
     </el-dialog>
 
     <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
+    <el-dialog
+      :title="upload.title"
+      v-model="upload.open"
+      width="400px"
+      append-to-body
+    >
       <el-upload
         ref="uploadRef"
         :limit="1"
@@ -313,10 +464,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>
@@ -332,11 +491,23 @@
 
 <script setup name="User">
 import { getToken } from "@/utils/auth";
-import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user";
+import {
+  changeUserStatus,
+  listUser,
+  resetUserPwd,
+  delUser,
+  getUser,
+  updateUser,
+  addUser,
+  deptTreeSelect,
+} from "@/api/system/user";
 
 const router = useRouter();
 const { proxy } = getCurrentInstance();
-const { sys_normal_disable, sys_user_sex } = proxy.useDict("sys_normal_disable", "sys_user_sex");
+const { sys_normal_disable, sys_user_sex } = proxy.useDict(
+  "sys_normal_disable",
+  "sys_user_sex"
+);
 
 const userList = ref([]);
 const open = ref(false);
@@ -366,7 +537,7 @@ const upload = reactive({
   // 设置上传的请求头部
   headers: { Authorization: "Bearer " + getToken() },
   // 上传的地址
-  url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData"
+  url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData",
 });
 // 列显隐信息
 const columns = ref([
@@ -376,7 +547,7 @@ const columns = ref([
   { key: 3, label: `部门`, visible: true },
   { key: 4, label: `手机号码`, visible: true },
   { key: 5, label: `状态`, visible: true },
-  { key: 6, label: `创建时间`, visible: true }
+  { key: 6, label: `创建时间`, visible: true },
 ]);
 
 const data = reactive({
@@ -387,15 +558,48 @@ const data = reactive({
     userName: undefined,
     phone: undefined,
     status: undefined,
-    deptId: undefined
+    deptId: undefined,
   },
   rules: {
-    userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
+    deptId: [
-    nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
+      { required: true, message: "归属部门不能为空", trigger: "change" },
-    password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }],
+    ],
-    email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
+    userName: [
-    phone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
+      { required: true, message: "用户名称不能为空", trigger: "blur" },
-  }
+      {
+        min: 2,
+        max: 20,
+        message: "用户名称长度必须介于 2 和 20 之间",
+        trigger: "blur",
+      },
+    ],
+    nickName: [
+      { required: true, message: "用户昵称不能为空", trigger: "blur" },
+    ],
+    password: [
+      { required: true, message: "用户密码不能为空", trigger: "blur" },
+      {
+        min: 5,
+        max: 20,
+        message: "用户密码长度必须介于 5 和 20 之间",
+        trigger: "blur",
+      },
+    ],
+    email: [
+      {
+        type: "email",
+        message: "请输入正确的邮箱地址",
+        trigger: ["blur", "change"],
+      },
+    ],
+    phone: [
+      {
+        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        message: "请输入正确的手机号码",
+        trigger: "blur",
+      },
+    ],
+  },
 });
 
 const { queryParams, form, rules } = toRefs(data);
@@ -406,34 +610,36 @@ const filterNode = (value, data) => {
   return data.label.indexOf(value) !== -1;
 };
 /** 根据名称筛选部门树 */
-watch(deptName, val => {
+watch(deptName, (val) => {
   proxy.$refs["deptTreeRef"].filter(val);
 });
 /** 查询部门下拉树结构 */
 function getDeptTree() {
-  deptTreeSelect().then(response => {
+  deptTreeSelect().then((response) => {
     deptOptions.value = response.data;
   });
-};
+}
 /** 查询用户列表 */
 function getList() {
   loading.value = true;
-  listUser(proxy.addDateRange(queryParams.value, dateRange.value)).then(res => {
+  listUser(proxy.addDateRange(queryParams.value, dateRange.value)).then(
+    (res) => {
       loading.value = false;
       userList.value = res.rows;
       total.value = res.total;
-  });
+    }
-};
+  );
+}
 /** 节点单击事件 */
 function handleNodeClick(data) {
   queryParams.value.deptId = data.id;
   handleQuery();
-};
+}
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNum = 1;
   getList();
-};
+}
 /** 重置按钮操作 */
 function resetQuery() {
   dateRange.value = [];
@@ -441,34 +647,46 @@ function resetQuery() {
   queryParams.value.deptId = undefined;
   proxy.$refs.tree.setCurrentKey(null);
   handleQuery();
-};
+}
 /** 删除按钮操作 */
 function handleDelete(row) {
   const userIds = row.userId || ids.value;
-  proxy.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function () {
+  proxy.$modal
+    .confirm('是否确认删除用户编号为"' + userIds + '"的数据项？')
+    .then(function () {
       return delUser(userIds);
-  }).then(() => {
+    })
+    .then(() => {
       getList();
       proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {});
+    })
-};
+    .catch(() => {});
+}
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download("system/user/export", {
+  proxy.download(
+    "system/user/export",
+    {
       ...queryParams.value,
-  },`user_${new Date().getTime()}.xlsx`);
+    },
-};
+    `user_${new Date().getTime()}.xlsx`
+  );
+}
 /** 用户状态修改  */
 function handleStatusChange(row) {
   let text = row.status === "0" ? "启用" : "停用";
-  proxy.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?').then(function () {
+  proxy.$modal
+    .confirm('确认要"' + text + '""' + row.userName + '"用户吗?')
+    .then(function () {
       return changeUserStatus(row.userId, row.status);
-  }).then(() => {
+    })
+    .then(() => {
       proxy.$modal.msgSuccess(text + "成功");
-  }).catch(function () {
+    })
+    .catch(function () {
       row.status = row.status === "0" ? "1" : "0";
     });
-};
+}
 /** 更多操作 */
 function handleCommand(command, row) {
   switch (command) {
@@ -481,42 +699,48 @@ function handleCommand(command, row) {
     default:
       break;
   }
-};
+}
 /** 跳转角色分配 */
 function handleAuthRole(row) {
   const userId = row.userId;
   router.push("/system/user-auth/role/" + userId);
-};
+}
 /** 重置密码按钮操作 */
 function handleResetPwd(row) {
-  proxy.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
+  proxy
+    .$prompt('请输入"' + row.userName + '"的新密码', "提示", {
       confirmButtonText: "确定",
       cancelButtonText: "取消",
       closeOnClickModal: false,
       inputPattern: /^.{5,20}$/,
       inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
-  }).then(({ value }) => {
+    })
-    resetUserPwd(row.userId, value).then(response => {
+    .then(({ value }) => {
+      resetUserPwd(row.userId, value).then((response) => {
         proxy.$modal.msgSuccess("修改成功，新密码是：" + value);
       });
-  }).catch(() => {});
+    })
-};
+    .catch(() => {});
+}
 /** 选择条数  */
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.userId);
+  ids.value = selection.map((item) => item.userId);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
-};
+}
 /** 导入按钮操作 */
 function handleImport() {
   upload.title = "用户导入";
   upload.open = true;
-};
+}
 /** 下载模板操作 */
 function importTemplate() {
-  proxy.download("system/user/importTemplate", {
+  proxy.download(
-  }, `user_template_${new Date().getTime()}.xlsx`);
+    "system/user/importTemplate",
-};
+    {},
+    `user_template_${new Date().getTime()}.xlsx`
+  );
+}
 /**文件上传中处理 */
 const handleFileUploadProgress = (event, file, fileList) => {
   upload.isUploading = true;
@@ -526,13 +750,19 @@ const handleFileSuccess = (response, file, fileList) => {
   upload.open = false;
   upload.isUploading = false;
   proxy.$refs["uploadRef"].handleRemove(file);
-  proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+  proxy.$alert(
+    "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+      response.msg +
+      "</div>",
+    "导入结果",
+    { dangerouslyUseHTMLString: true }
+  );
   getList();
 };
 /** 提交上传文件 */
 function submitFileForm() {
   proxy.$refs["uploadRef"].submit();
-};
+}
 /** 重置操作表单 */
 function reset() {
   form.value = {
@@ -547,31 +777,31 @@ function reset() {
     status: "0",
     remark: undefined,
     postIds: [],
-    roleIds: []
+    roleIds: [],
   };
   proxy.resetForm("userRef");
-};
+}
 /** 取消按钮 */
 function cancel() {
   open.value = false;
   reset();
-};
+}
 /** 新增按钮操作 */
 function handleAdd() {
   reset();
-  getUser().then(response => {
+  getUser().then((response) => {
     postOptions.value = response.posts;
     roleOptions.value = response.roles;
     open.value = true;
     title.value = "添加用户";
     form.value.password = initPassword.value;
   });
-};
+}
 /** 修改按钮操作 */
 function handleUpdate(row) {
   reset();
   const userId = row.userId || ids.value;
-  getUser(userId).then(response => {
+  getUser(userId).then((response) => {
     form.value = response.data;
     postOptions.value = response.posts;
     roleOptions.value = response.roles;
@@ -581,19 +811,19 @@ function handleUpdate(row) {
     title.value = "修改用户";
     form.password = "";
   });
-};
+}
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs["userRef"].validate(valid => {
+  proxy.$refs["userRef"].validate((valid) => {
     if (valid) {
       if (form.value.userId != undefined) {
-        updateUser(form.value).then(response => {
+        updateUser(form.value).then((response) => {
           proxy.$modal.msgSuccess("修改成功");
           open.value = false;
           getList();
         });
       } else {
-        addUser(form.value).then(response => {
+        addUser(form.value).then((response) => {
           proxy.$modal.msgSuccess("新增成功");
           open.value = false;
           getList();
@@ -601,7 +831,7 @@ function submitForm() {
       }
     }
   });
-};
+}
 
 getDeptTree();
 getList();