From 4fd5e066abffcb2474b55d1bd2103fbe619be24c Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 18 九月 2025 17:08:42 +0800
Subject: [PATCH] fix: bug
---
src/views/ServiceChargeManage/constants/columns.ts | 10 +++++-----
src/services/api/typings.d.ts | 3 ++-
src/views/ServiceChargeManage/ServiceChargeManage.vue | 11 +++++++----
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index bde91c4..46326ce 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -4403,6 +4403,7 @@
keywords?: string;
settlementOrderStatus?: EnumTaskSettlementOrderStatus;
settlementStatus?: EnumTaskSettlementStatus;
+ checkReceiveStatus?: EnumTaskCheckReceiveStatus;
/** 缁撶畻鏃堕棿-璧峰 */
settlementTimeBegin?: string;
/** 缁撶畻鏃堕棿-鎴 */
@@ -5128,7 +5129,7 @@
contactPhoneNumber?: string;
/** 鎵�灞為摱琛� */
bank?: string;
- /** 寮�鎴锋敮琛屽悕绉� */
+ /** 鎵�灞炴敮琛� */
bankBranch?: string;
/** 鏀舵璐︽埛 */
receiveAccount?: string;
diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue
index be4341d..5a65c24 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="EnumTaskCheckReceiveStatusText"
buttonStyle
showAllBtn
@change="getList()"
@@ -115,6 +115,8 @@
EnumTaskSettlementOrderStatusText,
EnumTaskSettlementOrderStatus,
EnumTaskSettlementStatus,
+ EnumTaskCheckReceiveStatusText,
+ EnumTaskCheckReceiveStatus,
} from '@/constants';
import { downloadFileByUrl, format, setOssFileName } from '@/utils';
import * as taskServices from '@/services/api/task';
@@ -248,7 +250,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 +268,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 }],
diff --git a/src/views/ServiceChargeManage/constants/columns.ts b/src/views/ServiceChargeManage/constants/columns.ts
index 0c3f24a..a7005c6 100644
--- a/src/views/ServiceChargeManage/constants/columns.ts
+++ b/src/views/ServiceChargeManage/constants/columns.ts
@@ -16,11 +16,11 @@
enCode: 'checkReceiveStatus',
name: '楠屾敹鐘舵��',
},
- {
- id: '4',
- enCode: 'settlementOrderStatus',
- name: '缁撶畻鍗曠姸鎬�',
- },
+ // {
+ // id: '4',
+ // enCode: 'settlementOrderStatus',
+ // name: '缁撶畻鍗曠姸鎬�',
+ // },
{
id: '5',
enCode: 'settlementOrderName',
--
Gitblit v1.9.1