负责人选择

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,152 +1,310 @@
 <template>
-   <div class="app-container">
+  <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+    <el-form
-         <el-form-item label="部门名称" prop="deptName">
+      :model="queryParams"
-            <el-input
+      ref="queryRef"
-               v-model="queryParams.deptName"
+      :inline="true"
-               placeholder="请输入部门名称"
+      v-show="showSearch"
-               clearable
+    >
-               style="width: 200px"
+      <el-form-item label="部门名称" prop="deptName">
-               @keyup.enter="handleQuery"
+        <el-input
-            />
+          v-model="queryParams.deptName"
-         </el-form-item>
+          placeholder="请输入部门名称"
-         <el-form-item label="状态" prop="status">
+          clearable
-            <el-select v-model="queryParams.status" placeholder="部门状态" clearable style="width: 200px">
+          style="width: 200px"
-               <el-option
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="部门状态"
+          clearable
+          style="width: 200px"
+        >
+          <el-option
+            v-for="dict in sys_normal_disable"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="Refresh" @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="Plus"
+          @click="handleAdd"
+          v-hasPermi="['system:dept:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="info" plain icon="Sort" @click="toggleExpandAll"
+          >展开/折叠</el-button
+        >
+      </el-col>
+      <right-toolbar
+        v-model:showSearch="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="deptList"
+      row-key="deptId"
+      :default-expand-all="isExpandAll"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+    >
+      <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 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"
+      >
+        <template #default="scope">
+          <el-button
+            link
+            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>
+
+    <!-- 添加或修改部门对话框 -->
+    <el-dialog :title="title" v-model="open" width="600px" append-to-body>
+      <el-form ref="deptRef" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="24" v-if="form.parentId !== 0">
+            <el-form-item label="上级部门" prop="parentId">
+              <el-tree-select
+                v-model="form.parentId"
+                :data="deptOptions"
+                :props="{
+                  value: 'deptId',
+                  label: 'deptName',
+                  children: 'children',
+                }"
+                value-key="deptId"
+                placeholder="选择上级部门"
+                check-strictly
+                :render-after-expand="false"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="部门名称" prop="deptName">
+              <el-input v-model="form.deptName" placeholder="请输入部门名称" />
+            </el-form-item>
+          </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-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="负责人" prop="leaderId">
+              <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-form-item label="联系电话" prop="phone">
+              <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-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 sys_normal_disable"
                   :key="dict.value"
-                  :label="dict.label"
+                  :label="dict.value"
-                  :value="dict.value"
+                  >{{ dict.label }}</el-radio
-               />
+                >
-            </el-select>
+              </el-radio-group>
-         </el-form-item>
+            </el-form-item>
-         <el-form-item>
+          </el-col>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        </el-row>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-         </el-form-item>
       </el-form>
-
+      <template #footer>
-      <el-row :gutter="10" class="mb8">
+        <div class="dialog-footer">
-         <el-col :span="1.5">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
-            <el-button
+          <el-button @click="cancel">取 消</el-button>
-               type="primary"
+        </div>
-               plain
+      </template>
-               icon="Plus"
+    </el-dialog>
-               @click="handleAdd"
+    <!-- 候选用户弹窗 -->
-               v-hasPermi="['system:dept:add']"
+    <el-dialog title="选择负责人" v-model="userOpen" width="60%" append-to-body>
-            >新增</el-button>
+      <el-row type="flex" :gutter="20">
-         </el-col>
+        <!--部门数据-->
-         <el-col :span="1.5">
+        <el-col :span="7">
-            <el-button
+          <el-card shadow="never" style="height: 100%">
-               type="info"
+            <div slot="header">
-               plain
+              <span>部门列表</span>
-               icon="Sort"
-               @click="toggleExpandAll"
-            >展开/折叠</el-button>
-         </el-col>
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-
-      <el-table
-         v-if="refreshTable"
-         v-loading="loading"
-         :data="deptList"
-         row-key="deptId"
-         :default-expand-all="isExpandAll"
-         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-      >
-         <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">
-            <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">
-            <template #default="scope">
-               <el-button link 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>
-
-      <!-- 添加或修改部门对话框 -->
-      <el-dialog :title="title" v-model="open" width="600px" append-to-body>
-         <el-form ref="deptRef" :model="form" :rules="rules" label-width="80px">
-            <el-row>
-               <el-col :span="24" v-if="form.parentId !== 0">
-                  <el-form-item label="上级部门" prop="parentId">
-                     <el-tree-select
-                        v-model="form.parentId"
-                        :data="deptOptions"
-                        :props="{ value: 'deptId', label: 'deptName', children: 'children' }"
-                        value-key="deptId"
-                        placeholder="选择上级部门"
-                        check-strictly
-                        :render-after-expand="false"
-                     />
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12">
-                  <el-form-item label="部门名称" prop="deptName">
-                     <el-input v-model="form.deptName" placeholder="请输入部门名称" />
-                  </el-form-item>
-               </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-form-item>
-               </el-col>
-               <el-col :span="12">
-                  <el-form-item label="负责人" prop="leader">
-                     <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12">
-                  <el-form-item label="联系电话" prop="phone">
-                     <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-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 sys_normal_disable"
-                           :key="dict.value"
-                           :label="dict.value"
-                        >{{ dict.label }}</el-radio>
-                     </el-radio-group>
-                  </el-form-item>
-               </el-col>
-            </el-row>
-         </el-form>
-         <template #footer>
-            <div class="dialog-footer">
-               <el-button type="primary" @click="submitForm">确 定</el-button>
-               <el-button @click="cancel">取 消</el-button>
             </div>
-         </template>
+            <div class="head-container">
-      </el-dialog>
+              <!-- TODO: -->
-   </div>
+              <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
-    return delDept(row.deptId);
+    .confirm('是否确认删除名称为"' + row.deptName + '"的数据项?')
-  }).then(() => {
+    .then(function () {
-    getList();
+      return delDept(row.deptId);
-    proxy.$modal.msgSuccess("删除成功");
+    })
-  }).catch(() => {});
+    .then(() => {
+      getList();
+      proxy.$modal.msgSuccess("删除成功");
+    })
+    .catch(() => {});
 }
 
 getList();