From 852c9a7af36bcffb0c37cea6224c5391b5eac398 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 23 十月 2025 22:30:37 +0800
Subject: [PATCH] fix: bug
---
src/views/ServiceChargeManage/ServiceChargeManage.vue | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue
index 5a65c24..2d3ee4c 100644
--- a/src/views/ServiceChargeManage/ServiceChargeManage.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeManage.vue
@@ -6,7 +6,7 @@
<QueryFilterItem tip-content="楠屾敹鐘舵��">
<FieldRadio
v-model="extraParamState.checkReceiveStatus"
- :value-enum="EnumTaskCheckReceiveStatusText"
+ :value-enum="EnumTaskCheckReceiveStatusTextForFilter"
buttonStyle
showAllBtn
@change="getList()"
@@ -88,8 +88,9 @@
</ProTableV2>
</AppContainer>
<UploadStatementDialog v-bind="dialogProps" />
- <SettleDetailDialog v-bind="dialogSettleProps" />
+ <!-- <SettleDetailDialog v-bind="dialogSettleProps" /> -->
<RechargeEnterpriseWalletDialog v-bind="dialogRechargeProps" />
+ <SettlMethodDialog v-bind="dialogSettlMethodProps" />
</LoadingLayout>
</template>
@@ -116,6 +117,7 @@
EnumTaskSettlementOrderStatus,
EnumTaskSettlementStatus,
EnumTaskCheckReceiveStatusText,
+ EnumTaskCheckReceiveStatusTextForFilter,
EnumTaskCheckReceiveStatus,
} from '@/constants';
import { downloadFileByUrl, format, setOssFileName } from '@/utils';
@@ -123,6 +125,7 @@
import { ModelValueType } from 'element-plus';
import UploadStatementDialog from './components/UploadStatementDialog.vue';
import SettleDetailDialog from './components/SettleDetailDialog.vue';
+import SettlMethodDialog from './components/SettlMethodDialog.vue';
import RechargeEnterpriseWalletDialog from './components/RechargeEnterpriseWalletDialog.vue';
import { Message } from '@bole-core/core';
@@ -160,7 +163,7 @@
name: '缁撶畻',
},
emits: {
- onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role, 'settlement'),
+ onClick: (role: API.GetSettlementTasksQueryResultItem) => openSettleMethodDialog(role),
},
extraProps: {
hide: (role: API.GetSettlementTasksQueryResultItem) =>
@@ -186,13 +189,25 @@
),
},
},
+ // {
+ // data: {
+ // enCode: 'settleAuditBtn',
+ // name: '缁撶畻瀹℃牳',
+ // },
+ // emits: {
+ // onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role.id, 'settlement'),
+ // },
+ // extraProps: {
+ // hide: (role: API.GetSettlementTasksQueryResultItem) => role.auditStatus !== null,
+ // },
+ // },
{
data: {
enCode: 'detailBtn',
name: '璇︽儏',
},
emits: {
- onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role),
+ onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role.id),
},
// extraProps: {
// hide: (role: API.GetSettlementTasksQueryResultItem) =>
@@ -278,6 +293,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' },
@@ -403,14 +419,39 @@
editForm.settlementUrl = [] as UploadUserFile[];
}
-function goDetail(row: API.GetSettlementTasksQueryResultItem, settlement?: string) {
+const {
+ dialogProps: dialogSettlMethodProps,
+ handleAdd: handleSettlMethodAdd,
+ editForm: settlMethodEditForm,
+} = useFormDialog({
+ onConfirm: handleSettlMethod,
+ defaultFormParams: {
+ id: '',
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
+ },
+});
+
+function openSettleMethodDialog(row: API.GetSettlementTasksQueryResultItem) {
+ // handleSettlMethodAdd({
+ // id: row.id,
+ // settlementAccess: '' as any as EnumEnterpriseWalletAccess,
+ // });
+ goDetail(row.id, 'settlement');
+}
+
+async function handleSettlMethod() {
+ goDetail(settlMethodEditForm.id, 'settlement');
+}
+
+function goDetail(id: string, settlement?: string) {
router.push({
name: 'ServiceChargeDetail',
params: {
- id: row?.id ?? '',
+ id: id ?? '',
},
query: {
settlement: settlement ? settlement : '',
+ // settlementAccess: settlementAccess ? settlementAccess : '',
},
});
}
--
Gitblit v1.9.1