From ccc59ace343de3ecdf2ca7c4d82966faaf3b32e7 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 14 十一月 2025 19:58:50 +0800
Subject: [PATCH] fix: bug

---
 src/views/EnterpriseInfo/EnterpriseInfo.vue |   99 ++++++++++++++-----------------------------------
 1 files changed, 29 insertions(+), 70 deletions(-)

diff --git a/src/views/EnterpriseInfo/EnterpriseInfo.vue b/src/views/EnterpriseInfo/EnterpriseInfo.vue
index 18c0482..46bd33c 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="寮�濮嬫棩鏈�"
@@ -61,80 +72,19 @@
 import _ from 'lodash';
 import { ModelValueType } from 'element-plus';
 import { EnterpriseTypeText } from '@/constants';
+import { useAccess } from '@/hooks';
 
 defineOptions({
   name: 'EnterpriseInfo',
 });
 
-const column: API.CustomModuleColumnDto[] = [
-  {
-    id: '1',
-    enCode: 'enterpriseName',
-    name: '浼佷笟鍚�',
-  },
-  {
-    id: '2',
-    enCode: 'societyCreditCode',
-    name: '缁熶竴绀句細淇＄敤浠ｇ爜',
-  },
-  {
-    id: '3',
-    enCode: 'enterpriseType',
-    name: '浼佷笟绫诲瀷',
-  },
-  {
-    id: '4',
-    enCode: 'industrialParkName',
-    name: '鎵�灞炲洯鍖�',
-  },
-  {
-    id: '5',
-    enCode: 'parkTypName',
-    name: '鍥尯绫诲瀷',
-  },
-  {
-    id: '6',
-    enCode: 'applyCount',
-    name: '濂栧姳閲戠敵鎶ユ鏁�',
-  },
-  {
-    id: '7',
-    enCode: 'lastApplyTime',
-    name: '鏈�杩戠敵鎶ユ棩鏈�',
-  },
-  {
-    id: '8',
-    enCode: 'payCount',
-    name: '濂栧姳閲戝彂鏀炬鏁�',
-  },
-  {
-    id: '9',
-    enCode: 'lastPayTime',
-    name: '鏈�杩戝彂鏀炬棩鏈�',
-  },
-  {
-    id: '10',
-    enCode: 'bountyAmount',
-    name: '濂栧姳閲戝彂鏀炬�婚',
-  },
-  {
-    id: '11',
-    enCode: 'bountyAmount',
-    name: '濂栧姳閲戜綑棰�',
-  },
-];
+const operationBtnMap: Record<string, OperationBtnType> = {
+  detailBtn: { emits: { onClick: (role) => goDetail(role) } },
+};
 
-const operationBtns = defineOperationBtns([
-  {
-    data: {
-      enCode: 'detailBtn',
-      name: '璇︽儏',
-    },
-    emits: {
-      onClick: (role) => goDetail(role),
-    },
-  },
-]);
+const { checkSubModuleItemShow, column, operationBtns } = useAccess({
+  operationBtnMap,
+});
 
 const router = useRouter();
 const BaseState = {
@@ -168,6 +118,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,11 +135,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