From 9b8c27edd8942f84da68c36d9292e14e5f93cc14 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 15 五月 2025 14:06:14 +0800
Subject: [PATCH] Merge branch 'dev-3.4.5' of http://120.26.58.240:8888/r/12333GovernmentWeb into dev-3.4.5
---
src/views/EnterpriseInfo/EnterpriseInfo.vue | 118 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 89 insertions(+), 29 deletions(-)
diff --git a/src/views/EnterpriseInfo/EnterpriseInfo.vue b/src/views/EnterpriseInfo/EnterpriseInfo.vue
index 304f063..09d00de 100644
--- a/src/views/EnterpriseInfo/EnterpriseInfo.vue
+++ b/src/views/EnterpriseInfo/EnterpriseInfo.vue
@@ -5,7 +5,7 @@
<template #query>
<QueryFilterItem tip-content="鏈�杩戠敵鎶ユ棩鏈�">
<FieldDatePicker
- v-model="extraParamState.date"
+ v-model="extraParamState.lastApplyTime"
type="daterange"
range-separator="~"
start-placeholder="寮�濮嬫棩鏈�"
@@ -14,9 +14,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 +38,7 @@
</QueryFilterItem>
<QueryFilterItem>
<SearchInput
- v-model="extraParamState.keyword"
+ v-model="extraParamState.keywords"
style="width: 300px"
placeholder="浼佷笟鍚�/缁熶竴淇＄敤浠ｇ爜"
@on-click-search="getList"
@@ -57,9 +68,10 @@
} from '@bole-core/components';
import { OrderInputType } from '@bole-core/core';
import { format } from '@/utils';
-import * as informationServices from '@/services/api/Information';
+import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
import _ from 'lodash';
import { ModelValueType } from 'element-plus';
+import { EnterpriseTypeText } from '@/constants';
defineOptions({
name: 'EnterpriseInfo',
@@ -68,58 +80,87 @@
const column: API.CustomModuleColumnDto[] = [
{
id: '1',
- enCode: 'changeFlag',
+ enCode: 'enterpriseName',
name: '浼佷笟鍚�',
+ width: 250,
},
{
id: '2',
- enCode: 'name',
+ enCode: 'societyCreditCode',
name: '缁熶竴绀句細淇＄敤浠ｇ爜',
+ width: 200,
},
{
id: '3',
- enCode: 'idNumber',
+ enCode: 'enterpriseType',
name: '浼佷笟绫诲瀷',
+ width: 150,
},
{
id: '4',
- enCode: 'workType',
+ enCode: 'industrialParkName',
name: '鎵�灞炲洯鍖�',
+ width: 200,
},
{
id: '5',
- enCode: 'gender',
+ enCode: 'parkTypName',
name: '鍥尯绫诲瀷',
+ width: 150,
},
{
id: '6',
- enCode: 'age',
- name: '濂栧姳閲戠敵鎶ユ鏁�',
+ enCode: 'applyCount',
+ name: '鐢虫姤娆℃暟',
+ width: 150,
},
{
id: '7',
- enCode: 'birthDay',
+ enCode: 'lastApplyTime',
name: '鏈�杩戠敵鎶ユ棩鏈�',
+ width: 180,
},
{
id: '8',
- enCode: 'phoneNumber',
- name: '濂栧姳閲戝彂鏀炬鏁�',
+ enCode: 'financeCount',
+ name: '璐㈡斂鎷ㄤ粯娆℃暟',
+ width: 150,
},
{
id: '9',
- enCode: 'phoneNumber',
- name: '鏈�杩戝彂鏀炬棩鏈�',
+ enCode: 'lastFinanceTime',
+ name: '鏈�杩戞嫧浠樻棩鏈�',
+ width: 180,
},
{
id: '10',
- enCode: 'phoneNumber',
- name: '濂栧姳閲戝彂鏀炬�婚',
+ enCode: 'financeSumAmount',
+ name: '鎷ㄤ粯鎬婚',
+ width: 150,
},
{
id: '11',
- enCode: 'phoneNumber',
- name: '濂栧姳閲戜綑棰�',
+ enCode: 'settleCount',
+ name: '骞冲彴鍏呭�兼鏁�',
+ width: 150,
+ },
+ {
+ id: '12',
+ enCode: 'lastSettleTime',
+ name: '鏈�杩戝厖鍊兼棩鏈�',
+ width: 180,
+ },
+ {
+ id: '13',
+ enCode: 'settleSumAmount',
+ name: '鍏呭�兼�婚',
+ width: 150,
+ },
+ {
+ id: '14',
+ enCode: 'bountyAmount',
+ name: '骞冲彴鍏呭�间綑棰�',
+ width: 150,
},
];
@@ -156,16 +197,24 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let params: API.GetInformationForManageInput = {
+ let params: API.QueryParkCustomerManageInput = {
pageModel: {
rows: pageSize,
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'),
};
- let res = await informationServices.getInformationForManage(params, {
+ let res = await parkBountyApplyServices.getParkCustomerManagePage(params, {
showLoading: !state.loading,
});
return res;
@@ -173,14 +222,25 @@
},
{
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 }],
+ },
+ columnsRenderProps: {
+ lastApplyTime: { 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 },
},
}
);
-function goDetail(row: any) {
+function goDetail(row: API.GetParkCustomerManageOutput) {
router.push({
name: 'EnterpriseInfoDetail',
params: {
--
Gitblit v1.9.1