From 052528d9ef5879ff7856e3902781deb1cd0fa565 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Wed, 18 Jun 2025 10:32:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8C=E5=B7=A5=E4=BF=A1=E6=81=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/kaohe/employee/index.vue | 139 ++++++++------------
 1 file changed, 56 insertions(+), 83 deletions(-)

diff --git a/ruoyi-ui/src/views/kaohe/employee/index.vue b/ruoyi-ui/src/views/kaohe/employee/index.vue
index 3d1c2fb..dd05d1b 100644
--- a/ruoyi-ui/src/views/kaohe/employee/index.vue
+++ b/ruoyi-ui/src/views/kaohe/employee/index.vue
@@ -1,18 +1,10 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="登录用户id" prop="userId">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+      <el-form-item label="登录用户Id" prop="userId">
         <el-input
           v-model="queryParams.userId"
-          placeholder="请输入登录用户id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="职工所属部门" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入职工所属部门"
+          placeholder="请输入登录用户Id"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -57,54 +49,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="银行卡号" prop="bankCardNumber">
-        <el-input
-          v-model="queryParams.bankCardNumber"
-          placeholder="请输入银行卡号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开户行" prop="openingBank">
-        <el-input
-          v-model="queryParams.openingBank"
-          placeholder="请输入开户行"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="学历" prop="education">
-        <el-input
-          v-model="queryParams.education"
-          placeholder="请输入学历"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="家庭住址" prop="address">
-        <el-input
-          v-model="queryParams.address"
-          placeholder="请输入家庭住址"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="紧急联系人" prop="contact">
-        <el-input
-          v-model="queryParams.contact"
-          placeholder="请输入紧急联系人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="紧急联系人电话" prop="contactPhone">
-        <el-input
-          v-model="queryParams.contactPhone"
-          placeholder="请输入紧急联系人电话"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -158,24 +102,28 @@
     </el-row>
 
     <el-table v-loading="loading" :data="employeeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" />
-      <el-table-column label="登录用户id" align="center" prop="userId" />
-      <el-table-column label="职工所属部门" align="center" prop="deptId" />
-      <el-table-column label="部门名称" align="center" prop="deptName" />
-      <el-table-column label="职工姓名" align="center" prop="empName" />
-      <el-table-column label="性别" align="center" prop="sex" />
+      <el-table-column type="selection" width="55" align="center" fixed/>
+      <el-table-column label="主键" align="center" prop="id" fixed/>
+      <el-table-column label="登录用户Id" align="center" prop="userId" :show-overflow-tooltip="true" min-width="120"/>
+      <el-table-column label="所属部门" align="center" prop="deptId" :show-overflow-tooltip="true" min-width="120"/>
+      <el-table-column label="部门名称" align="center" prop="deptName" :show-overflow-tooltip="true" min-width="120"/>
+      <el-table-column label="职工姓名" align="center" prop="empName" :show-overflow-tooltip="true" min-width="120"/>
+      <el-table-column label="性别" align="center" prop="sex" :show-overflow-tooltip="true" min-width="120">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
+        </template>
+      </el-table-column>
       <el-table-column label="年龄" align="center" prop="age" />
       <el-table-column label="手机号" align="center" prop="phone" />
       <el-table-column label="身份证号" align="center" prop="idcard" />
       <el-table-column label="银行卡号" align="center" prop="bankCardNumber" />
       <el-table-column label="开户行" align="center" prop="openingBank" />
       <el-table-column label="学历" align="center" prop="education" />
-      <el-table-column label="家庭住址" align="center" prop="address" />
-      <el-table-column label="紧急联系人" align="center" prop="contact" />
-      <el-table-column label="紧急联系人电话" align="center" prop="contactPhone" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="家庭住址" align="center" prop="address" :show-overflow-tooltip="true" min-width="120"/>
+      <el-table-column label="紧急联系人" align="center" prop="contact" :show-overflow-tooltip="true" min-width="120"/>
+      <el-table-column label="紧急联系人电话" align="center" prop="contactPhone" :show-overflow-tooltip="true" min-width="120"/>
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" min-width="120"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="120px">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -194,7 +142,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -204,16 +152,10 @@
     />
 
     <!-- 添加或修改职工信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="登录用户id" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入登录用户id" />
-        </el-form-item>
-        <el-form-item label="职工所属部门" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入职工所属部门" />
-        </el-form-item>
-        <el-form-item label="部门名称" prop="deptName">
-          <el-input v-model="form.deptName" placeholder="请输入部门名称" />
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+        <el-form-item label="所属部门" prop="deptId">
+          <treeselect v-model="form.deptId" :options="deptOptions" placeholder="请选择所属部门" :show-count="true" @select="changeDept"/>
         </el-form-item>
         <el-form-item label="职工姓名" prop="empName">
           <el-input v-model="form.empName" placeholder="请输入职工姓名" />
@@ -221,6 +163,16 @@
         <el-form-item label="年龄" prop="age">
           <el-input v-model="form.age" placeholder="请输入年龄" />
         </el-form-item>
+        <el-form-item label="性别" prop="sex">
+          <el-select v-model="form.sex" placeholder="请选择性别" style="width: 100%;">
+            <el-option
+              v-for="dict in dict.type.sys_user_sex"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="手机号" prop="phone">
           <el-input v-model="form.phone" placeholder="请输入手机号" />
         </el-form-item>
@@ -259,9 +211,14 @@
 
 <script>
 import { listEmployee, getEmployee, delEmployee, addEmployee, updateEmployee } from "@/api/kaohe/employee"
+import { deptTreeSelect } from "@/api/system/user";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Employee",
+  components: { Treeselect },
+  dicts: ['sys_user_sex'],
   data() {
     return {
       // 遮罩层
@@ -278,6 +235,8 @@ export default {
       total: 0,
       // 职工信息表格数据
       employeeList: [],
+      // 部门树选项
+      deptOptions: undefined,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -306,7 +265,7 @@ export default {
       // 表单校验
       rules: {
         deptId: [
-          { required: true, message: "职工所属部门不能为空", trigger: "blur" }
+          { required: true, message: "所属部门不能为空", trigger: "blur" }
         ],
         empName: [
           { required: true, message: "职工姓名不能为空", trigger: "blur" }
@@ -316,6 +275,7 @@ export default {
   },
   created() {
     this.getList()
+    this.getDeptTree()
   },
   methods: {
     /** 查询职工信息列表 */
@@ -327,6 +287,18 @@ export default {
         this.loading = false
       })
     },
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+
+        console.log(this.deptOptions);
+      });
+    },
+    /** 查询时选择部门 */
+    changeDept(dept) {
+      this.form.deptName = dept.label
+    },
     // 取消按钮
     cancel() {
       this.open = false
@@ -401,6 +373,7 @@ export default {
               this.getList()
             })
           } else {
+            this.form.userId = this.$store.state.user.id
             addEmployee(this.form).then(response => {
               this.$modal.msgSuccess("新增成功")
               this.open = false