From 6d560725ed58d8dfe35b16932ee391305fc86cf1 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 12 八月 2025 17:56:43 +0800
Subject: [PATCH] fix: s
---
src/views/CPersonManage/CPersonManageList.vue | 78 +++++++++++++++++---------------------
1 files changed, 35 insertions(+), 43 deletions(-)
diff --git a/src/views/CPersonManage/CPersonManageList.vue b/src/views/CPersonManage/CPersonManageList.vue
index 6a801c6..db6d47e 100644
--- a/src/views/CPersonManage/CPersonManageList.vue
+++ b/src/views/CPersonManage/CPersonManageList.vue
@@ -5,25 +5,20 @@
<template #query>
<QueryFilterItem tip-content="瀹炲悕鐘舵��">
<FieldRadio
- v-model="extraParamState.realVerifyStatus"
+ v-model="extraParamState.isReal"
:value-enum="[
- {
- value: false,
- label: '鏈疄鍚�',
- },
- {
- value: true,
- label: '宸插疄鍚�',
- },
+ { label: '宸插疄鍚�', value: true },
+ { label: '鏈疄鍚�', value: false },
]"
buttonStyle
showAllBtn
+ :all-btn-value="null"
@change="getList()"
/>
</QueryFilterItem>
<QueryFilterItem tip-content="鏈�杩戝綍鐢ㄦ椂闂�">
<FieldDatePicker
- v-model="extraParamState.nearlyHireDateTime"
+ v-model="extraParamState.createdTime"
type="daterange"
range-separator="~"
start-placeholder="寮�濮嬫椂闂�"
@@ -34,7 +29,7 @@
</QueryFilterItem>
<QueryFilterItem tip-content="鏈�杩戠绾︽椂闂�">
<FieldDatePicker
- v-model="extraParamState.nearlySignDateTime"
+ v-model="extraParamState.signContractTime"
type="daterange"
range-separator="~"
start-placeholder="寮�濮嬫椂闂�"
@@ -78,12 +73,11 @@
UploadUserFile,
} from '@bole-core/components';
import { useAccess, useGlobalEventContext } from '@/hooks';
-import * as flexEnterpriseWokerServices from '@/services/api/FlexEnterpriseWoker';
import { Gender } from '@/constants';
import CPersonDetailDialog from './components/CPersonDetailDialog.vue';
-import { OrderInputType } from '@bole-core/core';
import { convertApi2FormUrlOnlyOne, format } from '@/utils';
import { ModelValueType } from 'element-plus';
+import * as enterpriseEmployeeServices from '@/services/api/enterpriseEmployee';
defineOptions({
name: 'CPersonManageList',
@@ -129,33 +123,28 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let params: API.GetUserClientForBackInput = {
+ let params: API.GetEnterpriseEmployeesQuery = {
pageModel: {
rows: pageSize,
page: pageIndex,
orderInput: extraParamState.orderInput,
},
- searchKeys: extraParamState.searchKeys,
- nearlyHireDateTimeBegin: format(
- extraParamState.nearlyHireDateTime?.[0] ?? '',
+ keywords: extraParamState.searchKeys,
+ //TODO 搴旇鏄綍鐢ㄦ椂闂� 杩樻病鏈�
+ createdTimeStart: format(extraParamState.createdTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
+ createdTimeEnd: format(extraParamState.createdTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
+ signContractTimeStart: format(
+ extraParamState.signContractTime?.[0] ?? '',
'YYYY-MM-DD 00:00:00'
),
- nearlyHireDateTimeEnd: format(
- extraParamState.nearlyHireDateTime?.[1] ?? '',
+ signContractTimeEnd: format(
+ extraParamState.signContractTime?.[1] ?? '',
'YYYY-MM-DD 23:59:59'
),
- nearlySignDateTimeBegin: format(
- extraParamState.nearlySignDateTime?.[0] ?? '',
- 'YYYY-MM-DD 00:00:00'
- ),
- nearlySignDateTimeEnd: format(
- extraParamState.nearlySignDateTime?.[1] ?? '',
- 'YYYY-MM-DD 23:59:59'
- ),
- realVerifyStatus: extraParamState.realVerifyStatus,
+ isReal: extraParamState.isReal,
};
- let res = await flexEnterpriseWokerServices.getUserClientList(params, {
+ let res = await enterpriseEmployeeServices.getEnterpriseEmployees(params, {
showLoading: !state.loading,
});
return res;
@@ -166,26 +155,29 @@
{
defaultExtraParams: {
searchKeys: '',
- realVerifyStatus: '' as any as boolean,
- nearlyHireDateTime: [] as unknown as ModelValueType,
- nearlySignDateTime: [] as unknown as ModelValueType,
- orderInput: [{ property: 'userId', order: OrderInputType.Desc }],
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
+ createdTime: [] as unknown as ModelValueType,
+ signContractTime: [] as unknown as ModelValueType,
+ isReal: null as any as boolean,
},
- queryKey: ['flexEnterpriseWokerServices/getUserClientList'],
+ queryKey: ['enterpriseEmployeeServices/getEnterpriseEmployees'],
columnsRenderProps: {
- realVerifyStatus: {
- type: 'enum',
- valueEnum: [
- { label: '宸插疄鍚�', value: true },
- { label: '鏈疄鍚�', value: false },
- ],
+ gender: { type: 'enum', valueEnum: EnumUserGenderTextForPerson },
+ hireStatus: { type: 'enum', valueEnum: EnumTaskUserHireStatusText },
+ userIsReal: {
+ formatter: (row: API.GetEnterpriseEmployeesQueryResultItem) => {
+ return row.userIsReal ? '宸插疄鍚�' : '鏈疄鍚�';
+ },
},
- realVerifyTime: { type: 'date' },
+ userSignContractStatus: { type: 'enum', valueEnum: EnumTaskUserSignContractStatusText },
+ hireTime: { type: 'date' },
+ userRealTime: { type: 'date' },
+ userSignContractTime: { type: 'date' },
},
}
);
-async function openDialog(row?: API.GetUserClientForBackOutput) {
+async function openDialog(row?: API.GetEnterpriseEmployeesQueryResultItem) {
const res = await getUserDetailForBack('98ac4c01-3598-ebf3-fa7d-3a189bb6b587');
handleEdit({
userId: row.userId ?? '98ac4c01-3598-ebf3-fa7d-3a189bb6b587',
@@ -222,7 +214,7 @@
async function getUserDetailForBack(userId: string) {
try {
- return await flexEnterpriseWokerServices.getUserDetailForBack({ userId: userId });
+ // return await flexEnterpriseWokerServices.getUserDetailForBack({ userId: userId });
} catch (error) {}
}
</script>
--
Gitblit v1.9.1