From 705139a4cb5a6e99377b31e056de61dc4bfecf2e Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期三, 03 十二月 2025 15:06:22 +0800
Subject: [PATCH] Merge branch 'dev-1.3.0.4' of http://120.26.58.240:8888/r/flexJobMiniApp into dev-1.3.0.4
---
apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue b/apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue
index 27ae84d..0d63499 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">
@@ -96,12 +96,13 @@
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, PayrollManageDetailCard } from '@12333/components';
defineOptions({
name: 'InnerPage',
--
Gitblit v1.9.1