From b73edc1745f2d4dca892a097f13113e74cfbe854 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 27 十月 2025 15:31:18 +0800
Subject: [PATCH] fix: bug
---
src/services/api/taskCheckReceive.ts | 36 +++++++++
src/services/api/typings.d.ts | 159 ++++++++++++++++++++++++++++++++++++++-
src/constants/apiEnum.ts | 18 ++++
src/views/CPersonManage/components/StaffResumeView.vue | 9 ++
4 files changed, 216 insertions(+), 6 deletions(-)
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index ead0641..1f65500 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -209,6 +209,22 @@
Completed = 20,
}
+/** 鏌ヨ楠屾敹浠诲姟璇︽儏-绛惧埌绛惧嚭璁板綍 */
+export enum EnumGetCheckReceiveTaskCheckInUsersQueryStatus {
+ /**宸茬鍒� */
+ CheckOut = 10,
+ /**鏈埌宀� */
+ UnCheck = 20,
+}
+
+/** 娌″啓娉ㄩ噴 */
+export enum EnumGetCheckReceiveTasksQueryResultItemCheckStatus {
+ /**鏈埌宀� */
+ None = 10,
+ /**宸茬鍒� */
+ Completed = 20,
+}
+
/** 娌″啓娉ㄩ噴 */
export enum EnumGetEnterpriseEmployeesQuerySignContractStatus {
/**鐏靛伐寰呯绾� */
@@ -579,8 +595,6 @@
CheckOut = 20,
/**鏈埌宀� */
UnCheckIn = 30,
- /**鏈鍑� */
- UnCheckOut = 40,
}
/** 浠诲姟楠屾敹鐘舵�� */
diff --git a/src/services/api/taskCheckReceive.ts b/src/services/api/taskCheckReceive.ts
index aaa88db..2b47075 100644
--- a/src/services/api/taskCheckReceive.ts
+++ b/src/services/api/taskCheckReceive.ts
@@ -2,6 +2,24 @@
// @ts-ignore
import { request } from '@/utils/request';
+/** 璁＄畻浠诲姟楠屾敹閲戦 POST /api/flexjob/taskCheckReceive/calcTaskCheckReceive */
+export async function calcTaskCheckReceive(
+ body: API.CalcTaskCheckReceiveCommand,
+ options?: API.RequestConfig
+) {
+ return request<API.CalcTaskCheckReceiveCommandResult>(
+ '/api/flexjob/taskCheckReceive/calcTaskCheckReceive',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
/** 浠诲姟楠屾敹 POST /api/flexjob/taskCheckReceive/checkReceiveTask */
export async function checkReceiveTask(
body: API.CheckReceiveTaskCommand,
@@ -50,6 +68,24 @@
);
}
+/** 鏌ヨ楠屾敹绛惧埌鐢ㄦ埛 POST /api/flexjob/taskCheckReceive/getCheckReceiveTaskCheckInUsers */
+export async function getCheckReceiveTaskCheckInUsers(
+ body: API.GetCheckReceiveTaskCheckInUsersQuery,
+ options?: API.RequestConfig
+) {
+ return request<API.GetCheckReceiveTaskCheckInUsersQueryResult>(
+ '/api/flexjob/taskCheckReceive/getCheckReceiveTaskCheckInUsers',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
/** 鏌ヨ楠屾敹浠诲姟鍒嗛〉鍒楄〃 POST /api/flexjob/taskCheckReceive/getCheckReceiveTasks */
export async function getCheckReceiveTasks(
body: API.GetCheckReceiveTasksQuery,
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 78ee6c3..beb6a74 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -354,6 +354,25 @@
auditRemark?: string;
/** 鎿嶄綔浠ょ墝 */
operatorToken?: string;
+ /** 鍚嶅崟 */
+ rosters?: AuditTaskSettlementCommandRoster[];
+ }
+
+ interface AuditTaskSettlementCommandRoster {
+ /** 鍚嶅崟Id */
+ id?: string;
+ /** 鏈嶅姟璐癸紙鍏冿級 */
+ serviceFee?: number;
+ /** 瓒呮椂锛堝皬鏃讹級 */
+ timeoutHours?: number;
+ /** 瓒呮椂璐圭敤锛堝厓锛� */
+ timeoutFee?: number;
+ /** 鍏朵粬璐圭敤锛堝厓锛� */
+ otherFee?: number;
+ /** 澶囨敞 */
+ remark?: string;
+ /** 缁撶畻閲戦 */
+ settlementAmount: number;
}
interface BaiduOcrBusinessLicenseResultModel {
@@ -442,6 +461,24 @@
operatorToken?: string;
}
+ interface CalcTaskCheckReceiveCommand {
+ /** 浠诲姟Id */
+ taskInfoId?: string;
+ /** 绛惧埌鏃堕棿 */
+ checkInTime?: string;
+ /** 绛惧嚭鏃堕棿 */
+ checkOutTime?: string;
+ }
+
+ interface CalcTaskCheckReceiveCommandResult {
+ /** 鏈嶅姟璐癸紙鍏冿級 */
+ serviceFee?: number;
+ /** 瓒呮椂锛堝皬鏃讹級 */
+ timeoutHours?: number;
+ /** 瓒呮椂璐圭敤锛堝厓锛� */
+ timeoutFee?: number;
+ }
+
interface ChangePhoneNumberCommand {
/** 鎵嬫満鍙风爜 */
phoneNumber: string;
@@ -484,6 +521,18 @@
checkInTime?: string;
/** 绛惧嚭鏃堕棿 */
checkOutTime?: string;
+ /** 鏈嶅姟璐癸紙鍏冿級 */
+ serviceFee?: number;
+ /** 瓒呮椂锛堝皬鏃讹級 */
+ timeoutHours?: number;
+ /** 瓒呮椂璐圭敤锛堝厓锛� */
+ timeoutFee?: number;
+ /** 鍏朵粬璐圭敤锛堝厓锛� */
+ otherFee?: number;
+ /** 澶囨敞 */
+ remark?: string;
+ /** 缁撶畻閲戦 */
+ settlementAmount?: number;
checkReceiveStatus?: EnumTaskUserSubmitCheckReceiveStatus;
}
@@ -574,9 +623,9 @@
/** 瀹炲彂閲戦 */
actualSettlementAmount: number;
/** 鏀舵璐︽埛 */
- receiveAccount: string;
+ receiveAccount?: string;
/** 鎵�灞為摱琛� */
- bank: string;
+ bank?: string;
/** 寮�鎴锋敮琛屽悕绉� */
bankBranch?: string;
}
@@ -833,6 +882,20 @@
/**鏈姤鍚� */
None = 10,
/**宸叉姤鍚� */
+ Completed = 20,
+ }
+
+ enum EnumGetCheckReceiveTaskCheckInUsersQueryStatus {
+ /**宸茬鍒� */
+ CheckOut = 10,
+ /**鏈埌宀� */
+ UnCheck = 20,
+ }
+
+ enum EnumGetCheckReceiveTasksQueryResultItemCheckStatus {
+ /**鏈埌宀� */
+ None = 10,
+ /**宸茬鍒� */
Completed = 20,
}
@@ -1174,8 +1237,6 @@
CheckOut = 20,
/**鏈埌宀� */
UnCheckIn = 30,
- /**鏈鍑� */
- UnCheckOut = 40,
}
enum EnumTaskUserSubmitCheckReceiveStatus {
@@ -1467,6 +1528,24 @@
timestamp?: number;
}
+ interface FriendlyResultCalcTaskCheckReceiveCommandResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: CalcTaskCheckReceiveCommandResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultEnterpriseUserElectronSignCommandResult {
/** 璺熻釜Id */
traceId?: string;
@@ -1529,6 +1608,24 @@
/** 閿欒鐮� */
errorCode?: string;
data?: GetBankOcrCommandResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultGetCheckReceiveTaskCheckInUsersQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetCheckReceiveTaskCheckInUsersQueryResult;
/** 鎵ц鎴愬姛 */
success?: boolean;
/** 閿欒淇℃伅 */
@@ -3509,6 +3606,40 @@
number?: string;
}
+ interface GetCheckReceiveTaskCheckInUsersQuery {
+ /** 浠诲姟Id */
+ taskInfoId?: string;
+ /** 鏃ユ湡 */
+ date?: string;
+ status?: EnumGetCheckReceiveTaskCheckInUsersQueryStatus;
+ pageModel?: PagedListQueryPageModel;
+ }
+
+ interface GetCheckReceiveTaskCheckInUsersQueryResult {
+ pageModel?: PagedListQueryResultPageModel;
+ /** 鏁版嵁 */
+ data?: GetCheckReceiveTaskCheckInUsersQueryResultItem[];
+ }
+
+ interface GetCheckReceiveTaskCheckInUsersQueryResultItem {
+ /** 浠诲姟浜哄憳Id */
+ id?: string;
+ /** 澶村儚 */
+ avatar?: string;
+ /** 濮撳悕 */
+ name?: string;
+ /** 韬唤璇佸彿 */
+ identity?: string;
+ gender?: EnumUserGender;
+ /** 骞撮緞 */
+ age?: number;
+ /** 鎵嬫満鍙� */
+ contactPhoneNumber?: string;
+ /** 鏄惁瀹炲悕 */
+ isReal?: boolean;
+ realMethod?: EnumUserRealMethod;
+ }
+
interface GetCheckReceiveTaskQuery {
/** 浠诲姟Id */
taskInfoId?: string;
@@ -3555,6 +3686,7 @@
/** 鏈�杩戞彁浜ゆ椂闂� */
lastSubmitTime?: string;
checkReceiveStatus?: EnumTaskCheckReceiveStatus;
+ submitCheckReceiveStatus?: EnumTaskUserSubmitCheckReceiveStatus;
}
interface GetCheckReceiveTaskQueryResultObjectData {
@@ -3641,11 +3773,14 @@
checkReceiveStatus?: EnumTaskCheckReceiveStatus;
/** 鏈�杩戦獙鏀舵椂闂� */
lastCheckReceiveTime?: string;
+ checkedStatus?: EnumGetCheckReceiveTasksQueryResultItemCheckStatus;
}
interface GetCheckReceiveTaskUserSubmitCheckHistoriesQuery {
/** 浠诲姟Id */
taskInfoId?: string;
+ /** 浠诲姟浜哄憳Id */
+ taskInfoUserId?: string;
/** 鏃ユ湡 */
date?: string;
type?: EnumTaskUserSubmitCheckHistoryType;
@@ -3882,6 +4017,10 @@
access?: EnumElectronSignAccess;
/** 妯℃澘Id */
templateId?: string;
+ /** 鏄惁鑷姩绛� */
+ isAutoSign?: boolean;
+ /** 鑷姩绛炬巿鏉冧功 */
+ autoSignPowerAttorneyUrl?: string;
/** 鍙橀噺 */
values?: GetContractTemplateQueryResultValue[];
/** 鍒涘缓鎿嶄綔浜� */
@@ -4150,6 +4289,8 @@
/** 妯℃澘Id */
templateId?: string;
access?: EnumElectronSignAccess;
+ /** 鏄惁鑷姩绛� */
+ isAutoSign?: boolean;
/** 涓氬姟缂栫爜 */
code?: string;
/** 妯℃澘 */
@@ -6439,6 +6580,8 @@
height?: number;
/** 浣撻噸 */
weight?: number;
+ /** 闉嬬爜 */
+ shoeSize?: number;
/** 鐢熸椿鐓� */
photos?: string[];
/** 鐢熸椿鐓� */
@@ -6540,6 +6683,8 @@
height?: number;
/** 浣撻噸 */
weight?: number;
+ /** 闉嬬爜 */
+ shoeSize?: number;
/** 鐢熸椿鐓� */
photos?: string[];
/** 鐢熸椿鐓� */
@@ -7083,6 +7228,10 @@
access?: EnumElectronSignAccess;
/** 妯℃澘Id */
templateId?: string;
+ /** 鏄惁鑷姩绛� */
+ isAutoSign?: boolean;
+ /** 鑷姩绛炬巿鏉冧功 */
+ autoSignPowerAttorneyUrl?: string;
/** Id */
id?: string;
}
@@ -7499,6 +7648,8 @@
height?: number;
/** 浣撻噸 */
weight?: number;
+ /** 闉嬬爜 */
+ shoeSize?: number;
/** 鐢熸椿鐓� */
photos?: string[];
/** 涓汉瑙嗛 */
diff --git a/src/views/CPersonManage/components/StaffResumeView.vue b/src/views/CPersonManage/components/StaffResumeView.vue
index 3a2e0ef..58eac79 100644
--- a/src/views/CPersonManage/components/StaffResumeView.vue
+++ b/src/views/CPersonManage/components/StaffResumeView.vue
@@ -55,6 +55,13 @@
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
+ <ProFormCol>
+ <ProFormColItem :span="12">
+ <ProFormItemV2 label="闉嬬爜锛�" prop="shoeSize">
+ <ProFormInputNumber v-model="detail.shoeSize"></ProFormInputNumber>
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
<ProFormItemV2 label="涓汉鐓х墖锛�" prop="photos">
<ProFormImageUpload v-model:file-url="detail.photos"> </ProFormImageUpload>
</ProFormItemV2>
@@ -127,6 +134,7 @@
workExperience: '',
height: 0,
weight: 0,
+ shoeSize: 0,
photos: [] as UploadUserFile[],
videos: [] as UploadUserFile[],
});
@@ -147,6 +155,7 @@
detail.workExperience = data.workExperience;
detail.height = data.height ?? 0;
detail.weight = data.weight ?? 0;
+ detail.shoeSize = data.shoeSize ?? 0;
detail.photos = data.photos
? data.photos.map((x) => convertApi2FormUrl(x))
: ([] as UploadUserFile[]);
--
Gitblit v1.9.1