From 56eeb2671661ac45fc8d3129951dad96a5bd1f9b Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期日, 19 十月 2025 15:24:16 +0800
Subject: [PATCH] Merge branch 'dev-1.2.0.1' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-1.2.0.1
---
src/views/ServiceChargeManage/ServiceChargeManage.vue | 24 +++++-------------------
1 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue
index b0f30e4..ceb3bee 100644
--- a/src/views/ServiceChargeManage/ServiceChargeManage.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeManage.vue
@@ -91,7 +91,6 @@
<!-- <SettleDetailDialog v-bind="dialogSettleProps" /> -->
<RechargeEnterpriseWalletDialog v-bind="dialogRechargeProps" />
<SettlMethodDialog v-bind="dialogSettlMethodProps" />
- <EditSettleInfoDialog v-bind="dialogSettleInfoProps" />
</LoadingLayout>
</template>
@@ -198,10 +197,10 @@
emits: {
onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role.id),
},
- // extraProps: {
- // hide: (role: API.GetSettlementTasksQueryResultItem) =>
- // role.settlementOrderStatus === EnumTaskSettlementOrderStatus.Wait,
- // },
+ extraProps: {
+ hide: (role: API.GetSettlementTasksQueryResultItem) =>
+ role.auditStatus !== EnumTaskSettlementAuditStatus.Wait,
+ },
},
{
data: {
@@ -295,6 +294,7 @@
settlementOrderStatus: { type: 'enum', valueEnum: EnumTaskSettlementOrderStatusText },
settlementStatus: { type: 'enum', valueEnum: EnumTaskSettlementStatusText },
checkReceiveStatus: { type: 'enum', valueEnum: EnumTaskCheckReceiveStatusText },
+ auditStatus: { type: 'enum', valueEnum: EnumTaskSettlementAuditStatusText },
actualSettlementAmount: { type: 'money' },
settlementAmount: { type: 'money' },
settlementTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
@@ -466,18 +466,4 @@
'缁撶畻鍗曟ā鏉�'
);
}
-
-const {
- dialogProps: dialogSettleInfoProps,
- handleEdit: handleSettleInfoEdit,
- editForm: settleInfoEditForm,
-} = useFormDialog({
- onConfirm: handleSettleInfo,
- defaultFormParams: {
- id: '',
- actualSettlementAmount: 0,
- },
-});
-
-async function handleSettleInfo() {}
</script>
--
Gitblit v1.9.1