From 8feaba218a5ce22e92214e4c9082faf59b25c885 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 20 十一月 2025 09:20:35 +0800
Subject: [PATCH] fix: bug
---
src/views/EnterpriseInfo/EnterpriseInfo.vue | 141 ++++++++++++++++++++---------------------------
1 files changed, 60 insertions(+), 81 deletions(-)
diff --git a/src/views/EnterpriseInfo/EnterpriseInfo.vue b/src/views/EnterpriseInfo/EnterpriseInfo.vue
index 0f8a514..8de223a 100644
--- a/src/views/EnterpriseInfo/EnterpriseInfo.vue
+++ b/src/views/EnterpriseInfo/EnterpriseInfo.vue
@@ -3,9 +3,20 @@
<AppContainer>
<ProTableQueryFilterBar @on-reset="reset">
<template #query>
+ <QueryFilterItem>
+ <FieldSelect
+ v-model="extraParamState.industrialParkId"
+ placeholder="璇烽�夋嫨鍥尯"
+ :value-enum="fourStreamsIndustrialParkList"
+ enumLabelKey="parkName"
+ enum-value-key="id"
+ clearable
+ @change="getList()"
+ />
+ </QueryFilterItem>
<QueryFilterItem tip-content="鏈�杩戠敵鎶ユ棩鏈�">
<FieldDatePicker
- v-model="extraParamState.date"
+ v-model="extraParamState.lastApplyTime"
type="daterange"
range-separator="~"
start-placeholder="寮�濮嬫棩鏈�"
@@ -14,9 +25,20 @@
@change="getList()"
></FieldDatePicker>
</QueryFilterItem>
- <QueryFilterItem tip-content="鏈�杩戝彂鏀炬棩鏈�">
+ <QueryFilterItem tip-content="鏈�杩戣储鏀挎嫧浠樻棩鏈�">
<FieldDatePicker
- v-model="extraParamState.date"
+ 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="寮�濮嬫棩鏈�"
@@ -27,7 +49,7 @@
</QueryFilterItem>
<QueryFilterItem>
<SearchInput
- v-model="extraParamState.keyword"
+ v-model="extraParamState.keywords"
style="width: 300px"
placeholder="浼佷笟鍚�/缁熶竴淇＄敤浠ｇ爜"
@on-click-search="getList"
@@ -54,87 +76,27 @@
SearchInput,
QueryFilterItem,
FieldDatePicker,
+ FieldSelect,
} from '@bole-core/components';
import { OrderInputType } from '@bole-core/core';
import { format } from '@/utils';
import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
import _ from 'lodash';
import { ModelValueType } from 'element-plus';
-import { AuthTypeText } from '@/constants';
+import { EnterpriseTypeText } from '@/constants';
+import { useAccess, useIndustrialParkDropDownList } 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 = {
@@ -142,6 +104,8 @@
};
const state = reactive({ ...BaseState });
+
+const { fourStreamsIndustrialParkList } = useIndustrialParkDropDownList();
onMounted(async () => {
await getList();
@@ -163,8 +127,17 @@
page: pageIndex,
orderInput: extraParamState.orderInput,
},
- publishStartDate: format(extraParamState.date?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
- publishEndDate: format(extraParamState.date?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
+ keywords: extraParamState.keywords,
+ lastApplyBeginTime: format(extraParamState.lastApplyTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
+ 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'),
+ industrialParkId: extraParamState.industrialParkId,
};
let res = await parkBountyApplyServices.getParkCustomerManagePage(params, {
showLoading: !state.loading,
@@ -174,20 +147,26 @@
},
{
defaultExtraParams: {
- keyword: '',
- date: [] as unknown as ModelValueType,
- orderInput: [{ property: 'creationTime', order: OrderInputType.Desc }],
+ keywords: '',
+ lastApplyTime: [] as unknown as ModelValueType,
+ lastPayTime: [] as unknown as ModelValueType,
+ lastSettleTime: [] as unknown as ModelValueType,
+ orderInput: [{ property: 'id', order: OrderInputType.Desc }],
+ industrialParkId: '',
},
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 },
},
}
);
-function goDetail(row: any) {
+function goDetail(row: API.GetParkCustomerManageOutput) {
router.push({
name: 'EnterpriseInfoDetail',
params: {
--
Gitblit v1.9.1