From 819e86bb37d0802d500fe6bc52343abda31c3315 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 31 十月 2025 09:19:09 +0800
Subject: [PATCH] feat: 1.3
---
src/views/ServiceChargeManage/ServiceChargeManage.vue | 88 ++++++++++++++++++++++----------------------
1 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue
index ceb3bee..1a80299 100644
--- a/src/views/ServiceChargeManage/ServiceChargeManage.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeManage.vue
@@ -47,7 +47,7 @@
<template #btn>
<!-- <el-button type="primary" link @click="handleDownloadTemplate()">缁撶畻鍗曟ā鏉�</el-button> -->
<!-- <el-button type="primary" @click="handleAdd()">涓婁紶缁撶畻鍗�</el-button> -->
- <!-- <el-button type="primary" @click="handleDownloadTemplate()">瀵煎嚭</el-button> -->
+ <el-button type="primary" @click="handleExport()">瀵煎嚭</el-button>
</template>
</ProTableQueryFilterBar>
<ProTableV2
@@ -160,48 +160,44 @@
{
data: {
enCode: 'settleBtn',
- name: '缁撶畻',
+ name: '缁撶畻纭',
},
emits: {
onClick: (role: API.GetSettlementTasksQueryResultItem) => openSettleMethodDialog(role),
},
extraProps: {
hide: (role: API.GetSettlementTasksQueryResultItem) =>
- !(
- role.settlementStatus === EnumTaskSettlementStatus.Wait &&
- role.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed
- ),
+ !(role.settlementStatus === EnumTaskSettlementStatus.Wait),
},
},
- {
- data: {
- enCode: 'recallBtn',
- name: '鎾ゅ洖',
- },
- emits: {
- onClick: (role) => handleRecall(role),
- },
- extraProps: {
- hide: (role: API.GetSettlementTasksQueryResultItem) =>
- !(
- role.settlementStatus === EnumTaskSettlementStatus.InProcess &&
- role.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed
- ),
- },
- },
- {
- data: {
- enCode: 'settleAuditBtn',
- name: '缁撶畻瀹℃牳',
- },
- emits: {
- onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role.id),
- },
- extraProps: {
- hide: (role: API.GetSettlementTasksQueryResultItem) =>
- role.auditStatus !== EnumTaskSettlementAuditStatus.Wait,
- },
- },
+ // {
+ // data: {
+ // enCode: 'recallBtn',
+ // name: '鎾ゅ洖',
+ // },
+ // emits: {
+ // onClick: (role) => handleRecall(role),
+ // },
+ // extraProps: {
+ // hide: (role: API.GetSettlementTasksQueryResultItem) =>
+ // !(
+ // role.settlementStatus === EnumTaskSettlementStatus.InProcess &&
+ // role.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed
+ // ),
+ // },
+ // },
+ // {
+ // data: {
+ // enCode: 'settleAuditBtn',
+ // name: '缁撶畻瀹℃牳',
+ // },
+ // emits: {
+ // onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role.id, 'settlement'),
+ // },
+ // extraProps: {
+ // hide: (role: API.GetSettlementTasksQueryResultItem) => role.auditStatus !== null,
+ // },
+ // },
{
data: {
enCode: 'detailBtn',
@@ -224,7 +220,9 @@
onClick: (role) => handleExport(role),
},
extraProps: {
- hide: () => true,
+ hide: (role: API.GetSettlementTasksQueryResultItem) =>
+ role.settlementStatus === EnumTaskSettlementStatus.Wait ||
+ role.settlementStatus === EnumTaskSettlementStatus.InProcess,
},
},
]);
@@ -295,6 +293,7 @@
settlementStatus: { type: 'enum', valueEnum: EnumTaskSettlementStatusText },
checkReceiveStatus: { type: 'enum', valueEnum: EnumTaskCheckReceiveStatusText },
auditStatus: { type: 'enum', valueEnum: EnumTaskSettlementAuditStatusText },
+ settlementAccess: { type: 'enum', valueEnum: EnumEnterpriseWalletAccessText },
actualSettlementAmount: { type: 'money' },
settlementAmount: { type: 'money' },
settlementTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
@@ -433,17 +432,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,12 +451,12 @@
},
query: {
settlement: settlement ? settlement : '',
- settlementAccess: settlementAccess ? settlementAccess : '',
+ // settlementAccess: settlementAccess ? settlementAccess : '',
},
});
}
-function handleExport(val) {
+function handleExport(val?) {
console.log('val: ', val);
}
--
Gitblit v1.9.1