From 065acdf5fd02cab9ef1f7be460a5b0776d996532 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 17 十一月 2025 17:49:23 +0800
Subject: [PATCH] fix: s
---
src/views/MaterialReview/MaterialReview.vue | 27 +++++
src/views/Reward/WithdrawalApproval.vue | 18 +++
src/views/MaterialReview/MaterialReReviewList.vue | 27 +++++
src/services/api/typings.d.ts | 97 +++++++++++++++++++
src/views/Reward/RewardApplyTradeCheck.vue | 8 -
src/services/api/IndustrialPark.ts | 53 ++++++++++
src/views/EnterpriseInfo/EnterpriseInfo.vue | 18 +++
src/views/Reward/components/RewardApplyTradeCheckDialog.vue | 24 ++--
src/views/Reward/FinancialApproval.vue | 2
src/services/api/BaseModuleNew.ts | 6
src/services/api/EnterpriseApplyFile.ts | 4
src/hooks/industrialPark.ts | 6 +
12 files changed, 264 insertions(+), 26 deletions(-)
diff --git a/src/hooks/industrialPark.ts b/src/hooks/industrialPark.ts
index f03b60c..d32c100 100644
--- a/src/hooks/industrialPark.ts
+++ b/src/hooks/industrialPark.ts
@@ -10,6 +10,11 @@
placeholderData: () => [] as API.IndustrialParkDropDownOutput[],
});
+ /**濂栧姳閲戝洯鍖� */
+ const fourStreamsIndustrialParkList = computed(() => {
+ return industrialParkList.value.filter((x) => !!x.rewardEnable);
+ });
+
function getIndustrialParkById(industrialParkId: string) {
const industrialPark = industrialParkList.value.find((item) => item.id === industrialParkId);
return industrialPark;
@@ -38,5 +43,6 @@
getIndustrialParkById,
getIndustrialParkTypeNameById,
getIndustrialParkByName,
+ fourStreamsIndustrialParkList,
};
}
diff --git a/src/services/api/BaseModuleNew.ts b/src/services/api/BaseModuleNew.ts
index f07f8c8..b2812af 100644
--- a/src/services/api/BaseModuleNew.ts
+++ b/src/services/api/BaseModuleNew.ts
@@ -29,13 +29,13 @@
});
}
-/** 姝ゅ鍚庣娌℃湁鎻愪緵娉ㄩ噴 GET /api/BaseModuleNew/GetCurrentUserModuleListV2 */
+/** 姝ゅ鍚庣娌℃湁鎻愪緵娉ㄩ噴 POST /api/BaseModuleNew/GetCurrentUserModuleListV2 */
export async function getCurrentUserModuleListV2(
body: API.ModuleDtoV2,
options?: API.RequestConfig
) {
- return request<number>('/api/BaseModuleNew/GetCurrentUserModuleListV2', {
- method: 'GET',
+ return request<API.ModuleDtoV2[]>('/api/BaseModuleNew/GetCurrentUserModuleListV2', {
+ method: 'POST',
headers: {
'Content-Type': 'application/json',
},
diff --git a/src/services/api/EnterpriseApplyFile.ts b/src/services/api/EnterpriseApplyFile.ts
index 68c201a..fe47c5f 100644
--- a/src/services/api/EnterpriseApplyFile.ts
+++ b/src/services/api/EnterpriseApplyFile.ts
@@ -34,7 +34,7 @@
/** 纭鎻愪氦鏉愭枡涓婁紶V2 POST /api/EnterpriseApplyFile/CustomerUploadMonthApplyFileV2 */
export async function customerUploadMonthApplyFileV2(
- body: API.CustomerUploadMonthApplyFileInput,
+ body: API.CustomerUploadMonthApplyFileV2Input,
options?: API.RequestConfig
) {
return request<number>('/api/EnterpriseApplyFile/CustomerUploadMonthApplyFileV2', {
@@ -136,7 +136,7 @@
body: API.GetCustomerUploadApplyFilesInput,
options?: API.RequestConfig
) {
- return request<API.GetCustomerUploadApplyFilesResponse>(
+ return request<API.GetCustomerUploadApplyFilesV2Response>(
'/api/EnterpriseApplyFile/GetCustomerUploadApplyFilesV2',
{
method: 'POST',
diff --git a/src/services/api/IndustrialPark.ts b/src/services/api/IndustrialPark.ts
index a30b7cd..2f0af63 100644
--- a/src/services/api/IndustrialPark.ts
+++ b/src/services/api/IndustrialPark.ts
@@ -17,12 +17,50 @@
});
}
+/** 鏂板浜т笟鍥尯V2 POST /api/IndustrialPark/AddIndustrialParkV2 */
+export async function addIndustrialParkV2(
+ body: API.AddIndustrialParkInput,
+ options?: API.RequestConfig
+) {
+ return request<number>('/api/IndustrialPark/AddIndustrialParkV2', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
+/** 閮ㄩ棬鏁版嵁杞Щ POST /api/IndustrialPark/DepartmentDataTransfer */
+export async function departmentDataTransfer(options?: API.RequestConfig) {
+ return request<number>('/api/IndustrialPark/DepartmentDataTransfer', {
+ method: 'POST',
+ ...(options || {}),
+ });
+}
+
/** 鑾峰彇浜т笟鍥尯淇℃伅璇︽儏 POST /api/IndustrialPark/GetIndustrialParkDetail */
export async function getIndustrialParkDetail(
body: API.QueryIndustrialParkDetailInput,
options?: API.RequestConfig
) {
return request<API.IndustrialParkDetailOutput>('/api/IndustrialPark/GetIndustrialParkDetail', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
+/** 鑾峰彇浜т笟鍥尯淇℃伅璇︽儏V2 POST /api/IndustrialPark/GetIndustrialParkDetailV2 */
+export async function getIndustrialParkDetailV2(
+ body: API.QueryIndustrialParkDetailInput,
+ options?: API.RequestConfig
+) {
+ return request<API.IndustrialParkDetailOutput>('/api/IndustrialPark/GetIndustrialParkDetailV2', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
@@ -105,3 +143,18 @@
...(options || {}),
});
}
+
+/** 鏇存柊浜т笟鍥尯V2 POST /api/IndustrialPark/UpdateIndustrialParkV2 */
+export async function updateIndustrialParkV2(
+ body: API.UpdateIndustrialParkInput,
+ options?: API.RequestConfig
+) {
+ return request<number>('/api/IndustrialPark/UpdateIndustrialParkV2', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 0dbdc97..a324258 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -252,6 +252,12 @@
industrialParkApplyFileFile?: IndustrialParkApplyFileFile[];
/** 鏃犻渶鏀垮姟绔鏍� */
notNeedGovernmentAudit?: boolean;
+ /** 鏃犻渶杩愯惀绔鏍� */
+ noNeedForOperationalReview?: boolean;
+ /** 鏀垮姟绔弻閲嶅鏍� */
+ dualReviewOfGovernmentAffairs?: boolean;
+ /** 鍏徃淇℃伅 */
+ industrialParkCompanyFile?: IndustrialParkCompanyFile[];
}
interface AddIndustryBodyAuditInput {
@@ -4238,8 +4244,6 @@
batchUpdateMessage?: boolean;
/** 瀵嗙爜 */
password?: string;
- /** 涓昏处鍙风敤鎴疯处鍙� */
- subAccountCreator?: string;
}
interface CreateGoverUserInput {
@@ -5313,6 +5317,8 @@
incomeBankCardNumber?: string;
/** 寮�鎴疯 */
incomeBankName?: string;
+ /** 鎶曚繚浜烘暟 */
+ insurePeopleNum?: number;
enterpriseId?: string;
selfAuditStatus?: EnumParkBountyTradeDetailAuditStatus;
auditType?: EnumParkBountyTradeDetailAuditType;
@@ -5774,6 +5780,7 @@
registTime?: string;
/** 澶囨敞 */
remark?: string;
+ industrialParkCompanyList?: IndustrialParkCompanyOutput[];
}
interface CustomerManageListOutputPageOutput {
@@ -5841,14 +5848,31 @@
}
interface CustomerUploadMonthApplyFileTypeDto {
+ parkBountyApplyId?: string;
fileSearchTypeId?: string;
id?: string;
+ enterpriseId?: string;
fileSearchTypeName?: string;
fileType?: string;
fileSize?: number;
fileUrl?: string;
sort?: number;
creationTime?: string;
+ searchType?: number;
+ }
+
+ interface CustomerUploadMonthApplyFileV2Input {
+ withMonth?: string;
+ /** 鐢虫姤閲戦 */
+ applyAmount?: number;
+ fileTypes?: CustomerUploadMonthApplyFileType[];
+ enterpriseId?: string;
+ /** 鏄惁鏄繍钀ョ浠ｄ笂浼� */
+ isAdminFileUpload?: boolean;
+ /** 姹囨�绘潗鏂� */
+ bountyCollectFileTypeList?: CustomerUploadMonthApplyFileTypeDto[];
+ /** 姹囩畻鏉愭枡 */
+ bountyCollectCountFileTypeList?: CustomerUploadMonthApplyFileTypeDto[];
}
interface DataprepareCreateExtInfo {
@@ -6156,6 +6180,7 @@
interface EnterpriseApplyDrawWithInput {
amount?: number;
invoiceUrl?: string;
+ enterpriseId?: string;
}
interface EnterpriseBatchRefundInput {
@@ -7594,6 +7619,8 @@
outCheckTimeEnd?: string;
outCheckStatus?: BountyCheckStatusEnum;
inCheckStatus?: BountyCheckStatusEnum;
+ /** 鎵�灞炲洯鍖� */
+ industrialParkId?: string;
}
interface GetCustomersExportInput {
@@ -7705,6 +7732,23 @@
items?: GetCustomerUploadApplyFilesOutput[];
}
+ interface GetCustomerUploadApplyFilesV2Response {
+ /** 鎵�灞炴湀浠� */
+ withMonth?: string;
+ /** 浼佷笟鍚嶇О */
+ enterpriseName?: string;
+ /** 鐢虫姤閲戦 */
+ applyAmount?: number;
+ /** 鎵�灞炲洯鍖� */
+ parkName?: string;
+ /** 闄勪欢 */
+ items?: GetCustomerUploadApplyFilesOutput[];
+ /** 姹囨�绘潗鏂� */
+ bountyCollectFileTypeList?: GetCustomerUploadApplyFilesOutput[];
+ /** 姹囩畻鏉愭枡 */
+ bountyCollectCountFileTypeList?: GetCustomerUploadApplyFilesOutput[];
+ }
+
interface GetCustomerUploadFileRecordInput {
withMonth?: string;
userId?: string;
@@ -7782,6 +7826,8 @@
endDateTime?: string;
enterpriseId?: string;
checkStatus?: EnterpriseRechargeStatusEnum;
+ /** 鎵�灞炲洯鍖� */
+ industrialParkId?: string;
}
interface GetEnterpriseDrawWithListOutput {
@@ -7791,6 +7837,7 @@
societyCreditCode?: string;
creationTime?: string;
enterpriseType?: string;
+ parkId?: string;
parkName?: string;
parkType?: string;
amount?: number;
@@ -7848,6 +7895,8 @@
beginDateTime?: string;
endDateTime?: string;
checkStatus?: EnterpriseRechargeStatusEnum;
+ /** 鎵�灞炲洯鍖� */
+ industrialParkId?: string;
}
interface GetEnterprisePreChargeCheckListOutput {
@@ -7871,6 +7920,8 @@
checkStatus?: EnterpriseRechargeStatusEnum;
/** 瀹℃牳浜� */
checkOperator?: string;
+ /** 浜т笟鍥尯id */
+ industrialParkId?: string;
}
interface GetEnterprisePreChargeCheckListOutputPageOutput {
@@ -9251,6 +9302,8 @@
/** 澶栭儴澶嶅鏍哥粨鏉熸棩鏈� */
outReCheckTimeEnd?: string;
outReCheckStatus?: BountyCheckStatusEnum;
+ /** 鎵�灞炲洯鍖� */
+ industrialParkId?: string;
}
interface GetParkBountyApplyListOutput {
@@ -9354,6 +9407,8 @@
auditTimeBegin?: string;
/** 瀹℃牳缁撴潫鏃ユ湡 */
auditTimeEnd?: string;
+ /** 鎵�灞炲洯鍖� */
+ industrialParkId?: string;
/** 鍥尯Id */
parkId?: string;
enterpriseId?: string;
@@ -9420,6 +9475,8 @@
incomeBankCardNumber?: string;
/** 寮�鎴疯 */
incomeBankName?: string;
+ /** 鎶曚繚浜烘暟 */
+ insurePeopleNum?: number;
creationTime?: string;
selfAuditStatus?: EnumParkBountyTradeDetailAuditStatus;
/** 浼佷笟鑷韩鍑鸿处瀹℃牳澶囨敞 */
@@ -9467,6 +9524,8 @@
auditTimeBegin?: string;
/** 瀹℃牳缁撴潫鏃ユ湡 */
auditTimeEnd?: string;
+ /** 鎵�灞炲洯鍖� */
+ industrialParkId?: string;
}
interface GetParkBountyTradeOutput {
@@ -9488,6 +9547,8 @@
remianAmount?: number;
/** 鐢宠鍥尯 */
parkName?: string;
+ /** 鎵�灞炲洯鍖� */
+ parkId?: string;
/** 鐢宠鍥尯绫诲瀷 */
parkTypeName?: string;
}
@@ -11564,6 +11625,23 @@
industrialParkFileTypeSetting?: string[];
}
+ interface IndustrialParkCompanyFile {
+ /** 鍏徃ID */
+ companyOrgId?: string;
+ /** 閮ㄩ棬ID */
+ departmentOrgId?: string;
+ }
+
+ interface IndustrialParkCompanyOutput {
+ id?: string;
+ /** 宸ヤ笟鍥尯ID */
+ industrialParkId?: string;
+ /** 鍏徃ID */
+ companyOrgId?: string;
+ /** 閮ㄩ棬ID */
+ departmentOrgId?: string;
+ }
+
interface IndustrialParkDetailOutput {
id?: string;
/** 鍥尯鍚嶇О */
@@ -11593,6 +11671,10 @@
suportWithDraw?: boolean;
/** 鏃犻渶鏀垮姟绔鏍� */
notNeedGovernmentAudit?: boolean;
+ /** 鏃犻渶杩愯惀绔鏍� */
+ noNeedForOperationalReview?: boolean;
+ /** 鏀垮姟绔弻閲嶅鏍� */
+ dualReviewOfGovernmentAffairs?: boolean;
/** 鏄惁鏀寔璐㈡斂鎷ㄤ粯 */
suportFinance?: boolean;
/** 娉ㄥ唽鍦板潃 */
@@ -11600,6 +11682,7 @@
/** 澶囨敞 */
remark?: string;
industrialParkFileTypeList?: IndustrialParkFileTypeOutput[];
+ industrialParkCompanyList?: IndustrialParkCompanyOutput[];
}
interface IndustrialParkDropDownOutput {
@@ -11657,6 +11740,10 @@
suportWithDraw?: boolean;
/** 鏃犻渶鏀垮姟绔鏍� */
notNeedGovernmentAudit?: boolean;
+ /** 鏃犻渶杩愯惀绔鏍� */
+ noNeedForOperationalReview?: boolean;
+ /** 鏀垮姟绔弻閲嶅鏍� */
+ dualReviewOfGovernmentAffairs?: boolean;
/** 鏄惁鏀寔璐㈡斂鎷ㄤ粯 */
suportFinance?: boolean;
}
@@ -22737,6 +22824,12 @@
industrialParkApplyFileFile?: IndustrialParkApplyFileFile[];
/** 鏃犻渶鏀垮姟绔鏍� */
notNeedGovernmentAudit?: boolean;
+ /** 鏃犻渶杩愯惀绔鏍� */
+ noNeedForOperationalReview?: boolean;
+ /** 鏀垮姟绔弻閲嶅鏍� */
+ dualReviewOfGovernmentAffairs?: boolean;
+ /** 鍏徃淇℃伅 */
+ industrialParkCompanyFile?: IndustrialParkCompanyFile[];
id?: string;
}
diff --git a/src/views/EnterpriseInfo/EnterpriseInfo.vue b/src/views/EnterpriseInfo/EnterpriseInfo.vue
index 46bd33c..8de223a 100644
--- a/src/views/EnterpriseInfo/EnterpriseInfo.vue
+++ b/src/views/EnterpriseInfo/EnterpriseInfo.vue
@@ -3,6 +3,17 @@
<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.lastApplyTime"
@@ -65,6 +76,7 @@
SearchInput,
QueryFilterItem,
FieldDatePicker,
+ FieldSelect,
} from '@bole-core/components';
import { OrderInputType } from '@bole-core/core';
import { format } from '@/utils';
@@ -72,7 +84,7 @@
import _ from 'lodash';
import { ModelValueType } from 'element-plus';
import { EnterpriseTypeText } from '@/constants';
-import { useAccess } from '@/hooks';
+import { useAccess, useIndustrialParkDropDownList } from '@/hooks';
defineOptions({
name: 'EnterpriseInfo',
@@ -92,6 +104,8 @@
};
const state = reactive({ ...BaseState });
+
+const { fourStreamsIndustrialParkList } = useIndustrialParkDropDownList();
onMounted(async () => {
await getList();
@@ -123,6 +137,7 @@
'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,
@@ -137,6 +152,7 @@
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' },
diff --git a/src/views/MaterialReview/MaterialReReviewList.vue b/src/views/MaterialReview/MaterialReReviewList.vue
index da49c0b..43178ac 100644
--- a/src/views/MaterialReview/MaterialReReviewList.vue
+++ b/src/views/MaterialReview/MaterialReReviewList.vue
@@ -3,6 +3,17 @@
<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.creationTime"
@@ -64,6 +75,7 @@
FieldRadio,
QueryFilterItem,
FieldDatePicker,
+ FieldSelect,
} from '@bole-core/components';
import { OrderInputType } from '@bole-core/core';
import { format } from '@/utils';
@@ -71,7 +83,7 @@
import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
import _ from 'lodash';
import { ModelValueType } from 'element-plus';
-import { useAccess, useGlobalEventContext } from '@/hooks';
+import { useAccess, useGlobalEventContext, useIndustrialParkDropDownList } from '@/hooks';
defineOptions({
name: 'MaterialReviewList',
@@ -92,6 +104,15 @@
row.outReCheckStatus !== BountyCheckStatusEnum.WaitCheck,
},
},
+ redoBtn: {
+ emits: {
+ onClick: (role) => goAudit(role),
+ },
+ extraProps: {
+ hide: (row: API.GetParkBountyApplyListOutput) =>
+ row.outReCheckStatus !== BountyCheckStatusEnum.CheckPassed,
+ },
+ },
};
const { checkSubModuleItemShow, column, operationBtns } = useAccess({
@@ -102,6 +123,8 @@
const BaseState = {
loading: true,
};
+
+const { fourStreamsIndustrialParkList } = useIndustrialParkDropDownList();
const state = reactive({ ...BaseState });
@@ -141,6 +164,7 @@
'YYYY-MM-DD 00:00:00'
),
outReCheckTimeEnd: format(extraParamState.outReCheckTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
+ industrialParkId: extraParamState.industrialParkId,
};
let res = await parkBountyApplyServices.getOutcheckParkBountyList(params, {
showLoading: !state.loading,
@@ -155,6 +179,7 @@
creationTime: [] as unknown as ModelValueType,
outReCheckTime: [] as unknown as ModelValueType,
orderInput: [{ property: 'creationTime', order: OrderInputType.Desc }],
+ industrialParkId: '',
},
columnsRenderProps: {
applyMonth: { type: 'date', format: 'YYYY骞碝M鏈�' },
diff --git a/src/views/MaterialReview/MaterialReview.vue b/src/views/MaterialReview/MaterialReview.vue
index 690d192..3d9dc5a 100644
--- a/src/views/MaterialReview/MaterialReview.vue
+++ b/src/views/MaterialReview/MaterialReview.vue
@@ -3,6 +3,17 @@
<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.creationTime"
@@ -64,6 +75,7 @@
FieldRadio,
QueryFilterItem,
FieldDatePicker,
+ FieldSelect,
} from '@bole-core/components';
import { OrderInputType } from '@bole-core/core';
import { format } from '@/utils';
@@ -71,7 +83,7 @@
import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
import _ from 'lodash';
import { ModelValueType } from 'element-plus';
-import { useAccess, useGlobalEventContext } from '@/hooks';
+import { useAccess, useGlobalEventContext, useIndustrialParkDropDownList } from '@/hooks';
defineOptions({
name: 'MaterialReviewList',
@@ -92,6 +104,15 @@
row.outCheckStatus !== BountyCheckStatusEnum.WaitCheck,
},
},
+ redoBtn: {
+ emits: {
+ onClick: (role) => goAudit(role),
+ },
+ extraProps: {
+ hide: (row: API.GetParkBountyApplyListOutput) =>
+ row.outCheckStatus !== BountyCheckStatusEnum.CheckPassed,
+ },
+ },
};
const { checkSubModuleItemShow, column, operationBtns } = useAccess({
@@ -102,6 +123,8 @@
const BaseState = {
loading: true,
};
+
+const { fourStreamsIndustrialParkList } = useIndustrialParkDropDownList();
const state = reactive({ ...BaseState });
@@ -137,6 +160,7 @@
creationTimeEnd: format(extraParamState.creationTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
outCheckTimeBegin: format(extraParamState.outCheckTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
outCheckTimeEnd: format(extraParamState.outCheckTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
+ industrialParkId: extraParamState.industrialParkId,
};
let res = await parkBountyApplyServices.getOutcheckParkBountyList(params, {
showLoading: !state.loading,
@@ -151,6 +175,7 @@
creationTime: [] as unknown as ModelValueType,
outCheckTime: [] as unknown as ModelValueType,
orderInput: [{ property: 'creationTime', order: OrderInputType.Desc }],
+ industrialParkId: '',
},
columnsRenderProps: {
applyMonth: { type: 'date', format: 'YYYY骞碝M鏈�' },
diff --git a/src/views/Reward/FinancialApproval.vue b/src/views/Reward/FinancialApproval.vue
index 4e491ce..5438961 100644
--- a/src/views/Reward/FinancialApproval.vue
+++ b/src/views/Reward/FinancialApproval.vue
@@ -216,6 +216,7 @@
incomeBankCardNumber: row.incomeBankCardNumber,
incomeBankName: row.incomeBankName,
creationTime: row.creationTime,
+ insurePeopleNum: row.insurePeopleNum ?? ('' as any as number),
});
}
@@ -249,6 +250,7 @@
incomeBankCardNumber: '',
incomeBankName: '',
creationTime: '',
+ insurePeopleNum: 0,
},
});
diff --git a/src/views/Reward/RewardApplyTradeCheck.vue b/src/views/Reward/RewardApplyTradeCheck.vue
index af32caa..94bc67d 100644
--- a/src/views/Reward/RewardApplyTradeCheck.vue
+++ b/src/views/Reward/RewardApplyTradeCheck.vue
@@ -118,11 +118,7 @@
};
const state = reactive({ ...BaseState });
-const { industrialParkList } = useIndustrialParkDropDownList();
-
-const fourStreamsIndustrialParkList = computed(() => {
- return industrialParkList.value.filter((x) => !!x.rewardEnable);
-});
+const { fourStreamsIndustrialParkList } = useIndustrialParkDropDownList();
onMounted(async () => {
await getList();
@@ -212,6 +208,7 @@
incomeBankCardNumber: row.incomeBankCardNumber,
incomeBankName: row.incomeBankName,
creationTime: row.creationTime,
+ insurePeopleNum: row.insurePeopleNum ?? ('' as any as number),
});
}
@@ -245,6 +242,7 @@
incomeBankCardNumber: '',
incomeBankName: '',
creationTime: '',
+ insurePeopleNum: 0,
},
});
diff --git a/src/views/Reward/WithdrawalApproval.vue b/src/views/Reward/WithdrawalApproval.vue
index 6776b22..aeab687 100644
--- a/src/views/Reward/WithdrawalApproval.vue
+++ b/src/views/Reward/WithdrawalApproval.vue
@@ -3,6 +3,17 @@
<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.dateTime"
@@ -56,6 +67,7 @@
FieldDatePicker,
useFormDialog,
UploadUserFile,
+ FieldSelect,
} from '@bole-core/components';
import { Message, OrderInputType } from '@bole-core/core';
import { format } from '@/utils';
@@ -64,7 +76,7 @@
import WithdrawalApprovalAuditDialog from './components/WithdrawalApprovalAuditDialog.vue';
import _ from 'lodash';
import { ModelValueType } from 'element-plus';
-import { useAccess } from '@/hooks';
+import { useAccess, useIndustrialParkDropDownList } from '@/hooks';
defineOptions({
name: 'WithdrawalApproval',
@@ -102,6 +114,8 @@
const state = reactive({ ...BaseState });
+const { fourStreamsIndustrialParkList } = useIndustrialParkDropDownList();
+
onMounted(async () => {
await getList();
state.loading = false;
@@ -126,6 +140,7 @@
checkStatus: extraParamState.checkStatus,
beginDateTime: format(extraParamState.dateTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
endDateTime: format(extraParamState.dateTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
+ industrialParkId: extraParamState.industrialParkId,
};
let res = await parkBountyApplyServices.getEnterpriseDrawWithList(params, {
showLoading: !state.loading,
@@ -139,6 +154,7 @@
checkStatus: '' as any as EnterpriseRechargeStatusEnum,
dateTime: [] as unknown as ModelValueType,
orderInput: [{ property: 'creationTime', order: OrderInputType.Desc }],
+ industrialParkId: '',
},
columnsRenderProps: {
creationTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
diff --git a/src/views/Reward/components/RewardApplyTradeCheckDialog.vue b/src/views/Reward/components/RewardApplyTradeCheckDialog.vue
index ad902e5..7a474ed 100644
--- a/src/views/Reward/components/RewardApplyTradeCheckDialog.vue
+++ b/src/views/Reward/components/RewardApplyTradeCheckDialog.vue
@@ -176,6 +176,7 @@
incomeBankAccount: string;
incomeBankCardNumber: string;
incomeBankName: string;
+ insurePeopleNum: number;
creationTime: string;
};
@@ -257,19 +258,19 @@
key: 'insureBillNo',
},
{
+ label: '鎶曚繚浜烘暟',
+ key: 'insurePeopleNum',
+ },
+ {
label: '鍑鸿处鐢宠鏃ユ湡',
key: 'tradeTime',
type: 'date',
},
- props.isApplyTrade
- ? {
- label: '',
- }
- : {
- label: '鍑鸿处瀹℃牳鏃ユ湡',
- key: 'auditTime',
- type: 'date',
- },
+ !props.isApplyTrade && {
+ label: '鍑鸿处瀹℃牳鏃ユ湡',
+ key: 'auditTime',
+ type: 'date',
+ },
{
label: '鍑鸿处閲戦',
key: 'tradeAmount',
@@ -280,7 +281,10 @@
key: 'bountyAmount',
type: 'money',
},
- ],
+ !props.isApplyTrade && {
+ label: '',
+ },
+ ].filter(Boolean) as any,
});
const dialogForm = ref<FormInstance>();
--
Gitblit v1.9.1