From 8fad5b05aa4d6d4a46b3bc04f2ab9614be73ba99 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 23 九月 2025 17:19:06 +0800
Subject: [PATCH] fix: bug
---
src/views/ServiceChargeManage/ServiceChargeManage.vue | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue
index c85f0b2..3b2dee5 100644
--- a/src/views/ServiceChargeManage/ServiceChargeManage.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeManage.vue
@@ -3,10 +3,10 @@
<AppContainer>
<ProTableQueryFilterBar @on-reset="reset">
<template #query>
- <QueryFilterItem tip-content="缁撶畻鍗曠姸鎬�">
+ <QueryFilterItem tip-content="楠屾敹鐘舵��">
<FieldRadio
- v-model="extraParamState.settlementOrderStatus"
- :value-enum="EnumTaskSettlementOrderStatusText"
+ v-model="extraParamState.checkReceiveStatus"
+ :value-enum="EnumTaskCheckReceiveStatusTextForFilter"
buttonStyle
showAllBtn
@change="getList()"
@@ -38,15 +38,15 @@
v-model="extraParamState.keywords"
style="width: 250px"
placeholder="浠诲姟鍚嶇О"
- @on-click-search="getList"
+ @on-click-search="getList()"
@keyup.enter="getList()"
>
</SearchInput>
</QueryFilterItem>
</template>
<template #btn>
- <el-button type="primary" link @click="handleDownloadTemplate()">缁撶畻鍗曟ā鏉�</el-button>
- <el-button type="primary" @click="handleAdd()">涓婁紶缁撶畻鍗�</el-button>
+ <!-- <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> -->
</template>
</ProTableQueryFilterBar>
@@ -115,6 +115,9 @@
EnumTaskSettlementOrderStatusText,
EnumTaskSettlementOrderStatus,
EnumTaskSettlementStatus,
+ EnumTaskCheckReceiveStatusText,
+ EnumTaskCheckReceiveStatusTextForFilter,
+ EnumTaskCheckReceiveStatus,
} from '@/constants';
import { downloadFileByUrl, format, setOssFileName } from '@/utils';
import * as taskServices from '@/services/api/task';
@@ -163,8 +166,8 @@
extraProps: {
hide: (role: API.GetSettlementTasksQueryResultItem) =>
!(
- role.settlementOrderStatus === EnumTaskSettlementOrderStatus.Completed &&
- role.settlementStatus === EnumTaskSettlementStatus.Wait
+ role.settlementStatus === EnumTaskSettlementStatus.Wait &&
+ role.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed
),
},
},
@@ -179,8 +182,8 @@
extraProps: {
hide: (role: API.GetSettlementTasksQueryResultItem) =>
!(
- role.settlementOrderStatus === EnumTaskSettlementOrderStatus.Completed &&
- role.settlementStatus === EnumTaskSettlementStatus.InProcess
+ role.settlementStatus === EnumTaskSettlementStatus.InProcess &&
+ role.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed
),
},
},
@@ -248,7 +251,7 @@
orderInput: extraParamState.orderInput,
},
keywords: extraParamState.keywords,
- settlementOrderStatus: extraParamState.settlementOrderStatus,
+ checkReceiveStatus: extraParamState.checkReceiveStatus,
settlementStatus: extraParamState.settlementStatus,
settlementTimeBegin: format(extraParamState.time?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
settlementTimeEnd: format(extraParamState.time?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
@@ -266,6 +269,7 @@
defaultExtraParams: {
keywords: '',
settlementOrderStatus: '' as any as EnumTaskSettlementOrderStatus,
+ checkReceiveStatus: '' as any as EnumTaskCheckReceiveStatus,
settlementStatus: '' as any as EnumTaskSettlementStatus,
time: [] as unknown as ModelValueType,
orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
--
Gitblit v1.9.1