From bf2a0dc5dade6614ce6d403bc90a833408047797 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期三, 22 十月 2025 22:07:03 +0800
Subject: [PATCH] fix: bug
---
packages/services/apiV2/typings.d.ts | 19 +++++++++++++++++++
apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue | 12 +++++++++++-
2 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue b/apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue
index 0dc276e..6674629 100644
--- a/apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue
@@ -58,7 +58,7 @@
:name="item.name"
:gender="item.gender"
:isReal="item.isReal"
- :totalWorkHours="item.totalWorkHours"
+ :totalWorkHours="item.timeoutHours"
:settlementAmount="item.settlementAmount"
>
<template #actions v-if="form.auditStatus === EnumTaskSettlementAuditStatus.Wait">
@@ -117,6 +117,7 @@
auditStatus: 0,
billingMethod: 0,
settlementStatus: 0,
+ rosters: [] as API.AuditTaskSettlementCommandRoster[],
});
const {
@@ -143,6 +144,14 @@
form.auditStatus = res.detail?.auditStatus;
form.settlementStatus = res.detail?.settlementStatus;
form.billingMethod = res.detail?.billingMethod;
+ form.rosters = res.data?.map((x) => ({
+ id: x.id,
+ name: x.name,
+ gender: x.gender,
+ isReal: x.isReal,
+ timeoutHours: x.timeoutHours,
+ settlementAmount: x.settlementAmount,
+ }));
}
return res;
},
@@ -178,6 +187,7 @@
id: id,
operatorToken: operatorToken,
auditStatus: auditStatus,
+ rosters: form.rosters,
};
let res = await taskServices.auditTaskSettlement(params);
if (res) {
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index 7364408..a039025 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/packages/services/apiV2/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 {
--
Gitblit v1.9.1