From ba0fe6287df3a140844cef2144d4a88ae7ae543b Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 07 十一月 2025 15:10:00 +0800
Subject: [PATCH] feat: 接口
---
apps/underTakeMiniApp/src/pages/workbenches/InnerPage.vue | 1
apps/underTakeMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue | 24 ++++++++++-
apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue | 35 ++++++++++++++---
packages/services/apiV2/task.ts | 15 +++++++
packages/services/apiV2/typings.d.ts | 6 +++
apps/underTakeMiniApp/project.private.config.json | 7 +--
apps/bMiniApp/project.private.config.json | 4 +-
7 files changed, 76 insertions(+), 16 deletions(-)
diff --git a/apps/bMiniApp/project.private.config.json b/apps/bMiniApp/project.private.config.json
index 269923c..1891ee5 100644
--- a/apps/bMiniApp/project.private.config.json
+++ b/apps/bMiniApp/project.private.config.json
@@ -26,8 +26,8 @@
"name": "楠屾敹璇︽儏",
"pathName": "subpackages/task/taskCheckDetail/taskCheckDetail",
"query": "id=b0e79981-56d5-4730-83e7-08de1d1fb9dd&date=2025-11-07&checkReceiveStatus=20",
- "scene": null,
- "launchMode": "default"
+ "launchMode": "default",
+ "scene": null
},
{
"name": "鍙戣柂璇︽儏",
diff --git a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
index 5f5c344..9a21840 100644
--- a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
@@ -609,6 +609,22 @@
},
});
+async function calcTaskTotalServiceFee() {
+ try {
+ let params: API.CalcTaskTotalServiceFeeCommand = {
+ billingMethod: form.billingMethod,
+ serviceFee: form.serviceFee,
+ verifyWorkHours: form.verifyWorkHours,
+ totalPieceQuantity: form.totalPieceQuantity,
+ needPeopleNumber: form.needPeopleNumber,
+ beginTime: dayjs(form.beginTime).format('YYYY-MM-DD 00:00:00'),
+ endTime: dayjs(form.endTime).format('YYYY-MM-DD 23:59:59'),
+ };
+ let res = await taskServices.calcTaskTotalServiceFee(params);
+ return res;
+ } catch (error) {}
+}
+
const formRef = ref<any>(null);
function handleConfirm() {
if (!formRef.value) return;
@@ -621,10 +637,8 @@
async function confirm() {
try {
- // await Message.confirm({
- // message: `鎮ㄥ綋鍓嶈处鎴蜂綑棰濅笉瓒筹紝鏆傛椂鏃犳硶鍙戝竷浠诲姟锛岃鐧诲綍瀹㈡埛绔悗鍙板厖鍊煎悗鎿嶄綔`,
- // showCancelBtn: false,
- // });
+ await calcTaskTotalServiceFee();
+
let params: API.SaveTaskInfoCommand = {
supplierEnterpriseId: form.supplierEnterpriseId,
name: form.name,
@@ -661,7 +675,7 @@
if (isCopy) {
params.id = '';
}
- let res = await taskServices.saveTaskInfo(params);
+ let res = await taskServices.saveTaskInfo(params, { skipErrorHandler: true });
if (res) {
Message.success(isEdit && !isCopy ? '缂栬緫鎴愬姛' : '鍙戝竷鎴愬姛', {
onClosed() {
@@ -669,7 +683,16 @@
},
});
}
- } catch (error) {}
+ } catch (error) {
+ if (error?.info?.errorCode == 'BalanceNotEnough') {
+ await Message.confirm({
+ message: `鎮ㄥ綋鍓嶈处鎴蜂綑棰濅笉瓒筹紝鏆傛椂鏃犳硶鍙戝竷浠诲姟锛岃鐧诲綍瀹㈡埛绔悗鍙板厖鍊煎悗鎿嶄綔`,
+ showCancelBtn: false,
+ });
+ } else {
+ Message.error(error);
+ }
+ }
}
function timeChange() {
diff --git a/apps/underTakeMiniApp/project.private.config.json b/apps/underTakeMiniApp/project.private.config.json
index cb80522..60e0a67 100644
--- a/apps/underTakeMiniApp/project.private.config.json
+++ b/apps/underTakeMiniApp/project.private.config.json
@@ -17,8 +17,7 @@
"showES6CompileOption": false,
"checkInvalidKey": true,
"ignoreDevUnusedFiles": true,
- "useIsolateContext": true,
- "skylineRenderEnable": false
+ "useIsolateContext": true
},
"condition": {
"miniprogram": {
@@ -27,8 +26,8 @@
"name": "鍙戣柂璇︽儏",
"pathName": "subpackages/payrollManage/payrollManageDetail/payrollManageDetail",
"query": "id=225c2ed0-aefc-43aa-ff08-08de11385920&operatorToken=97671547-8f84-49c7-8cb0-7bf5bc216cc9",
- "scene": null,
- "launchMode": "default"
+ "launchMode": "default",
+ "scene": null
},
{
"name": "鐢ㄦ埛鍗忚",
diff --git a/apps/underTakeMiniApp/src/pages/workbenches/InnerPage.vue b/apps/underTakeMiniApp/src/pages/workbenches/InnerPage.vue
index b984b09..23470cb 100644
--- a/apps/underTakeMiniApp/src/pages/workbenches/InnerPage.vue
+++ b/apps/underTakeMiniApp/src/pages/workbenches/InnerPage.vue
@@ -64,7 +64,6 @@
});
const goPage = useAccessLogin((routeName: string) => {
- console.log('routeName: ', routeName);
Taro.navigateTo({
url: routeName,
});
diff --git a/apps/underTakeMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue b/apps/underTakeMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue
index 92e4aa3..e885c8c 100644
--- a/apps/underTakeMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue
+++ b/apps/underTakeMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue
@@ -69,7 +69,7 @@
</PayrollManageDetailCard>
</template>
</InfiniteLoading>
- <PageFooter v-if="form.auditStatus === EnumTaskSettlementAuditStatus.Wait">
+ <PageFooter v-if="form.settlementStatus === EnumTaskSettlementStatus.Wait">
<!-- <PageFooterBtn type="primary" @click="auditTaskSettlement(EnumTaskSettlementAuditStatus.Pass)"
>瀹℃牳閫氳繃</PageFooterBtn
>
@@ -79,9 +79,10 @@
@click="auditTaskSettlement(EnumTaskSettlementAuditStatus.Fail)"
>椹冲洖</PageFooterBtn
> -->
- <PageFooterBtn type="primary" @click="auditTaskSettlement(EnumTaskSettlementAuditStatus.Pass)"
+ <!-- <PageFooterBtn type="primary" @click="auditTaskSettlement(EnumTaskSettlementAuditStatus.Pass)"
>纭</PageFooterBtn
- >
+ > -->
+ <PageFooterBtn type="primary" @click="settlementTask()">缁撶畻</PageFooterBtn>
<PageFooterBtn type="primary" plain @click="goBack">鍙栨秷</PageFooterBtn>
</PageFooter>
</LoadingLayout>
@@ -190,6 +191,23 @@
}
);
+async function settlementTask() {
+ try {
+ let params: API.SureTaskSettlementCommand = {
+ taskInfoId: id,
+ operatorToken: operatorToken,
+ };
+ let res = await taskServices.sureTaskSettlement(params);
+ if (res) {
+ Message.success('鎿嶄綔鎴愬姛', {
+ onClosed() {
+ goBack();
+ },
+ });
+ }
+ } catch (error) {}
+}
+
async function auditTaskSettlement(auditStatus: EnumTaskSettlementAuditStatus) {
try {
let params: API.AuditTaskSettlementCommand = {
diff --git a/packages/services/apiV2/task.ts b/packages/services/apiV2/task.ts
index e5e2142..05569e2 100644
--- a/packages/services/apiV2/task.ts
+++ b/packages/services/apiV2/task.ts
@@ -299,6 +299,21 @@
);
}
+/** 淇浠诲姟棰勮鎬绘湇鍔¤垂v1.3.0.1 POST /api/flexjob/task/repairTaskEstimatedServiceFee_1_3_0_1 */
+export async function repairTaskEstimatedServiceFee1301(
+ body: API.RepairTaskEstimatedServiceFee1301Command,
+ options?: API.RequestConfig
+) {
+ return request<boolean>('/api/flexjob/task/repairTaskEstimatedServiceFee_1_3_0_1', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 鎾ゅ洖缁撶畻 POST /api/flexjob/task/revokeTaskSettlementOrder */
export async function revokeTaskSettlementOrder(
body: API.RevokeTaskSettlementOrderCommand,
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index da91ba1..9e0679b 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/packages/services/apiV2/typings.d.ts
@@ -3970,6 +3970,8 @@
lastSubmitTime?: string;
checkReceiveStatus?: EnumTaskCheckReceiveStatus;
submitCheckReceiveStatus?: EnumTaskUserSubmitCheckReceiveStatus;
+ /** 楠屾敹鏂瑰紡 */
+ checkReceiveMethods?: EnumTaskCheckReceiveMethod[];
}
interface GetCheckReceiveTaskQueryResultObjectData {
@@ -6470,6 +6472,8 @@
checkReceiveStatus?: EnumTaskCheckReceiveStatus;
/** 缁撶畻鍗曞彿 */
settlementCode?: string;
+ /** 渚涘簲鍟嗗悕绉� */
+ supplierEnterpriseName?: string;
settlementOrderStatus?: EnumTaskSettlementOrderStatus;
/** 缁撶畻鍗曞悕绉� */
settlementOrderName?: string;
@@ -7848,6 +7852,8 @@
type RepairContractTemplateValuePointBy1202Command = Record<string, any>;
+ type RepairTaskEstimatedServiceFee1301Command = Record<string, any>;
+
interface ResendResourceCommand {
/** 璧勬簮鏃ュ織Id */
id?: string;
--
Gitblit v1.10.0