From fc6bbae5805da6c95fd675210999a03802cd62ad Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 23 十月 2025 15:39:12 +0800
Subject: [PATCH] fix: 数据看板

---
 src/views/EnterpriseInfo/EnterpriseInfo.vue |   73 ++++++++++++++++++++++++++++++------
 1 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/src/views/EnterpriseInfo/EnterpriseInfo.vue b/src/views/EnterpriseInfo/EnterpriseInfo.vue
index d061b89..bfe6b5c 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="寮�濮嬫棩鏈�"
@@ -60,7 +71,7 @@
 import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
 import _ from 'lodash';
 import { ModelValueType } from 'element-plus';
-import { AuthTypeText } from '@/constants';
+import { EnterpriseTypeText } from '@/constants';
 
 defineOptions({
   name: 'EnterpriseInfo',
@@ -71,56 +82,85 @@
     id: '1',
     enCode: 'enterpriseName',
     name: '浼佷笟鍚�',
+    width: 250,
   },
   {
     id: '2',
     enCode: 'societyCreditCode',
     name: '缁熶竴绀句細淇＄敤浠ｇ爜',
+    width: 200,
   },
   {
     id: '3',
     enCode: 'enterpriseType',
     name: '浼佷笟绫诲瀷',
+    width: 150,
   },
   {
     id: '4',
     enCode: 'industrialParkName',
     name: '鎵�灞炲洯鍖�',
+    width: 200,
   },
   {
     id: '5',
     enCode: 'parkTypName',
     name: '鍥尯绫诲瀷',
+    width: 150,
   },
   {
     id: '6',
     enCode: 'applyCount',
-    name: '濂栧姳閲戠敵鎶ユ鏁�',
+    name: '鐢虫姤娆℃暟',
+    width: 150,
   },
   {
     id: '7',
     enCode: 'lastApplyTime',
     name: '鏈�杩戠敵鎶ユ棩鏈�',
+    width: 180,
   },
   {
     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,
   },
 ];
 
@@ -168,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,
@@ -180,13 +225,17 @@
       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: AuthTypeText },
+      enterpriseType: { type: 'enum', valueEnum: EnterpriseTypeText },
     },
   }
 );

--
Gitblit v1.9.1