From 6542c98983ff1a2f0a3f898ef2b7007153cb3aaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B0=B4=E6=99=B6=E5=9C=9F=E8=B1=86?= <水晶土豆@devide>
Date: Tue, 21 Nov 2023 14:10:00 +0800
Subject: [PATCH] Tue Nov 21 14:10:00 CST 2023 inscode

---
 src/api/api.ts                       |  6 ++++-
 src/api/path.ts                      |  4 ++-
 src/component/humanResources/emp.vue | 40 +++++++++++++++++-----------
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/api/api.ts b/src/api/api.ts
index 48cfc61..fbb94a6 100644
--- a/src/api/api.ts
+++ b/src/api/api.ts
@@ -1,6 +1,6 @@
 import request from "./index";
 import type { IParams } from './index';
-import { CONTRACT_CATEGORY, CONTRACT_LIST, CONTRACT_LIST_Type, DEPT_MENU, HUMAN_RESOURCES_DEPARTMENT, JOB_TITLE, LOGIN, TABLE_ANNOUNCEMENT } from "./path";
+import { CONTRACT_CATEGORY, CONTRACT_LIST, CONTRACT_LIST_Type, DEPT_MENU, HUMAN_RESOURCES_DEPARTMENT, JOB_TITLE, LOGIN, TABLE_ANNOUNCEMENT,EMP_LISIT } from "./path";
 import type { AxiosResponse } from "axios";
 
 
@@ -53,4 +53,8 @@ export function getHumanResourcesDepartment(): Promise<AxiosResponse<any>>{
 
 export function getJobTiTle() : Promise<AxiosResponse<any>>{
     return request.get(JOB_TITLE,{});
+}
+
+export function getEmpList(body:IParams) :Promise<AxiosResponse<any>>{
+    return request.get(EMP_LISIT,body);
 }
\ No newline at end of file
diff --git a/src/api/path.ts b/src/api/path.ts
index 8457c22..fc7a69b 100644
--- a/src/api/path.ts
+++ b/src/api/path.ts
@@ -13,4 +13,6 @@ export const CONTRACT_LIST_Type = CONTRACT_LIST + '/Type';
 
 export const HUMAN_RESOURCES_DEPARTMENT = baseURL + '/humanResources/department';
 
-export const JOB_TITLE = baseURL + '/job/title';
\ No newline at end of file
+export const JOB_TITLE = baseURL + '/job/title';
+
+export const EMP_LISIT = baseURL + '/emp/list';
\ No newline at end of file
diff --git a/src/component/humanResources/emp.vue b/src/component/humanResources/emp.vue
index 314814d..99d4f02 100644
--- a/src/component/humanResources/emp.vue
+++ b/src/component/humanResources/emp.vue
@@ -1,9 +1,9 @@
 <script setup>
-import { onMounted, ref, provide, reactive } from 'vue'
+import { onMounted, ref, provide, reactive, watch } from 'vue'
 import { deepClone } from '@/util/deepCode'
 import { TreeToFlat, FlatToTree } from '@/util/toTree'
 import { computed } from '@vue/reactivity';
-import { getHumanResourcesDepartment, getContractCategory } from '@/api/api';
+import { getHumanResourcesDepartment, getContractCategory, getEmpList } from '@/api/api';
 
 import mains from '@/component/main/main.vue';
 import ejectDialog from '@/component/main/ejectDialog.vue';
@@ -35,9 +35,10 @@ const defExpandedKey = computed(() => {
     }
     const return_s = TreeToFlat(deepClone(treeData.value)).map((item) => item.title);
     return return_s;
-
 })
 
+watch(()=>)
+
 // pagination
 const tablePagination = reactive({
     currentPage: 1,
@@ -45,13 +46,12 @@ const tablePagination = reactive({
     total: 1
 });
 const getData = () => {
-    getContractCategory({ page: tablePagination.currentPage, limit: tablePagination.pageSize })
-        .then((res) => {
-            if (res.data.data.code === 10000) {
-                tableData.value = res.data.data.data;
-                tablePagination.total = res.data.data.count;
-            }
-        })
+    getEmpList({ page: tablePagination.currentPage, limit: tablePagination.pageSize }).then((res) => {
+        if (res.data.data.code === 10000) {
+            tableData.value = res.data.data.data;
+            tablePagination.total = res.data.data.count;
+        }
+    })
 }
 onMounted(() => {
     getData();
@@ -71,9 +71,20 @@ const handleSizeChange = (index) => {
 const tableData = ref();
 const tableType = ref();
 tableType.value = [
-    { name: "id号", type: "id", width: "150px", isSort: false, align: "center" },
-    { name: "类别名称", type: "typeName", width: "auto", isSort: false, align: "left" },
-    { name: "状态", type: "state", width: "150px", isSort: false, align: "center", isReadOnly: false }
+    { name: "id号", type: "id", width: "100px", isSort: false, align: "center" },
+    { name: "员工类型", type: "employeeType", width: "auto", minWidth:'100px', isSort: false, align: "left" },
+    { name: "状态", type: "state", width: "150px", isSort: false, align: "center", isReadOnly: false },
+    { name: "登录账号", type: "loginAccount", width: "200px", isSort: false, align: "center" },
+    { name: "头像", type: "avatar", width: "150px", isSort: false, align: "left" },
+    { name: "用户姓名", type: "userName", width: "150px", isSort: false, align: "center", isReadOnly: false },
+    { name: "手机号码", type: "mobilePhoneNumber", width: "150px", isSort: false, align: "center" },
+    { name: "电子邮箱", type: "e_mail", width: "150px", isSort: false, align: "left" },
+    { name: "性别", type: "gender", width: "150px", isSort: false, align: "center", isReadOnly: false },
+    { name: "所在部门", type: "department", width: "150px", isSort: false, align: "center" },
+    { name: "岗位职称", type: "jobTitle", width: "150px", isSort: false, align: "left" },
+    { name: "入职日期", type: "dateOfEmployment", width: "150px", isSort: false, align: "center", isReadOnly: false },
+    { name: "累计登录", type: "accumulatedLogin", width: "150px", isSort: false, align: "left" },
+    { name: "最后登录时间", type: "lastLoginTime", width: "200px", isSort: false, align: "center", isReadOnly: false },
 ]
 const operation = ref();
 operation.value = {
@@ -208,6 +219,5 @@ provide("cellSetStyle", ({ row, column, rowIndex, columnIndex }) => {
 </template>
 
 <style scoped>
-.el-aside{
-}
+.el-aside {}
 </style>
\ No newline at end of file
-- 
GitLab