From 1b3d015ebf23534ed2911be8e7ae552793ebfb66 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 27 十月 2025 19:37:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into dev-auto-sign
---
src/views/CPersonManage/components/SignDetailView.vue | 1
src/services/api/taskCheckReceive.ts | 18 +++++++++
src/services/api/typings.d.ts | 54 +++++++++++++++++++++++++++
src/views/CPersonManage/components/StaffResumeView.vue | 13 +++++-
4 files changed, 84 insertions(+), 2 deletions(-)
diff --git a/src/services/api/taskCheckReceive.ts b/src/services/api/taskCheckReceive.ts
index a287364..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,
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 2220160..beb6a74 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -461,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;
@@ -503,6 +521,18 @@
checkInTime?: string;
/** 绛惧嚭鏃堕棿 */
checkOutTime?: string;
+ /** 鏈嶅姟璐癸紙鍏冿級 */
+ serviceFee?: number;
+ /** 瓒呮椂锛堝皬鏃讹級 */
+ timeoutHours?: number;
+ /** 瓒呮椂璐圭敤锛堝厓锛� */
+ timeoutFee?: number;
+ /** 鍏朵粬璐圭敤锛堝厓锛� */
+ otherFee?: number;
+ /** 澶囨敞 */
+ remark?: string;
+ /** 缁撶畻閲戦 */
+ settlementAmount?: number;
checkReceiveStatus?: EnumTaskUserSubmitCheckReceiveStatus;
}
@@ -1488,6 +1518,24 @@
/** 閿欒鐮� */
errorCode?: string;
data?: BuildOperatorTokenCommandResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultCalcTaskCheckReceiveCommandResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: CalcTaskCheckReceiveCommandResult;
/** 鎵ц鎴愬姛 */
success?: boolean;
/** 閿欒淇℃伅 */
@@ -6532,6 +6580,8 @@
height?: number;
/** 浣撻噸 */
weight?: number;
+ /** 闉嬬爜 */
+ shoeSize?: number;
/** 鐢熸椿鐓� */
photos?: string[];
/** 鐢熸椿鐓� */
@@ -6633,6 +6683,8 @@
height?: number;
/** 浣撻噸 */
weight?: number;
+ /** 闉嬬爜 */
+ shoeSize?: number;
/** 鐢熸椿鐓� */
photos?: string[];
/** 鐢熸椿鐓� */
@@ -7596,6 +7648,8 @@
height?: number;
/** 浣撻噸 */
weight?: number;
+ /** 闉嬬爜 */
+ shoeSize?: number;
/** 鐢熸椿鐓� */
photos?: string[];
/** 涓汉瑙嗛 */
diff --git a/src/views/CPersonManage/components/SignDetailView.vue b/src/views/CPersonManage/components/SignDetailView.vue
index dd59a92..264feaf 100644
--- a/src/views/CPersonManage/components/SignDetailView.vue
+++ b/src/views/CPersonManage/components/SignDetailView.vue
@@ -15,6 +15,7 @@
:url="setOSSLink(row.contractUrl)"
>
</PreviewBtn>
+ <div v-else></div>
</template>
</ProTableV2>
</template>
diff --git a/src/views/CPersonManage/components/StaffResumeView.vue b/src/views/CPersonManage/components/StaffResumeView.vue
index 3a2e0ef..014d578 100644
--- a/src/views/CPersonManage/components/StaffResumeView.vue
+++ b/src/views/CPersonManage/components/StaffResumeView.vue
@@ -44,14 +44,21 @@
<ProFormCol>
<ProFormColItem :span="12">
<ProFormItemV2 label="韬珮锛�" prop="height">
- <ProFormInputNumber v-model="detail.height"></ProFormInputNumber>
+ <ProFormInputNumber v-model="detail.height" unit="cm"></ProFormInputNumber>
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
<ProFormItemV2 label="浣撻噸锛�" prop="weight">
- <ProFormInputNumber v-model="detail.weight"></ProFormInputNumber>
+ <ProFormInputNumber v-model="detail.weight" unit="kg"></ProFormInputNumber>
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
+ <ProFormCol>
+ <ProFormColItem :span="12">
+ <ProFormItemV2 label="闉嬬爜锛�" prop="shoeSize">
+ <ProFormInputNumber v-model="detail.shoeSize" unit="鐮�"></ProFormInputNumber>
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
@@ -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