From 39fe8d064f84088d1f8a897495fa05baf671bba8 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 10 十一月 2025 18:34:48 +0800
Subject: [PATCH] fix: bug
---
apps/underTakeMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/apps/underTakeMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue b/apps/underTakeMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue
index 2bc7ca8..e885c8c 100644
--- a/apps/underTakeMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue
+++ b/apps/underTakeMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue
@@ -11,7 +11,7 @@
<div class="payroll-manage-detail-top-content-item">
<div class="payroll-manage-detail-top-content-item-label">鏈嶅姟璐归噾棰濓細</div>
<div class="payroll-manage-detail-top-content-item-text">
- {{ `${form.serviceFee ?? 0}${BillingMethodEnumUnit[form.billingMethod]}` }}
+ {{ OrderUtils.getServiceFeeText(form.serviceFee, form.billingMethod) }}
</div>
</div>
<div class="payroll-manage-detail-top-content-item">
@@ -58,18 +58,18 @@
:name="item.name"
:gender="item.gender"
:isReal="item.isReal"
- :totalWorkHours="item.timeoutHours"
+ :totalWorkHours="item.timeoutHours ?? 0"
:settlementAmount="item.settlementAmount"
>
- <template #actions v-if="form.auditStatus === EnumTaskSettlementAuditStatus.Wait">
+ <!-- <template #actions v-if="form.auditStatus === EnumTaskSettlementAuditStatus.Wait">
<div class="payroll-manage-detail-card-actions">
<nut-button type="primary" plain @click="goPayrollChange(item)">淇敼</nut-button>
</div>
- </template>
+ </template> -->
</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>
@@ -99,10 +100,11 @@
BillingMethodEnumUnit,
} from '@12333/constants';
import PayrollManageDetailCard from '../components/PayrollManageDetailCard.vue';
-import { Message, paginateList, setOSSLink, toThousand } from '@12333/utils';
+import { Message, paginateList, setOSSLink, toThousand, OrderUtils } from '@12333/utils';
import { useQuery } from '@tanstack/vue-query';
import dayjs from 'dayjs';
import { goBack } from '@/utils';
+import { ChunkTitle } from '@12333/components';
defineOptions({
name: 'InnerPage',
@@ -189,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 = {
--
Gitblit v1.9.1