From 48c58fdd8b91d662d99bb4c87826bceb22df6e9b Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 15 五月 2025 09:49:07 +0800
Subject: [PATCH] fix: bug
---
src/views/EnterpriseInfo/EnterpriseInfo.vue | 58 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 10 deletions(-)
diff --git a/src/views/EnterpriseInfo/EnterpriseInfo.vue b/src/views/EnterpriseInfo/EnterpriseInfo.vue
index 15235f9..09d00de 100644
--- a/src/views/EnterpriseInfo/EnterpriseInfo.vue
+++ b/src/views/EnterpriseInfo/EnterpriseInfo.vue
@@ -14,9 +14,20 @@
@change="getList()"
></FieldDatePicker>
</QueryFilterItem>
- <QueryFilterItem tip-content="鏈�杩戝彂鏀炬棩鏈�">
+ <QueryFilterItem tip-content="鏈�杩戞嫧浠樻棩鏈�">
<FieldDatePicker
v-model="extraParamState.lastPayTime"
+ type="daterange"
+ range-separator="~"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ clearable
+ @change="getList()"
+ ></FieldDatePicker>
+ </QueryFilterItem>
+ <QueryFilterItem tip-content="鏈�杩戝厖鍊兼棩鏈�">
+ <FieldDatePicker
+ v-model="extraParamState.lastSettleTime"
type="daterange"
range-separator="~"
start-placeholder="寮�濮嬫棩鏈�"
@@ -100,7 +111,7 @@
{
id: '6',
enCode: 'applyCount',
- name: '濂栧姳閲戠敵鎶ユ鏁�',
+ name: '鐢虫姤娆℃暟',
width: 150,
},
{
@@ -111,26 +122,44 @@
},
{
id: '8',
- enCode: 'payCount',
- name: '濂栧姳閲戝彂鏀炬鏁�',
+ enCode: 'financeCount',
+ name: '璐㈡斂鎷ㄤ粯娆℃暟',
width: 150,
},
{
id: '9',
- enCode: 'lastPayTime',
- name: '鏈�杩戝彂鏀炬棩鏈�',
+ enCode: 'lastFinanceTime',
+ name: '鏈�杩戞嫧浠樻棩鏈�',
width: 180,
},
{
id: '10',
- enCode: 'bountyAmount',
- name: '濂栧姳閲戝彂鏀炬�婚',
+ enCode: 'financeSumAmount',
+ name: '鎷ㄤ粯鎬婚',
width: 150,
},
{
id: '11',
+ enCode: 'settleCount',
+ name: '骞冲彴鍏呭�兼鏁�',
+ width: 150,
+ },
+ {
+ id: '12',
+ enCode: 'lastSettleTime',
+ name: '鏈�杩戝厖鍊兼棩鏈�',
+ width: 180,
+ },
+ {
+ id: '13',
+ enCode: 'settleSumAmount',
+ name: '鍏呭�兼�婚',
+ width: 150,
+ },
+ {
+ id: '14',
enCode: 'bountyAmount',
- name: '濂栧姳閲戜綑棰�',
+ name: '骞冲彴鍏呭�间綑棰�',
width: 150,
},
];
@@ -179,6 +208,11 @@
lastApplyEndTime: format(extraParamState.lastApplyTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
lastPayBeginTime: format(extraParamState.lastPayTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
lastPayEndTime: format(extraParamState.lastPayTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
+ lastSettleBeginTime: format(
+ extraParamState.lastSettleTime?.[0] ?? '',
+ 'YYYY-MM-DD 00:00:00'
+ ),
+ lastSettleEndTime: format(extraParamState.lastSettleTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
};
let res = await parkBountyApplyServices.getParkCustomerManagePage(params, {
showLoading: !state.loading,
@@ -191,11 +225,15 @@
keywords: '',
lastApplyTime: [] as unknown as ModelValueType,
lastPayTime: [] as unknown as ModelValueType,
+ lastSettleTime: [] as unknown as ModelValueType,
orderInput: [{ property: 'id', order: OrderInputType.Desc }],
},
columnsRenderProps: {
lastApplyTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
- lastPayTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+ lastFinanceTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+ financeSumAmount: { type: 'money' },
+ lastSettleTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+ settleSumAmount: { type: 'money' },
bountyAmount: { type: 'money' },
enterpriseType: { type: 'enum', valueEnum: EnterpriseTypeText },
},
--
Gitblit v1.9.1