From 2ead0564b60f70c4e19ab3567698c202c10c316d Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 07 十一月 2025 10:44:57 +0800
Subject: [PATCH] feat: 1.3.0.1
---
apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue b/apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue
index 3031f38..b736562 100644
--- a/apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue
+++ b/apps/bMiniApp/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}${EnumBillingMethodText[form.billingMethod]}` }}
+ {{ OrderUtils.getServiceFeeText(form.serviceFee, form.billingMethod) }}
</div>
</div>
<div class="payroll-manage-detail-top-content-item">
@@ -32,7 +32,7 @@
>
<div class="payroll-manage-detail-top-content-item-label">瀹℃牳鏃堕棿锛�</div>
<div class="payroll-manage-detail-top-content-item-text">
- {{ dayjs(form.auditTime).format('YYYY-MM-DD') }}
+ {{ form.auditTime ? dayjs(form.auditTime).format('YYYY-MM-DD') : '' }}
</div>
</div>
<div
@@ -70,7 +70,7 @@
</template>
</InfiniteLoading>
<PageFooter v-if="form.auditStatus === EnumTaskSettlementAuditStatus.Wait">
- <PageFooterBtn type="primary" @click="auditTaskSettlement(EnumTaskSettlementAuditStatus.Pass)"
+ <!-- <PageFooterBtn type="primary" @click="auditTaskSettlement(EnumTaskSettlementAuditStatus.Pass)"
>瀹℃牳閫氳繃</PageFooterBtn
>
<PageFooterBtn
@@ -78,7 +78,11 @@
plain
@click="auditTaskSettlement(EnumTaskSettlementAuditStatus.Fail)"
>椹冲洖</PageFooterBtn
+ > -->
+ <PageFooterBtn type="primary" @click="auditTaskSettlement(EnumTaskSettlementAuditStatus.Pass)"
+ >纭</PageFooterBtn
>
+ <PageFooterBtn type="primary" plain @click="goBack">鍙栨秷</PageFooterBtn>
</PageFooter>
</LoadingLayout>
</template>
@@ -92,12 +96,14 @@
EnumBillingMethodText,
EnumTaskSettlementAuditStatus,
EnumTaskSettlementStatus,
+ 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',
--
Gitblit v1.9.1