From 02aa28ba50c16658edfaff2e2e8ff19b355ab8f1 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期日, 19 十月 2025 20:01:31 +0800
Subject: [PATCH] feat: 1.2.0.1
---
src/views/ServiceChargeManage/ServiceChargeManage.vue | 41 ++++++++++++++---------------------------
1 files changed, 14 insertions(+), 27 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue
index b0f30e4..827c28e 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>
@@ -196,12 +195,12 @@
name: '缁撶畻瀹℃牳',
},
emits: {
- onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role.id),
+ onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role.id, 'settlement'),
},
- // 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' },
@@ -433,17 +433,18 @@
});
function openSettleMethodDialog(row: API.GetSettlementTasksQueryResultItem) {
- handleSettlMethodAdd({
- id: row.id,
- settlementAccess: '' as any as EnumEnterpriseWalletAccess,
- });
+ // handleSettlMethodAdd({
+ // id: row.id,
+ // settlementAccess: '' as any as EnumEnterpriseWalletAccess,
+ // });
+ goDetail(row.id, 'settlement');
}
async function handleSettlMethod() {
- goDetail(settlMethodEditForm.id, 'settlement', settlMethodEditForm.settlementAccess);
+ goDetail(settlMethodEditForm.id, 'settlement');
}
-function goDetail(id: string, settlement?: string, settlementAccess?: EnumEnterpriseWalletAccess) {
+function goDetail(id: string, settlement?: string) {
router.push({
name: 'ServiceChargeDetail',
params: {
@@ -451,7 +452,7 @@
},
query: {
settlement: settlement ? settlement : '',
- settlementAccess: settlementAccess ? settlementAccess : '',
+ // settlementAccess: settlementAccess ? settlementAccess : '',
},
});
}
@@ -466,18 +467,4 @@
'缁撶畻鍗曟ā鏉�'
);
}
-
-const {
- dialogProps: dialogSettleInfoProps,
- handleEdit: handleSettleInfoEdit,
- editForm: settleInfoEditForm,
-} = useFormDialog({
- onConfirm: handleSettleInfo,
- defaultFormParams: {
- id: '',
- actualSettlementAmount: 0,
- },
-});
-
-async function handleSettleInfo() {}
</script>
--
Gitblit v1.9.1