From cdf4bd19d097c968a4c9e454a52960ec29fe0cec Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 14 十一月 2025 16:51:05 +0800
Subject: [PATCH] fix: bug
---
src/views/FlexJobManage/FlexJobManage.vue | 13 ++++--
src/views/FlexJobManage/hooks/index.ts | 15 +++++++
src/views/FlexJobManage/FlexJobContractManage.vue | 3 +
src/services/api/typings.d.ts | 12 +++++-
src/services/api/enterpriseWallet.ts | 15 +++++++
src/services/api/user.ts | 15 +++++++
6 files changed, 65 insertions(+), 8 deletions(-)
diff --git a/src/services/api/enterpriseWallet.ts b/src/services/api/enterpriseWallet.ts
index 603bc5b..36618fa 100644
--- a/src/services/api/enterpriseWallet.ts
+++ b/src/services/api/enterpriseWallet.ts
@@ -508,6 +508,21 @@
);
}
+/** 1.3.0.2鐗堟湰淇浼佷笟閽卞寘浜ゆ槗鏁版嵁 POST /api/user/enterpriseWallet/repairEnterpriseWalletTransaction_1_3_0_2 */
+export async function repairEnterpriseWalletTransaction1302(
+ body: API.RepairEnterpriseWalletTransaction1302Command,
+ options?: API.RequestConfig
+) {
+ return request<boolean>('/api/user/enterpriseWallet/repairEnterpriseWalletTransaction_1_3_0_2', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 淇敼浼佷笟寰俊鏀粯閽卞寘缁撶畻璐︽埛 POST /api/user/enterpriseWallet/updateEnterpriseWeChatPayWalletBankAccountInfo */
export async function updateEnterpriseWeChatPayWalletBankAccountInfo(
body: API.UpdateEnterpriseWeChatPayWalletBankAccountInfoCommand,
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index e139225..e9abad7 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -4897,6 +4897,10 @@
createdTimeStart?: string;
/** 鐧昏鏃堕棿-鏈�鏅氭椂闂� */
createdTimeEnd?: string;
+ /** 鐏靛伐绛剧害鏃堕棿-鏈�鏃╂椂闂� */
+ userSignContractTimeStart?: string;
+ /** 鐏靛伐绛剧害鏃堕棿-鏈�鏅氭椂闂� */
+ userSignContractTimeEnd?: string;
/** 绛剧害鏃堕棿-鏈�鏃╂椂闂� */
signContractTimeStart?: string;
/** 绛剧害鏃堕棿-鏈�鏅氭椂闂� */
@@ -7665,9 +7669,9 @@
contactPhoneNumber?: string;
/** 韬唤璇佸彿 */
identity?: string;
- /** 鍗忚璧峰鏃堕棿 */
+ /** 鍗忚璧峰 */
contractBegin?: string;
- /** 鍗忚缁堟鏃堕棿 */
+ /** 鍗忚缁堟 */
contractEnd?: string;
}
@@ -8022,6 +8026,10 @@
type RepairEnterpriseEmployee1302Command = Record<string, any>;
+ type RepairEnterpriseUser1302Command = Record<string, any>;
+
+ type RepairEnterpriseWalletTransaction1302Command = Record<string, any>;
+
type RepairTaskEstimatedServiceFee1301Command = Record<string, any>;
interface ResendResourceCommand {
diff --git a/src/services/api/user.ts b/src/services/api/user.ts
index f378be8..99cf0de 100644
--- a/src/services/api/user.ts
+++ b/src/services/api/user.ts
@@ -206,6 +206,21 @@
});
}
+/** 1.3.0.2鐗堟湰淇浼佷笟鐢ㄦ埛鏁版嵁 POST /api/user/user/repairEnterpriseUser_1_3_0_2 */
+export async function repairEnterpriseUser1302(
+ body: API.RepairEnterpriseUser1302Command,
+ options?: API.RequestConfig
+) {
+ return request<boolean>('/api/user/user/repairEnterpriseUser_1_3_0_2', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 閲嶇疆鐢ㄦ埛鎿嶄綔瀵嗙爜 POST /api/user/user/resetUserOperatorPasswords */
export async function resetUserOperatorPasswords(
body: API.ResetUserOperatorPasswordsCommand,
diff --git a/src/views/FlexJobManage/FlexJobContractManage.vue b/src/views/FlexJobManage/FlexJobContractManage.vue
index 361c2e7..7d6459b 100644
--- a/src/views/FlexJobManage/FlexJobContractManage.vue
+++ b/src/views/FlexJobManage/FlexJobContractManage.vue
@@ -23,7 +23,7 @@
</QueryFilterItem>
<QueryFilterItem>
<FieldDatePicker
- v-model="extraParamState.signContractTime"
+ v-model="extraParamState.userSignContractTime"
type="daterange"
range-separator="~"
start-placeholder="璧峰鏃ユ湡"
@@ -363,6 +363,7 @@
)
) {
await Message.tipMessage('鍕鹃�変汉鍛樹腑鍖呭惈宸茬绾﹀畬鎴愭垨澶栭儴浜哄憳锛岀‘璁よ缁х画鍙戦�佺煭淇￠�氱煡鍚楋紵');
+ return;
}
handleShotMessageAdd({
ids: selectionRows.map((x) => x.id),
diff --git a/src/views/FlexJobManage/FlexJobManage.vue b/src/views/FlexJobManage/FlexJobManage.vue
index 88ce9a7..85f33af 100644
--- a/src/views/FlexJobManage/FlexJobManage.vue
+++ b/src/views/FlexJobManage/FlexJobManage.vue
@@ -27,11 +27,10 @@
</QueryFilterItem>
<QueryFilterItem tip-content="鐏靛伐鏉ユ簮">
<FieldRadio
- v-model="extraParamState.isReal"
- :value-enum="[]"
+ v-model="extraParamState.source"
+ :value-enum="EnumEnterpriseEmployeeSourceText"
buttonStyle
showAllBtn
- :all-btn-value="null"
@change="getList()"
/>
</QueryFilterItem>
@@ -79,7 +78,7 @@
</QueryFilterItem> -->
<QueryFilterItem>
<FieldDatePicker
- v-model="extraParamState.createdTime"
+ v-model="extraParamState.userRealTime"
type="daterange"
range-separator="~"
start-placeholder="璧峰鏃ユ湡"
@@ -196,7 +195,11 @@
XLSXUtils,
BlFileUpload,
} from '@bole-core/components';
-import { EnumTaskUserHireStatusText, EnumTaskUserSignContractStatusText } from '@/constants';
+import {
+ EnumTaskUserHireStatusText,
+ EnumTaskUserSignContractStatusText,
+ EnumEnterpriseEmployeeSourceText,
+} from '@/constants';
import { Message } from '@bole-core/core';
import { convertApi2FormUrlOnlyOne, downloadFileByUrl, format } from '@/utils';
import StaffInfoDialog from './components/StaffInfoDialog.vue';
diff --git a/src/views/FlexJobManage/hooks/index.ts b/src/views/FlexJobManage/hooks/index.ts
index d833a25..28daa62 100644
--- a/src/views/FlexJobManage/hooks/index.ts
+++ b/src/views/FlexJobManage/hooks/index.ts
@@ -22,6 +22,8 @@
keywords: extraParamState.searchWord,
createdTimeStart: format(extraParamState.createdTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
createdTimeEnd: format(extraParamState.createdTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
+ userRealTimeStart: format(extraParamState.userRealTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
+ userRealTimeEnd: format(extraParamState.userRealTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
signContractTimeStart: format(
extraParamState.signContractTime?.[0] ?? '',
'YYYY-MM-DD 00:00:00'
@@ -30,10 +32,20 @@
extraParamState.signContractTime?.[1] ?? '',
'YYYY-MM-DD 23:59:59'
),
+ userSignContractTimeStart: format(
+ extraParamState.userSignContractTime?.[0] ?? '',
+ 'YYYY-MM-DD 00:00:00'
+ ),
+ userSignContractTimeEnd: format(
+ extraParamState.userSignContractTime?.[1] ?? '',
+ 'YYYY-MM-DD 23:59:59'
+ ),
hireStatus: extraParamState.hireStatus,
isReal: extraParamState.isReal,
userSignContractStatus: extraParamState.userSignContractStatus,
enterpriseSignContractStatus: extraParamState.enterpriseSignContractStatus,
+
+ source: extraParamState.source,
};
let res = await enterpriseEmployeeServices.getEnterpriseEmployees(params);
@@ -48,10 +60,13 @@
orderInput: [{ property: 'createdTime', order: EnumPagedListOrder.Desc }],
createdTime: [] as unknown as ModelValueType,
signContractTime: [] as unknown as ModelValueType,
+ userSignContractTime: [] as unknown as ModelValueType,
+ userRealTime: [] as unknown as ModelValueType,
hireStatus: '' as any as EnumTaskUserHireStatus,
isReal: null as any as boolean,
userSignContractStatus: '' as any as EnumTaskUserSignContractStatus,
enterpriseSignContractStatus: '' as any as EnumTaskUserSignContractStatus,
+ source: '' as any as EnumEnterpriseEmployeeSource,
},
queryKey: ['enterpriseEmployeeServices/getEnterpriseEmployees'],
columnsRenderProps: {
--
Gitblit v1.9.1