From 1b0bbe7fbe3d62779356f0729f086ceb3901e17b Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期三, 09 四月 2025 16:39:18 +0800
Subject: [PATCH] feat: 接口
---
src/services/api/ParkReward.ts | 18
src/services/api/Customer.ts | 18
src/views/Account/components/AddOrEditAccountDialog.vue | 10
src/views/Account/components/ResetPasswordDialog.vue | 75 +++
src/views/EnterpriseInfo/components/RewardGrantRecordView.vue | 24
src/services/api/typings.d.ts | 337 ++++++++++++++++
src/views/EnterpriseInfo/EnterpriseInfo.vue | 35 +
src/constants/enterpriseMaterial.ts | 26 +
src/views/EnterpriseInfo/components/RewardConsumeRecordView.vue | 22
src/views/MaterialReview/MaterialReviewAudit.vue | 46 +-
src/views/EnterpriseInfo/components/EnterpriseDeclareRecordView.vue | 37 -
src/views/Reward/RewardGrant.vue | 1
src/components/commonView/DeclareEnterpriseTableView.vue | 14
src/views/EnterpriseInfo/components/EnterpriseBasicInfoView.vue | 49 +-
src/constants/reward.ts | 12
src/views/Account/AccountManageList.vue | 64 +-
src/views/Reward/RewardDeclareDetail.vue | 38 -
src/services/api/ParkBountyApply.ts | 295 ++++++++++++++
src/views/MaterialReview/MaterialReviewDetail.vue | 40 +
19 files changed, 962 insertions(+), 199 deletions(-)
diff --git a/src/components/commonView/DeclareEnterpriseTableView.vue b/src/components/commonView/DeclareEnterpriseTableView.vue
index 3347562..d067305 100644
--- a/src/components/commonView/DeclareEnterpriseTableView.vue
+++ b/src/components/commonView/DeclareEnterpriseTableView.vue
@@ -3,7 +3,7 @@
<template #query>
<QueryFilterItem>
<SearchInput
- v-model="extraParamState.title"
+ v-model="extraParamState.searchKeyWord"
style="width: 250px"
placeholder="浼佷笟鍚�/淇＄敤浠ｇ爜"
@on-click-search="getList"
@@ -39,7 +39,7 @@
import MateriaDetailDialog from './MateriaDetailDialog.vue';
import { FourStreamsMaterialFileTableItem } from './types';
import { OrderInputType } from '@bole-core/core';
-import * as informationServices from '@/services/api/Information';
+import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
defineOptions({
name: 'DeclareEnterpriseTableView',
@@ -108,22 +108,22 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let params: API.GetInformationForManageInput = {
+ let params: API.GetParkBountyApplyInfoInput = {
pageModel: {
rows: pageSize,
page: pageIndex,
orderInput: extraParamState.orderInput,
},
- title: extraParamState.title,
+ searchKeyWord: extraParamState.searchKeyWord,
};
- let res = await informationServices.getInformationForManage(params);
+ let res = await parkBountyApplyServices.getParkBountyApplyDetailList(params);
return res;
} catch (error) {}
},
{
defaultExtraParams: {
orderInput: [{ property: 'creationTime', order: OrderInputType.Desc }],
- title: '',
+ searchKeyWord: '',
},
}
);
@@ -134,7 +134,7 @@
},
});
-function openDialog(row?: API.IncentivePaymentsManageListOutput) {
+function openDialog(row?: API.ParkBountyApplyDetailInfo) {
handleEdit({
list: [],
});
diff --git a/src/constants/enterpriseMaterial.ts b/src/constants/enterpriseMaterial.ts
index 88f2eb5..b9ef48f 100644
--- a/src/constants/enterpriseMaterial.ts
+++ b/src/constants/enterpriseMaterial.ts
@@ -109,3 +109,29 @@
...EnterpriseMaterialFileBusinessTypeEnumText,
...DutiableFileBusinessTypeEnumText,
};
+
+export enum AuthType {
+ /**
+ * 浜鸿祫鍏徃
+ */
+ HumanResourceCompany = 10,
+ /**
+ * 琛屼笟閰嶅鏈嶅姟鍏徃
+ */
+ IndustryMating = 20,
+ /**
+ * 鐢ㄥ伐鍗曚綅
+ */
+ Employers = 30,
+ /**
+ * 琛屼笟鏈烘瀯
+ */
+ IndustryBody = 40,
+}
+
+export const AuthTypeText = {
+ [AuthType.HumanResourceCompany]: '浜鸿祫鍏徃',
+ [AuthType.IndustryMating]: '閰嶅鏈嶅姟鍟�',
+ [AuthType.Employers]: '鐢叉柟鍗曚綅',
+ [AuthType.IndustryBody]: '琛屼笟鏈烘瀯',
+};
diff --git a/src/constants/reward.ts b/src/constants/reward.ts
index 7eafdd7..623df82 100644
--- a/src/constants/reward.ts
+++ b/src/constants/reward.ts
@@ -50,3 +50,15 @@
[IncomeStatusEnum.WaitForIncome]: '寰呭叆璐�',
[IncomeStatusEnum.HasIncome]: '宸插叆璐�',
};
+
+export enum EnterpriseBountyPayTypeEnum {
+ /**鍑洪噾 */
+ PayOut = 1,
+ /**鍏ラ噾 */
+ PayIn = 2,
+}
+
+export const EnterpriseBountyPayTypeEnumText = {
+ [EnterpriseBountyPayTypeEnum.PayOut]: '鍑洪噾',
+ [EnterpriseBountyPayTypeEnum.PayIn]: '鍏ラ噾',
+};
diff --git a/src/services/api/Customer.ts b/src/services/api/Customer.ts
index ab9cd34..460c318 100644
--- a/src/services/api/Customer.ts
+++ b/src/services/api/Customer.ts
@@ -47,6 +47,24 @@
});
}
+/** 杩愯惀绔�-鏀垮姟绔竴鍥尯瀹㈡埛绠＄悊浼佷笟鍩烘湰淇℃伅 GET /api/Customer/GetParkCustomerManageBaseDetail */
+export async function getParkCustomerManageBaseDetail(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetParkCustomerManageBaseDetailParams,
+ options?: API.RequestConfig
+) {
+ return request<API.GetParkCustomerManageDetailOutput>(
+ '/api/Customer/GetParkCustomerManageBaseDetail',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ }
+ );
+}
+
/** 鑾峰彇鏈嶅姟浜哄憳鍒嗛〉鍒楄〃 POST /api/Customer/GetServiceStaffPage */
export async function getServiceStaffPage(
body: API.QueryServiceStaffListInput,
diff --git a/src/services/api/ParkBountyApply.ts b/src/services/api/ParkBountyApply.ts
index 55d0e25..16fefeb 100644
--- a/src/services/api/ParkBountyApply.ts
+++ b/src/services/api/ParkBountyApply.ts
@@ -2,13 +2,58 @@
// @ts-ignore
import { request } from '@/utils/request';
-/** 鑾峰彇鐢虫姤璇︽儏 POST /api/ParkBountyApply/GetParkBountyApplyDetail */
-export async function getParkBountyApplyDetail(
- body: API.GetParkBountyApplyInfoInput,
+/** 鏂板鐢虫姤(绗竴姝�) POST /api/ParkBountyApply/AddParkBountyApply */
+export async function addParkBountyApply(
+ body: API.AddParkBountyApplyStepOneInput,
options?: API.RequestConfig
) {
- return request<API.GetParkBountyApplyInfoOutput>(
- '/api/ParkBountyApply/GetParkBountyApplyDetail',
+ return request<string>('/api/ParkBountyApply/AddParkBountyApply', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
+/** 缁х画鐢虫姤 POST /api/ParkBountyApply/EditParkBountyApply */
+export async function editParkBountyApply(
+ body: API.EditParkBountyApplyStepOneInput,
+ options?: API.RequestConfig
+) {
+ return request<number>('/api/ParkBountyApply/EditParkBountyApply', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
+/** 鑾峰彇鍙�夋嫨鍏徃鍜屽凡鍓旈櫎鍏徃 POST /api/ParkBountyApply/GetCompanyNameList */
+export async function getCompanyNameList(
+ body: API.GetCompanyNameListInput,
+ options?: API.RequestConfig
+) {
+ return request<API.GetBatchChooseCompanyOutput>('/api/ParkBountyApply/GetCompanyNameList', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
+/** 鑾峰彇宸茬敵鎶ヤ紒涓氬垪琛� 鍚彲閫夋嫨銆佸凡鍓旈櫎 POST /api/ParkBountyApply/GetHasApplyCompanyNameList */
+export async function getHasApplyCompanyNameList(
+ body: API.GetHasApplyCompanyNameListInput,
+ options?: API.RequestConfig
+) {
+ return request<API.GetBatchChooseCompanyOutput>(
+ '/api/ParkBountyApply/GetHasApplyCompanyNameList',
{
method: 'POST',
headers: {
@@ -20,7 +65,94 @@
);
}
-/** 鑾峰彇濂栧姳閲戝彂鏀惧垪琛� POST /api/ParkBountyApply/GetParkBountyApplyList */
+/** 璺熻繘鍥尯鏌ヨ鍏徃鍒嗛〉鍒楄〃 POST /api/ParkBountyApply/GetParkApplyCompanyList */
+export async function getParkApplyCompanyList(
+ body: API.GetApplyCompanyListInput,
+ options?: API.RequestConfig
+) {
+ return request<API.GetParkApplyCompanyListOutputPageOutput>(
+ '/api/ParkBountyApply/GetParkApplyCompanyList',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
+/** 鏌ヨ濂栧姳閲戠敵鎶ヤ紒涓氬叕鍙稿垪琛� POST /api/ParkBountyApply/GetParkApplyCompanyStepTwoList */
+export async function getParkApplyCompanyStepTwoList(
+ body: API.GetParkApplyCompanyStepTwoListInput,
+ options?: API.RequestConfig
+) {
+ return request<API.ParkBountyApplyDetailInfoPageOutput>(
+ '/api/ParkBountyApply/GetParkApplyCompanyStepTwoList',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
+/** 杩愯惀绔�-鏀垮姟绔�旇幏鍙栫敵鎶ヨ鎯�-鐢虫姤璇︽儏鍩虹淇℃伅 POST /api/ParkBountyApply/GetParkBountyApplyDetailBaseInfo */
+export async function getParkBountyApplyDetailBaseInfo(
+ body: API.GetParkBountyApplyInfoInput,
+ options?: API.RequestConfig
+) {
+ return request<API.ParkBountyApplyBaseInfo>(
+ '/api/ParkBountyApply/GetParkBountyApplyDetailBaseInfo',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
+/** 杩愯惀绔�-鏀垮姟绔�旇幏鍙栫敵鎶ヨ鎯呪�旂敵鎶ヤ紒涓氬悕鍗曞垪琛� POST /api/ParkBountyApply/GetParkBountyApplyDetailList */
+export async function getParkBountyApplyDetailList(
+ body: API.GetParkBountyApplyInfoInput,
+ options?: API.RequestConfig
+) {
+ return request<API.ParkBountyApplyDetailInfoPageOutput>(
+ '/api/ParkBountyApply/GetParkBountyApplyDetailList',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
+/** 鑾峰彇鐢虫姤浼佷笟涓婁紶鐨勬枃浠� POST /api/ParkBountyApply/GetParkBountyApplyFile */
+export async function getParkBountyApplyFile(
+ body: API.GetParkBountyApplyFileInput,
+ options?: API.RequestConfig
+) {
+ return request<API.GetParkBountyApplyFileOutput>('/api/ParkBountyApply/GetParkBountyApplyFile', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
+/** 杩愯惀绔�-鏀垮姟绔�旇幏鍙栧鍔遍噾鍙戞斁鍒楄〃 POST /api/ParkBountyApply/GetParkBountyApplyList */
export async function getParkBountyApplyList(
body: API.GetParkBountyApplyListInput,
options?: API.RequestConfig
@@ -38,13 +170,13 @@
);
}
-/** 鑾峰彇鍏ヨ处璇︽儏 POST /api/ParkBountyApply/GetParkBountyApplyTransferDetail */
-export async function getParkBountyApplyTransferDetail(
+/** 杩愯惀绔�斿叆璐︹�斿鍔遍噾鍏ヨ处璇︽儏鍩虹淇℃伅 POST /api/ParkBountyApply/GetParkBountyApplyTransferDetailInfo */
+export async function getParkBountyApplyTransferDetailInfo(
body: API.GetParkBountyApplyTransferInfoInput,
options?: API.RequestConfig
) {
- return request<API.GetParkBountyApplyTransferInfoOutput>(
- '/api/ParkBountyApply/GetParkBountyApplyTransferDetail',
+ return request<API.ParkBountyApplyBaseInfo>(
+ '/api/ParkBountyApply/GetParkBountyApplyTransferDetailInfo',
{
method: 'POST',
headers: {
@@ -56,7 +188,94 @@
);
}
-/** 鎵归噺鍏ヨ处 POST /api/ParkBountyApply/ParkBountyApplyBatchTransfer */
+/** 杩愯惀绔�斿叆璐︹�旂敵鎶ヤ紒涓氬悕鍗� POST /api/ParkBountyApply/GetParkBountyApplyTransferDetailList */
+export async function getParkBountyApplyTransferDetailList(
+ body: API.GetParkBountyApplyTransferInfoInput,
+ options?: API.RequestConfig
+) {
+ return request<API.ParkBountyApplyTransferDetailInfoPageOutput>(
+ '/api/ParkBountyApply/GetParkBountyApplyTransferDetailList',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
+/** 杩愯惀绔�-鏀垮姟绔竴鍥尯瀹㈡埛绠＄悊璇︽儏涓�浼佷笟鐢虫姤璁板綍 POST /api/ParkBountyApply/GetParkCustomerBountyApplyList */
+export async function getParkCustomerBountyApplyList(
+ body: API.QueryParkCustomerBountyApplyInput,
+ options?: API.RequestConfig
+) {
+ return request<API.GetParkCustomerBountyApplyOutputPageOutput>(
+ '/api/ParkBountyApply/GetParkCustomerBountyApplyList',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
+/** 杩愯惀绔竴鍥尯瀹㈡埛绠＄悊璇︽儏涓�濂栧姳閲戝彂鏀捐褰� POST /api/ParkBountyApply/GetParkCustomerBountyGrantList */
+export async function getParkCustomerBountyGrantList(
+ body: API.QueryParkCustomerBountyApplyInput,
+ options?: API.RequestConfig
+) {
+ return request<API.GetParkCustomerBountyGrantOutputPageOutput>(
+ '/api/ParkBountyApply/GetParkCustomerBountyGrantList',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
+/** 杩愯惀绔�-鏀垮姟绔竴鍥尯瀹㈡埛绠＄悊鍒楄〃 POST /api/ParkBountyApply/GetParkCustomerManagePage */
+export async function getParkCustomerManagePage(
+ body: API.QueryParkCustomerManageInput,
+ options?: API.RequestConfig
+) {
+ return request<API.GetParkCustomerManageOutputPageOutput>(
+ '/api/ParkBountyApply/GetParkCustomerManagePage',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
+/** 鍐呴儴瀹℃牳 POST /api/ParkBountyApply/IncheckParkBountyApply */
+export async function incheckParkBountyApply(
+ body: API.IncheckParkBountyApplyInput,
+ options?: API.RequestConfig
+) {
+ return request<number>('/api/ParkBountyApply/IncheckParkBountyApply', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
+/** 杩愯惀绔�斿叆璐�-鎵归噺鍏ヨ处 POST /api/ParkBountyApply/ParkBountyApplyBatchTransfer */
export async function parkBountyApplyBatchTransfer(
body: API.ParkBountyApplyBatchTransferInput,
options?: API.RequestConfig
@@ -71,7 +290,7 @@
});
}
-/** 涓婁紶鍙戠エ鍑瘉 POST /api/ParkBountyApply/ParkBountyApplySettle */
+/** 杩愯惀绔�斿叆璐︹�斾笂浼犲嚟璇� POST /api/ParkBountyApply/ParkBountyApplySettle */
export async function parkBountyApplySettle(
body: API.ParkBountyApplySettleInput,
options?: API.RequestConfig
@@ -86,7 +305,7 @@
});
}
-/** 濂栧姳閲戝叆璐� POST /api/ParkBountyApply/ParkBountyApplyTransfer */
+/** 杩愯惀绔�斿叆璐︹�斿鍔遍噾鍏ヨ处 POST /api/ParkBountyApply/ParkBountyApplyTransfer */
export async function parkBountyApplyTransfer(
body: API.ParkBountyApplyTransferInput,
options?: API.RequestConfig
@@ -101,7 +320,7 @@
});
}
-/** 涓婁紶鍑瘉 POST /api/ParkBountyApply/ParkBountyApplyTransferFile */
+/** 鏀垮姟绔�斿鍔遍噾涓婁紶鍑瘉 POST /api/ParkBountyApply/ParkBountyApplyTransferFile */
export async function parkBountyApplyTransferFile(
body: API.ParkBountyApplyTransferFileInput,
options?: API.RequestConfig
@@ -115,3 +334,51 @@
...(options || {}),
});
}
+
+/** 淇濆瓨濂栭噾鍒嗛厤琛ㄣ�佸鍔遍噾姹囨�昏〃銆佸鍔辨�婚 POST /api/ParkBountyApply/SaveParkBountyApplyCollectFile */
+export async function saveParkBountyApplyCollectFile(
+ body: API.SaveParkBountyApplyCollectFileInput,
+ options?: API.RequestConfig
+) {
+ return request<number>('/api/ParkBountyApply/SaveParkBountyApplyCollectFile', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
+/** 淇濆瓨浼佷笟缂寸◣鏄庣粏銆佽惀鏀舵眹鎬� POST /api/ParkBountyApply/SaveParkBountyApplyGatherFile */
+export async function saveParkBountyApplyGatherFile(
+ body: API.SaveParkBountyApplyGatherFileInput,
+ options?: API.RequestConfig
+) {
+ return request<number>('/api/ParkBountyApply/SaveParkBountyApplyGatherFile', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
+/** 涓婁紶浼佷笟鏉愭枡 POST /api/ParkBountyApply/UploadParkBountyApplyCompanyFile */
+export async function uploadParkBountyApplyCompanyFile(
+ body: API.UploadParkBountyApplyCompanyFileInput,
+ options?: API.RequestConfig
+) {
+ return request<API.UploadParkBountyApplyCompanyFileOutput>(
+ '/api/ParkBountyApply/UploadParkBountyApplyCompanyFile',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
diff --git a/src/services/api/ParkReward.ts b/src/services/api/ParkReward.ts
index 45e5177..f00c706 100644
--- a/src/services/api/ParkReward.ts
+++ b/src/services/api/ParkReward.ts
@@ -95,6 +95,24 @@
});
}
+/** 杩愯惀绔竴鍥尯瀹㈡埛绠＄悊璇︽儏涓�濂栧姳閲戞秷璐硅褰� POST /api/ParkReward/GetParkCustomerBountyConsumptionList */
+export async function getParkCustomerBountyConsumptionList(
+ body: API.QueryParkCustomerBountyApplyInput,
+ options?: API.RequestConfig
+) {
+ return request<API.GetParkCustomerBountyConsumptionOutputPageOutput>(
+ '/api/ParkReward/GetParkCustomerBountyConsumptionList',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
/** 鑾峰彇濂栧姳鐢宠璺熻釜鍒楄〃 POST /api/ParkReward/GetParkRewardApplyFollowList */
export async function getParkRewardApplyFollowList(
body: API.GetParkRewardApplyFollowInput,
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index dafc419..dac04de 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -426,6 +426,13 @@
userId?: string;
}
+ interface AddParkBountyApplyStepOneInput {
+ batchNo?: string;
+ parkId?: string;
+ applyMonth?: string;
+ removeCompanyIds?: string[];
+ }
+
interface AddSysOrgInput {
/** 缁勭粐鍚嶇О */
orgName: string;
@@ -1545,6 +1552,10 @@
id?: string;
}
+ interface APIgetParkCustomerManageBaseDetailParams {
+ id?: string;
+ }
+
interface APIgetParkOrHRAdvertiseParams {
id?: string;
}
@@ -2671,7 +2682,7 @@
userId?: string;
}
- type BountyCheckStatusEnum = 10 | 20 | 30;
+ type BountyCheckStatusEnum = 10 | 20 | 30 | -10;
type BusinessSettingTypeEnum = 10;
@@ -5389,6 +5400,11 @@
listParams?: Record<string, any>;
}
+ interface EditParkBountyApplyStepOneInput {
+ parkBountyApplyId?: string;
+ removeCompanyIds?: string[];
+ }
+
interface EDZ001Input {
recvLength?: number;
tradeDate?: number;
@@ -6218,6 +6234,18 @@
endRegistDate?: string;
}
+ interface GetApplyCompanyListInput {
+ pageModel?: Pagination;
+ parkId?: string;
+ searchKeyWord?: string;
+ /** 鍩烘湰鎴锋槸鍚﹀凡瀹屽杽 */
+ bankIsVerify?: boolean;
+ /** 钀ヤ笟鎵х収鏄惁宸插畬鍠� */
+ enterpriseIsVerify?: boolean;
+ /** 閫夋嫨鍏徃Id */
+ removeCompanyIds?: string[];
+ }
+
interface GetAreaListInput {
/** 1鐪� 2甯� 3鍖� 4闀� */
layer?: number;
@@ -6258,6 +6286,11 @@
remainList?: InsureInsStaffList[];
}
+ interface GetBatchChooseCompanyOutput {
+ listCanChooseCompany?: GetCompanyNameListOutput[];
+ listDeleteChooseCompany?: GetCompanyNameListOutput[];
+ }
+
interface GetBusinessPayInfoInput {
pageModel?: Pagination;
settleNo?: string;
@@ -6409,6 +6442,17 @@
insureQrCode?: string;
}
+ interface GetCompanyNameListInput {
+ parkId?: string;
+ /** 閫夋嫨鍏徃Id */
+ removeCompanyIds?: string[];
+ }
+
+ interface GetCompanyNameListOutput {
+ companyId?: string;
+ name?: string;
+ }
+
interface GetCooperationApplyInput {
pageModel?: Pagination;
status?: CooperationApplyStatusEnum;
@@ -6703,6 +6747,12 @@
settingStatus?: LgGigWorkerSignSettingStatus;
}
+ interface GetHasApplyCompanyNameListInput {
+ parkBountyApplyId?: string;
+ /** 閫夋嫨鍏徃Id */
+ removeCompanyIds?: string[];
+ }
+
interface GetHeadlineInformationInput {
/** 鎺掑簭淇℃伅锛氶粯璁ゆ寜骞垮憡鎺掑簭AdSequence鍗囧簭 */
orderInput?: OrderInput[];
@@ -7707,15 +7757,73 @@
enterinessName?: string;
}
+ interface GetParkApplyCompanyListOutput {
+ id?: string;
+ userName?: string;
+ enterpriseName?: string;
+ bankIsVerify?: boolean;
+ /** 钀ヤ笟鎵х収鏂囦欢鍦板潃 */
+ licenseUrl?: string;
+ /** 缁熶竴绀句細淇＄敤浠ｇ爜 */
+ societyCreditCode?: string;
+ /** 浼佷笟淇℃伅鏄惁宸插畬鍠� */
+ enterpriseIsVerify?: boolean;
+ authType?: EnterpriseTypeEnum;
+ /** 浼佷笟绫诲瀷 10浜哄姏璧勬簮鍏徃 20鐢叉柟浼佷笟 30琛屼笟閰嶅 40琛屼笟鏈烘瀯 */
+ type?: number;
+ /** 鐢ㄦ埛鎵嬫満鍙� */
+ phoneNumber?: string;
+ /** 鍒涘缓鏃堕棿 */
+ creationTime?: string;
+ }
+
+ interface GetParkApplyCompanyListOutputPageOutput {
+ pageModel?: Pagination;
+ objectData?: any;
+ data?: GetParkApplyCompanyListOutput[];
+ }
+
+ interface GetParkApplyCompanyStepTwoListInput {
+ pageModel?: Pagination;
+ parkBountyApplyId?: string;
+ searchKeyWord?: string;
+ /** 鍩烘湰鎴锋槸鍚﹀凡瀹屽杽 */
+ bankIsVerify?: boolean;
+ /** 钀ヤ笟鎵х収鏄惁宸插畬鍠� */
+ enterpriseIsVerify?: boolean;
+ }
+
+ interface GetParkBountyApplyFileInput {
+ parkBountyApplyId?: string;
+ companyId?: string;
+ }
+
+ interface GetParkBountyApplyFileOutput {
+ /** 鍥尯绫诲瀷 */
+ parkType?: string;
+ /** 鍥尯鍏ラ┗鍗忚 */
+ parkEnterPactUrl?: string;
+ /** 瀹岀◣璇佹槑 */
+ ratePaymentFileUrl?: string;
+ /** 浼佷笟缂寸◣鏄庣粏姹囨�昏〃 */
+ taxSubFileUrl?: string;
+ /** 浼佷笟缁忚惀鍒╂鼎琛� */
+ operateProfitesUrl?: string;
+ /** 鍏ラ┗鍏宠仈璇存槑 */
+ enterRelateUrl?: string;
+ /** C绔釜绋庡畬绋庢儏鍐佃鏄� */
+ personTaxRatePayUrl?: string;
+ }
+
interface GetParkBountyApplyInfoInput {
+ pageModel?: Pagination;
parkBountyApplyId?: string;
/** 浼佷笟鍚�/淇＄敤浠ｇ爜 */
searchKeyWord?: string;
- }
-
- interface GetParkBountyApplyInfoOutput {
- parkBountyApplyBaseInfo?: ParkBountyApplyBaseInfo;
- parkBountyApplyDetailInfoList?: ParkBountyApplyDetailInfo[];
+ /** 鍩烘湰鎴锋槸鍚﹀凡瀹屽杽 */
+ bankIsVerify?: boolean;
+ /** 钀ヤ笟鎵х収鏄惁宸插畬鍠� */
+ enterpriseIsVerify?: boolean;
}
interface GetParkBountyApplyListInput {
@@ -7748,6 +7856,8 @@
id?: string;
/** 鐢宠鎵规鍙� */
batchNo?: string;
+ /** 鍏ヨ处鏃堕棿 */
+ incomeTime?: string;
/** 鐢宠鍥尯Id */
parkId?: string;
/** 鐢宠鍥尯 */
@@ -7764,8 +7874,6 @@
/** 鍙戞斁鏃ユ湡 */
settleTime?: string;
incomeStatus?: IncomeStatusEnum;
- /** 鍏ヨ处鏃ユ湡 */
- incomeTime?: string;
outCheckStatus?: BountyCheckStatusEnum;
/** 澶栭儴瀹℃牳鏃ユ湡 */
outCheckTime?: string;
@@ -7778,15 +7886,135 @@
}
interface GetParkBountyApplyTransferInfoInput {
+ pageModel?: Pagination;
parkBountyApplyId?: string;
/** 浼佷笟鍚�/淇＄敤浠ｇ爜 */
searchKeyWord?: string;
transferToStatus?: TransferToStatusEnum;
}
- interface GetParkBountyApplyTransferInfoOutput {
- parkBountyApplyBaseInfo?: ParkBountyApplyBaseInfo;
- parkBountyApplyTransferDetailInfoList?: ParkBountyApplyTransferDetailInfo[];
+ interface GetParkCustomerBountyApplyOutput {
+ id?: string;
+ /** 鐢宠鎵规鍙� */
+ batchNo?: string;
+ /** 鐢宠鏃ユ湡 */
+ creationTime?: string;
+ inCheckStatus?: BountyCheckStatusEnum;
+ /** 鍐呴儴瀹℃牳鏃ユ湡 */
+ inCheckTime?: string;
+ outCheckStatus?: BountyCheckStatusEnum;
+ /** 澶栭儴瀹℃牳鏃ユ湡 */
+ outCheckTime?: string;
+ }
+
+ interface GetParkCustomerBountyApplyOutputPageOutput {
+ pageModel?: Pagination;
+ objectData?: any;
+ data?: GetParkCustomerBountyApplyOutput[];
+ }
+
+ interface GetParkCustomerBountyConsumptionOutput {
+ id?: string;
+ /** 濂栧姳閲戞秷璐规棩鏈� */
+ payDateTime?: string;
+ /** 娑堣垂閲戦 */
+ amount?: number;
+ payType?: EnterpriseBountyPayTypeEnum;
+ /** 濂栧姳閲戜綑棰� */
+ remianAmount?: number;
+ /** 鍑瘉 */
+ payFileUrl?: string;
+ }
+
+ interface GetParkCustomerBountyConsumptionOutputPageOutput {
+ pageModel?: Pagination;
+ objectData?: any;
+ data?: GetParkCustomerBountyConsumptionOutput[];
+ }
+
+ interface GetParkCustomerBountyGrantOutput {
+ id?: string;
+ /** 鐢宠鎵规鍙� */
+ batchNo?: string;
+ /** 鍙戞斁鏃ユ湡 */
+ settleTime?: string;
+ /** 鍏ヨ处鏃堕棿 */
+ incomeTime?: string;
+ incomeStatus?: IncomeStatusEnum;
+ /** 鍙戞斁閲戦 */
+ applySumAmount?: number;
+ /** 鍏ヨ处鍑瘉 */
+ transferToFileUrl?: string;
+ }
+
+ interface GetParkCustomerBountyGrantOutputPageOutput {
+ pageModel?: Pagination;
+ objectData?: any;
+ data?: GetParkCustomerBountyGrantOutput[];
+ }
+
+ interface GetParkCustomerManageDetailOutput {
+ id?: string;
+ /** 浼佷笟鍚嶇О */
+ enterpriseName?: string;
+ /** 淇＄敤浠ｇ爜 */
+ societyCreditCode?: string;
+ enterpriseType?: EnterpriseTypeEnum;
+ industrialParkId?: string;
+ /** 鎵�灞炲洯鍖� */
+ industrialParkName?: string;
+ /** 鍥尯绫诲瀷 */
+ parkTypeId?: string;
+ /** 鍥尯绫诲瀷鍚嶇О */
+ parkTypName?: string;
+ /** 钀ヤ笟鎵х収 */
+ licenseUrl?: string;
+ /** 閾惰鎬昏鍚嶇О */
+ bankName?: string;
+ /** 閾惰鏀鍚嶇О */
+ bankBranchName?: string;
+ /** 閾惰鍗″彿 */
+ bankCardNumber?: string;
+ }
+
+ interface GetParkCustomerManageOutput {
+ id?: string;
+ /** 甯愬彿 */
+ userName?: string;
+ /** 浼佷笟鍚嶇О */
+ enterpriseName?: string;
+ /** 淇＄敤浠ｇ爜 */
+ societyCreditCode?: string;
+ /** 鐢佃瘽 */
+ phoneNumber?: string;
+ enterpriseType?: EnterpriseTypeEnum;
+ industrialParkId?: string;
+ /** 鎵�灞炲洯鍖� */
+ industrialParkName?: string;
+ /** 鍥尯绫诲瀷 */
+ parkTypeId?: string;
+ /** 鍥尯绫诲瀷鍚嶇О */
+ parkTypName?: string;
+ /** 钀ヤ笟鎵х収鏄惁宸插畬鍠� */
+ licenseIsVerify?: boolean;
+ /** 浼佷笟淇℃伅鏄惁宸插畬鍠� */
+ enterpriseIsVerify?: boolean;
+ /** 鐢虫姤娆℃暟 */
+ applyCount?: number;
+ /** 鏈�杩戠敵鎶� */
+ lastApplyTime?: string;
+ /** 鍙戞斁娆℃暟 */
+ payCount?: number;
+ /** 鏈�杩戝彂鏀炬椂闂� */
+ lastPayTime?: string;
+ /** 濂栧姳閲戜綑棰� */
+ bountyAmount?: number;
+ }
+
+ interface GetParkCustomerManageOutputPageOutput {
+ pageModel?: Pagination;
+ objectData?: any;
+ data?: GetParkCustomerManageOutput[];
}
interface GetParkOrHRInfoByUserInput {
@@ -9232,6 +9460,13 @@
data?: IncentivePaymentsManageListOutput[];
}
+ interface IncheckParkBountyApplyInput {
+ parkBountyApplyId?: string;
+ inCheckStatus?: BountyCheckStatusEnum;
+ /** 澶囨敞 */
+ remark?: string;
+ }
+
type IncomeExpenseTypeEnum = 10 | 20;
type IncomeStatusEnum = 1 | 2;
@@ -13905,6 +14140,20 @@
/** C绔釜绋庡畬绋庢儏鍐佃鏄� */
personTaxRatePayUrl?: string;
authType?: EnterpriseTypeEnum;
+ /** 浼佷笟绫诲瀷 10浜哄姏璧勬簮鍏徃 20鐢叉柟浼佷笟 30琛屼笟閰嶅 40琛屼笟鏈烘瀯 */
+ type?: number;
+ /** 閾惰淇℃伅鍙锋槸鍚﹀凡瀹屽杽 */
+ bankIsVerify?: boolean;
+ /** 浼佷笟淇℃伅鏄惁宸插畬鍠� */
+ enterpriseIsVerify?: boolean;
+ /** 鏂囦欢瀹屾暣搴� */
+ fileCompleteRate?: string;
+ }
+
+ interface ParkBountyApplyDetailInfoPageOutput {
+ pageModel?: Pagination;
+ objectData?: any;
+ data?: ParkBountyApplyDetailInfo[];
}
interface ParkBountyApplySettleInput {
@@ -13940,7 +14189,8 @@
enterRelateUrl?: string;
/** C绔釜绋庡畬绋庢儏鍐佃鏄� */
personTaxRatePayUrl?: string;
- authType?: EnterpriseTypeEnum;
+ /** 浼佷笟绫诲瀷 10浜哄姏璧勬簮鍏徃 20鐢叉柟浼佷笟 30琛屼笟閰嶅 40琛屼笟鏈烘瀯 */
+ type?: number;
transferToStatus?: TransferToStatusEnum;
/** 鍏ヨ处閲戦 */
transferToAmount?: number;
@@ -13950,6 +14200,12 @@
transferToFileUrl?: string;
}
+ interface ParkBountyApplyTransferDetailInfoPageOutput {
+ pageModel?: Pagination;
+ objectData?: any;
+ data?: ParkBountyApplyTransferDetailInfo[];
+ }
+
interface ParkBountyApplyTransferFileInput {
parkBountyApplyDetailId?: string;
/** 鍏ヨ处鍑瘉 */
@@ -16140,6 +16396,23 @@
operateHistoryType?: OperateHistoryTypeEnum;
}
+ interface QueryParkCustomerBountyApplyInput {
+ pageModel?: Pagination;
+ id?: string;
+ }
+
+ interface QueryParkCustomerManageInput {
+ pageModel?: Pagination;
+ /** 浼佷笟鍚�/淇＄敤浠ｇ爜 */
+ keywords?: string;
+ /** 钀ヤ笟鎵х収鏄惁宸插畬鍠� */
+ licenseIsVerify?: boolean;
+ /** 浼佷笟淇℃伅鏄惁宸插畬鍠� */
+ enterpriseIsVerify?: boolean;
+ /** 鎵�灞炲洯鍖� */
+ industrialParkId?: string;
+ }
+
interface QueryParkOrHRAuditPageInput {
pageModel?: Pagination;
auditStatus?: ParkOrHRAuditStatusEnum;
@@ -17198,6 +17471,24 @@
templateParamExtraData?: string;
}
+ interface SaveParkBountyApplyCollectFileInput {
+ parkBountyApplyId?: string;
+ /** 濂栧姳閲戝垎閰嶈〃 */
+ bountyAssignFileUlr?: string;
+ /** 濂栧姳閲戞眹鎬昏〃 */
+ bountyCollectFileUrl?: string;
+ /** 鐢虫姤鎬婚 */
+ applySumAmount?: number;
+ }
+
+ interface SaveParkBountyApplyGatherFileInput {
+ parkBountyApplyId?: string;
+ /** 浼佷笟钀ユ敹姹囨�昏〃 */
+ enterpriseOperateFileUrl?: string;
+ /** 浼佷笟缂寸◣鏄庣粏琛� */
+ enterpriseTaxSubFileUrl?: string;
+ }
+
interface SaveWalletPayChannelFeeSettingInput {
/** 閫氶亾id */
walletPayChannelId?: string;
@@ -19380,6 +19671,28 @@
insureBillUrl?: string;
}
+ interface UploadParkBountyApplyCompanyFileInput {
+ parkBountyApplyId?: string;
+ companyId?: string;
+ /** 鍥尯鍏ラ┗鍗忚 */
+ parkEnterPactUrl?: string;
+ /** 瀹岀◣璇佹槑 */
+ ratePaymentFileUrl?: string;
+ /** 浼佷笟缂寸◣鏄庣粏姹囨�昏〃 */
+ taxSubFileUrl?: string;
+ /** 浼佷笟缁忚惀鍒╂鼎琛� */
+ operateProfitesUrl?: string;
+ /** 鍏ラ┗鍏宠仈璇存槑 */
+ enterRelateUrl?: string;
+ /** C绔釜绋庡畬绋庢儏鍐佃鏄� */
+ personTaxRatePayUrl?: string;
+ }
+
+ interface UploadParkBountyApplyCompanyFileOutput {
+ companyId?: string;
+ fileCompleteRate?: string;
+ }
+
interface UploadVoucherUrlInput {
/** 鎶曚繚鎵规缂栧彿 */
insurePolicyId?: string;
diff --git a/src/views/Account/AccountManageList.vue b/src/views/Account/AccountManageList.vue
index c4a301b..77fa4ba 100644
--- a/src/views/Account/AccountManageList.vue
+++ b/src/views/Account/AccountManageList.vue
@@ -5,7 +5,7 @@
<template #query>
<QueryFilterItem>
<SearchInput
- v-model="extraParamState.keyword"
+ v-model="extraParamState.queryCondition"
style="width: 200px"
placeholder="璐﹀彿/濮撳悕/鎵嬫満鍙�"
@on-click-search="getList"
@@ -21,6 +21,7 @@
</ProTableV2>
</AppContainer>
<AddOrEditAccountDialog v-bind="dialogProps" />
+ <ResetPasswordDialog v-bind="resetPasswordDialogProps"></ResetPasswordDialog>
</LoadingLayout>
</template>
@@ -36,9 +37,10 @@
useFormDialog,
defineOperationBtns,
} from '@bole-core/components';
-import * as accountServices from '@/services/api/Account';
+import * as userRoleServices from '@/services/api/UserRole';
import { Message, OrderInputType } from '@bole-core/core';
import AddOrEditAccountDialog from './components/AddOrEditAccountDialog.vue';
+import ResetPasswordDialog from './components/ResetPasswordDialog.vue';
import { formatRoleName } from '@/utils';
defineOptions({
@@ -84,7 +86,7 @@
name: '閲嶇疆瀵嗙爜',
},
emits: {
- onClick: (role) => handleResetPassword(),
+ onClick: (role) => handleResetPasswordAdd(),
},
},
]);
@@ -108,45 +110,39 @@
reset,
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
- // try {
- // let params: API.QueryUserPageInput = {
- // pageModel: {
- // rows: pageSize,
- // page: pageIndex,
- // orderInput: extraParamState.orderInput,
- // },
- // searchKey: extraParamState.keyword,
- // };
- // let res = await userServices.getUserPage(params, {
- // showLoading: !state.loading,
- // });
- // return res;
- // } catch (error) {}
+ try {
+ let params: API.GetBackClientUsersInput = {
+ pageModel: {
+ rows: pageSize,
+ page: pageIndex,
+ orderInput: extraParamState.orderInput,
+ },
+ queryCondition: extraParamState.queryCondition,
+ };
+ let res = await userRoleServices.getGovermentClientUsers(params, {
+ showLoading: !state.loading,
+ });
+ return res;
+ } catch (error) {}
},
{
defaultExtraParams: {
orderInput: [{ property: 'id', order: OrderInputType.Desc }],
- keyword: '',
+ queryCondition: '',
},
columnsRenderProps: {},
}
);
-function openDialog(row?: any) {
+function openDialog(row?: API.UserDto) {
if (row) {
handleEdit({
id: row.id,
userName: row.userName,
name: row.name,
phoneNumber: row.phoneNumber,
- channel: row.channel,
password: '',
- roleName: row.roleNames?.[0] ?? '',
remark: row.remark,
-
- isSendMessage: row?.isSendMessage ?? false,
- sendClaimMessage: row?.sendClaimMessage ?? false,
- sendBillExpireMessage: row?.sendBillExpireMessage ?? false,
});
} else {
handleAdd();
@@ -160,14 +156,8 @@
userName: '',
name: '',
phoneNumber: '',
- channel: '',
password: '',
- roleName: '',
remark: '',
-
- isSendMessage: false,
- sendClaimMessage: false,
- sendBillExpireMessage: false,
},
});
@@ -198,5 +188,15 @@
// } catch (error) {}
}
-function handleResetPassword() {}
+const {
+ dialogProps: resetPasswordDialogProps,
+ handleAdd: handleResetPasswordAdd,
+ editForm: resetPasswordEditForm,
+} = useFormDialog({
+ onConfirm: handleAddOrEdit,
+ defaultFormParams: {
+ id: '',
+ password: '',
+ },
+});
</script>
diff --git a/src/views/Account/components/AddOrEditAccountDialog.vue b/src/views/Account/components/AddOrEditAccountDialog.vue
index 97a542a..a9cf30c 100644
--- a/src/views/Account/components/AddOrEditAccountDialog.vue
+++ b/src/views/Account/components/AddOrEditAccountDialog.vue
@@ -30,6 +30,7 @@
<ProFormText placeholder="璇疯緭鍏ユ墜鏈哄彿" v-model.trim="form.phoneNumber"></ProFormText>
</ProFormItemV2>
<ProFormItemV2
+ v-if="isEdit"
label="瀵嗙爜:"
prop="password"
:check-rules="[{ message: '璇疯緭鍏ュ瘑鐮�', required: !form.id }]"
@@ -65,9 +66,7 @@
ProForm,
ProFormItemV2,
ProFormText,
- ProFormRadio,
ProFormTextArea,
- ProFormCheckbox,
} from '@bole-core/components';
import { BooleanOptions } from '@/constants';
@@ -87,17 +86,12 @@
userName: string;
name: string;
phoneNumber: string;
- channel: string;
password: string;
- roleName: string;
remark: string;
- isSendMessage?: boolean;
- sendClaimMessage?: boolean;
- sendBillExpireMessage?: boolean;
};
const form = defineModel<Form>('form');
-
+const isEdit = computed(() => !!form.value?.id);
const emit = defineEmits<{
(e: 'onConfirm'): void;
(e: 'onCancel'): void;
diff --git a/src/views/Account/components/ResetPasswordDialog.vue b/src/views/Account/components/ResetPasswordDialog.vue
new file mode 100644
index 0000000..b92542c
--- /dev/null
+++ b/src/views/Account/components/ResetPasswordDialog.vue
@@ -0,0 +1,75 @@
+<template>
+ <ProDialog
+ :title="form.title"
+ v-model="visible"
+ @close="onDialogClose"
+ destroy-on-close
+ draggable
+ :width="800"
+ >
+ <ProForm :model="form" ref="dialogForm" label-width="120px">
+ <ProFormItemV2
+ label="瀵嗙爜:"
+ prop="password"
+ :check-rules="[{ message: '璇疯緭鍏ュ瘑鐮�', required: !form.id }]"
+ >
+ <ProFormText
+ placeholder="璇疯緭鍏ュ瘑鐮�"
+ v-model.trim="form.password"
+ :maxlength="30"
+ ></ProFormText>
+ </ProFormItemV2>
+ </ProForm>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="emit('onCancel')">鍙� 娑�</el-button>
+ <el-button type="primary" @click="handleConfirm">纭� 瀹�</el-button>
+ </span>
+ </template>
+ </ProDialog>
+</template>
+
+<script setup lang="ts">
+import { FormInstance } from 'element-plus';
+import { ProDialog, ProForm, ProFormItemV2, ProFormText } from '@bole-core/components';
+
+defineOptions({
+ name: 'ResetPasswordDialog',
+});
+
+// type Props = {};
+
+// const props = withDefaults(defineProps<Props>(), {});
+
+const visible = defineModel({ type: Boolean });
+
+type Form = {
+ title?: string;
+ id: string;
+ password: string;
+};
+
+const form = defineModel<Form>('form');
+const emit = defineEmits<{
+ (e: 'onConfirm'): void;
+ (e: 'onCancel'): void;
+}>();
+
+const dialogForm = ref<FormInstance>();
+
+function onDialogClose() {
+ if (!dialogForm.value) return;
+ dialogForm.value.resetFields();
+}
+
+function handleConfirm() {
+ if (!dialogForm.value) return;
+ dialogForm.value.validate((valid) => {
+ if (valid) {
+ emit('onConfirm');
+ } else {
+ return;
+ }
+ });
+}
+</script>
diff --git a/src/views/EnterpriseInfo/EnterpriseInfo.vue b/src/views/EnterpriseInfo/EnterpriseInfo.vue
index 304f063..0f8a514 100644
--- a/src/views/EnterpriseInfo/EnterpriseInfo.vue
+++ b/src/views/EnterpriseInfo/EnterpriseInfo.vue
@@ -57,9 +57,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 { AuthTypeText } from '@/constants';
defineOptions({
name: 'EnterpriseInfo',
@@ -68,57 +69,57 @@
const column: API.CustomModuleColumnDto[] = [
{
id: '1',
- enCode: 'changeFlag',
+ enCode: 'enterpriseName',
name: '浼佷笟鍚�',
},
{
id: '2',
- enCode: 'name',
+ enCode: 'societyCreditCode',
name: '缁熶竴绀句細淇＄敤浠ｇ爜',
},
{
id: '3',
- enCode: 'idNumber',
+ enCode: 'enterpriseType',
name: '浼佷笟绫诲瀷',
},
{
id: '4',
- enCode: 'workType',
+ enCode: 'industrialParkName',
name: '鎵�灞炲洯鍖�',
},
{
id: '5',
- enCode: 'gender',
+ enCode: 'parkTypName',
name: '鍥尯绫诲瀷',
},
{
id: '6',
- enCode: 'age',
+ enCode: 'applyCount',
name: '濂栧姳閲戠敵鎶ユ鏁�',
},
{
id: '7',
- enCode: 'birthDay',
+ enCode: 'lastApplyTime',
name: '鏈�杩戠敵鎶ユ棩鏈�',
},
{
id: '8',
- enCode: 'phoneNumber',
+ enCode: 'payCount',
name: '濂栧姳閲戝彂鏀炬鏁�',
},
{
id: '9',
- enCode: 'phoneNumber',
+ enCode: 'lastPayTime',
name: '鏈�杩戝彂鏀炬棩鏈�',
},
{
id: '10',
- enCode: 'phoneNumber',
+ enCode: 'bountyAmount',
name: '濂栧姳閲戝彂鏀炬�婚',
},
{
id: '11',
- enCode: 'phoneNumber',
+ enCode: 'bountyAmount',
name: '濂栧姳閲戜綑棰�',
},
];
@@ -156,7 +157,7 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let params: API.GetInformationForManageInput = {
+ let params: API.QueryParkCustomerManageInput = {
pageModel: {
rows: pageSize,
page: pageIndex,
@@ -165,7 +166,7 @@
publishStartDate: format(extraParamState.date?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
publishEndDate: format(extraParamState.date?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
};
- let res = await informationServices.getInformationForManage(params, {
+ let res = await parkBountyApplyServices.getParkCustomerManagePage(params, {
showLoading: !state.loading,
});
return res;
@@ -177,6 +178,12 @@
date: [] as unknown as ModelValueType,
orderInput: [{ property: 'creationTime', order: OrderInputType.Desc }],
},
+ columnsRenderProps: {
+ lastApplyTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+ lastPayTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+ bountyAmount: { type: 'money' },
+ enterpriseType: { type: 'enum', valueEnum: AuthTypeText },
+ },
}
);
diff --git a/src/views/EnterpriseInfo/components/EnterpriseBasicInfoView.vue b/src/views/EnterpriseInfo/components/EnterpriseBasicInfoView.vue
index 0a6ddea..a8defb8 100644
--- a/src/views/EnterpriseInfo/components/EnterpriseBasicInfoView.vue
+++ b/src/views/EnterpriseInfo/components/EnterpriseBasicInfoView.vue
@@ -2,52 +2,52 @@
<LoadingLayout :loading="isLoading">
<AppContainer>
<PageFormLayout>
- <ProForm :model="detail" ref="formRef" label-width="140px">
+ <ProForm :model="detail" ref="formRef" label-width="140px" is-read>
<ProFormCol>
<ProFormColItem :span="8">
- <ProFormItemV2 label="浼佷笟鍚嶇О:" prop="serveName" mode="read">
- <ProFormText v-model.trim="detail.categoryName" />
+ <ProFormItemV2 label="浼佷笟鍚嶇О:" prop="enterpriseName">
+ <ProFormText v-model.trim="detail.enterpriseName" />
</ProFormItemV2>
</ProFormColItem>
<ProFormColItem :span="8">
- <ProFormItemV2 label="缁熶竴绀句細淇＄敤浠ｇ爜:" prop="serveName" mode="read">
- <ProFormText v-model.trim="detail.categoryName" />
+ <ProFormItemV2 label="缁熶竴绀句細淇＄敤浠ｇ爜:" prop="societyCreditCode">
+ <ProFormText v-model.trim="detail.societyCreditCode" />
</ProFormItemV2>
</ProFormColItem>
<ProFormColItem :span="8">
- <ProFormItemV2 label="浼佷笟绫诲瀷:" prop="serveName" mode="read">
- <ProFormText v-model.trim="detail.categoryName" />
+ <ProFormItemV2 label="浼佷笟绫诲瀷:" prop="enterpriseType">
+ <ProFormRadio v-model.trim="detail.enterpriseType" :value-enum="AuthTypeText" />
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="8">
- <ProFormItemV2 label="鎵�灞炲洯鍖�:" prop="serveName" mode="read">
- <ProFormText v-model.trim="detail.categoryName" />
+ <ProFormItemV2 label="鎵�灞炲洯鍖�:" prop="industrialParkName">
+ <ProFormText v-model.trim="detail.industrialParkName" />
</ProFormItemV2>
</ProFormColItem>
<ProFormColItem :span="8">
- <ProFormItemV2 label="鍥尯绫诲瀷:" prop="serveName" mode="read">
- <ProFormText v-model.trim="detail.categoryName" />
+ <ProFormItemV2 label="鍥尯绫诲瀷:" prop="parkTypName">
+ <ProFormText v-model.trim="detail.parkTypName" />
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="8">
- <ProFormItemV2 label="寮�鎴烽摱琛�:" prop="serveName" mode="read">
- <ProFormText v-model.trim="detail.categoryName" />
+ <ProFormItemV2 label="寮�鎴烽摱琛�:" prop="bankName">
+ <ProFormText v-model.trim="detail.bankName" />
</ProFormItemV2>
</ProFormColItem>
<ProFormColItem :span="8">
- <ProFormItemV2 label="閾惰甯愬彿:" prop="serveName" mode="read">
- <ProFormText v-model.trim="detail.categoryName" />
+ <ProFormItemV2 label="閾惰甯愬彿:" prop="bankCardNumber">
+ <ProFormText v-model.trim="detail.bankCardNumber" />
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="8">
- <ProFormItemV2 label="钀ヤ笟鎵х収:" prop="serveName" mode="read">
- <!-- <ProFormUpload v-model:file-url="detail.covers"></ProFormUpload> -->
+ <ProFormItemV2 label="钀ヤ笟鎵х収:" prop="serveName">
+ <ProFormUpload v-model:file-url="_licenseUrl"></ProFormUpload>
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
@@ -70,7 +70,9 @@
ProFormUpload,
} from '@bole-core/components';
import { useQuery } from '@tanstack/vue-query';
-import * as informationServices from '@/services/api/Information';
+import * as customerServices from '@/services/api/Customer';
+import { AuthTypeText } from '@/constants';
+import { convertApi2FormUrlOnlyOne } from '@/utils';
defineOptions({
name: 'EnterpriseBasicInfoView',
@@ -80,16 +82,21 @@
const id = route.params?.id as string;
const { data: detail, isLoading } = useQuery({
- queryKey: ['informationServices/getInformationShowDetail', id],
+ queryKey: ['customerServices/getParkCustomerManageBaseDetail', id],
queryFn: async () => {
- return await informationServices.getInformationShowDetail(
+ return await customerServices.getParkCustomerManageBaseDetail(
{ id: id },
{
showLoading: false,
}
);
},
- placeholderData: () => ({} as API.InformationShowDetailDto),
+ placeholderData: () => ({} as API.GetParkCustomerManageDetailOutput),
+ enabled: !!id,
+});
+
+const _licenseUrl = computed(() => {
+ return detail.value?.licenseUrl ? convertApi2FormUrlOnlyOne(detail.value.licenseUrl) : [];
});
</script>
diff --git a/src/views/EnterpriseInfo/components/EnterpriseDeclareRecordView.vue b/src/views/EnterpriseInfo/components/EnterpriseDeclareRecordView.vue
index 3c2cc91..6ec96ca 100644
--- a/src/views/EnterpriseInfo/components/EnterpriseDeclareRecordView.vue
+++ b/src/views/EnterpriseInfo/components/EnterpriseDeclareRecordView.vue
@@ -10,7 +10,8 @@
<script setup lang="ts">
import { AppContainer, useTable, ProTableV2, defineOperationBtns } from '@bole-core/components';
import { OrderInputType } from '@bole-core/core';
-import * as informationServices from '@/services/api/Information';
+import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
+import { BountyCheckStatusEnumText } from '@/constants';
defineOptions({
name: 'EnterpriseDeclareRecordView',
@@ -19,33 +20,23 @@
const column: API.CustomModuleColumnDto[] = [
{
id: '1',
- enCode: 'batchBillNo',
+ enCode: 'batchNo',
name: '鐢虫姤鎵规鍙�',
},
{
id: '2',
- enCode: 'changeType',
+ enCode: 'creationTime',
name: '鐢虫姤鏃ユ湡',
},
{
id: '3',
- enCode: 'creationTime',
- name: '鍐呴儴瀹℃牳鏃ユ湡',
+ enCode: 'outCheckTime',
+ name: '瀹℃牳鏃ユ湡',
},
{
id: '4',
- enCode: 'effectTime',
- name: '鍐呴儴瀹℃牳缁撴灉',
- },
- {
- id: '5',
- enCode: 'insurePersonNumber',
- name: '澶栭儴瀹℃牳鏃ユ湡',
- },
- {
- id: '6',
- enCode: 'orginInsurePersonNumber',
- name: '澶栭儴瀹℃牳缁撴灉',
+ enCode: 'outCheckStatus',
+ name: '瀹℃牳缁撴灉',
},
];
@@ -79,14 +70,15 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let params: API.GetInformationForManageInput = {
+ let params: API.QueryParkCustomerBountyApplyInput = {
pageModel: {
rows: pageSize,
page: pageIndex,
orderInput: extraParamState.orderInput,
},
+ id: id,
};
- let res = await informationServices.getInformationForManage(params, {
+ let res = await parkBountyApplyServices.getParkCustomerBountyApplyList(params, {
showLoading: !state.loading,
});
return res;
@@ -94,7 +86,12 @@
},
{
defaultExtraParams: {
- orderInput: [{ property: 'creationTime', order: OrderInputType.Desc }],
+ orderInput: [{ property: 'id', order: OrderInputType.Desc }],
+ },
+ columnsRenderProps: {
+ outCheckTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+ creationTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+ outCheckStatus: { type: 'enum', valueEnum: BountyCheckStatusEnumText },
},
}
);
diff --git a/src/views/EnterpriseInfo/components/RewardConsumeRecordView.vue b/src/views/EnterpriseInfo/components/RewardConsumeRecordView.vue
index 54a8a7b..b920e5a 100644
--- a/src/views/EnterpriseInfo/components/RewardConsumeRecordView.vue
+++ b/src/views/EnterpriseInfo/components/RewardConsumeRecordView.vue
@@ -10,7 +10,8 @@
<script setup lang="ts">
import { AppContainer, useTable, ProTableV2, defineOperationBtns } from '@bole-core/components';
import { OrderInputType } from '@bole-core/core';
-import * as informationServices from '@/services/api/Information';
+import * as parkRewardServices from '@/services/api/ParkReward';
+import { EnterpriseBountyPayTypeEnumText } from '@/constants';
defineOptions({
name: 'RewardConsumeRecordView',
@@ -19,22 +20,22 @@
const column: API.CustomModuleColumnDto[] = [
{
id: '1',
- enCode: 'batchBillNo',
+ enCode: 'payDateTime',
name: '濂栧姳閲戞秷璐规棩鏈�',
},
{
id: '2',
- enCode: 'changeType',
+ enCode: 'payType',
name: '娑堣垂绫诲瀷',
},
{
id: '3',
- enCode: 'creationTime',
+ enCode: 'amount',
name: '娑堣垂閲戦',
},
{
id: '4',
- enCode: 'effectTime',
+ enCode: 'remianAmount',
name: '濂栧姳閲戜綑棰�',
},
];
@@ -69,14 +70,15 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let params: API.GetInformationForManageInput = {
+ let params: API.QueryParkCustomerBountyApplyInput = {
pageModel: {
rows: pageSize,
page: pageIndex,
orderInput: extraParamState.orderInput,
},
+ id: id,
};
- let res = await informationServices.getInformationForManage(params, {
+ let res = await parkRewardServices.getParkCustomerBountyConsumptionList(params, {
showLoading: !state.loading,
});
return res;
@@ -86,6 +88,12 @@
defaultExtraParams: {
orderInput: [{ property: 'creationTime', order: OrderInputType.Desc }],
},
+ columnsRenderProps: {
+ payDateTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+ amount: { type: 'money' },
+ remianAmount: { type: 'money' },
+ payType: { type: 'enum', valueEnum: EnterpriseBountyPayTypeEnumText },
+ },
}
);
diff --git a/src/views/EnterpriseInfo/components/RewardGrantRecordView.vue b/src/views/EnterpriseInfo/components/RewardGrantRecordView.vue
index b3e4419..1d086d5 100644
--- a/src/views/EnterpriseInfo/components/RewardGrantRecordView.vue
+++ b/src/views/EnterpriseInfo/components/RewardGrantRecordView.vue
@@ -10,7 +10,8 @@
<script setup lang="ts">
import { AppContainer, useTable, ProTableV2, defineOperationBtns } from '@bole-core/components';
import { OrderInputType } from '@bole-core/core';
-import * as informationServices from '@/services/api/Information';
+import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
+import { IncomeStatusEnumText } from '@/constants';
defineOptions({
name: 'RewardGrantRecordView',
@@ -19,27 +20,27 @@
const column: API.CustomModuleColumnDto[] = [
{
id: '1',
- enCode: 'batchBillNo',
+ enCode: 'batchNo',
name: '鐢虫姤鎵规鍙�',
},
{
id: '2',
- enCode: 'changeType',
+ enCode: 'settleTime',
name: '濂栧姳閲戝彂鏀炬棩鏈�',
},
{
id: '3',
- enCode: 'creationTime',
+ enCode: 'incomeTime',
name: '濂栧姳閲戝埌璐︽棩鏈�',
},
{
id: '4',
- enCode: 'effectTime',
+ enCode: 'applySumAmount',
name: '鍙戞斁閲戦',
},
{
id: '5',
- enCode: 'insurePersonNumber',
+ enCode: 'incomeStatus',
name: '鍒拌处纭缁撴灉',
},
];
@@ -74,14 +75,15 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let params: API.GetInformationForManageInput = {
+ let params: API.QueryParkCustomerBountyApplyInput = {
pageModel: {
rows: pageSize,
page: pageIndex,
orderInput: extraParamState.orderInput,
},
+ id: id,
};
- let res = await informationServices.getInformationForManage(params, {
+ let res = await parkBountyApplyServices.getParkCustomerBountyGrantList(params, {
showLoading: !state.loading,
});
return res;
@@ -91,6 +93,12 @@
defaultExtraParams: {
orderInput: [{ property: 'creationTime', order: OrderInputType.Desc }],
},
+ columnsRenderProps: {
+ settleTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+ incomeTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+ applySumAmount: { type: 'money' },
+ incomeStatus: { type: 'enum', valueEnum: IncomeStatusEnumText },
+ },
}
);
diff --git a/src/views/MaterialReview/MaterialReviewAudit.vue b/src/views/MaterialReview/MaterialReviewAudit.vue
index b23bdec..104cf51 100644
--- a/src/views/MaterialReview/MaterialReviewAudit.vue
+++ b/src/views/MaterialReview/MaterialReviewAudit.vue
@@ -62,7 +62,7 @@
import DetailView from '@/components/commonView/DetailView.vue';
import DeclareEnterpriseTableView from '@/components/commonView/DeclareEnterpriseTableView.vue';
import { useQuery } from '@tanstack/vue-query';
-import * as informationServices from '@/services/api/Information';
+import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
import { convertApi2FormUrlOnlyOne } from '@/utils';
import { useRouteView } from '@/hooks';
import { FormInstance } from 'element-plus';
@@ -75,41 +75,43 @@
const { closeViewPush } = useRouteView();
const id = route.params?.id as string;
const form = reactive({
- categoryName: '',
- amount: 0,
- url: [] as UploadUserFile[],
+ batchNo: '',
+ parkName: '',
+ parkTypeName: '',
+ applyMonth: '',
+ applySumAmount: 0,
+ enterpriseTaxSubFileUrl: [] as UploadUserFile[],
+ enterpriseOperateFileUrl: [] as UploadUserFile[],
+ bountyAssignFileUlr: [] as UploadUserFile[],
+ bountyCollectFileUrl: [] as UploadUserFile[],
+
status: '' as any as DataRangeEnum,
remark: '',
});
-// const state = reactive({
-// detail: {
-// categoryName: '',
-// amount: 0,
-// url: [] as UploadUserFile[],
-// },
-// form: {
-// status: '' as any as DataRangeEnum,
-// remark: '',
-// },
-// });
const tableRef = ref<InstanceType<typeof DeclareEnterpriseTableView>>();
const { data: detail, isLoading } = useQuery({
- queryKey: ['informationServices/getInformationShowDetail', id],
+ queryKey: ['parkBountyApplyServices/getParkBountyApplyDetail', id],
queryFn: async () => {
- return await informationServices.getInformationShowDetail(
- { id: id },
+ return await parkBountyApplyServices.getParkBountyApplyDetailBaseInfo(
+ { parkBountyApplyId: id },
{
showLoading: false,
}
);
},
- placeholderData: () => ({} as API.InformationShowDetailDto),
+ placeholderData: () => ({} as API.ParkBountyApplyBaseInfo),
onSuccess(data) {
- form.categoryName = data.categoryName;
- form.amount = data.attentionCount;
- form.url = convertApi2FormUrlOnlyOne(data.avatarUrl);
+ form.batchNo = data.batchNo;
+ form.parkName = data.parkName;
+ form.parkTypeName = data.parkTypeName;
+ form.applyMonth = data.applyMonth;
+ form.applySumAmount = data.applySumAmount;
+ form.enterpriseTaxSubFileUrl = convertApi2FormUrlOnlyOne(data?.enterpriseTaxSubFileUrl);
+ form.enterpriseOperateFileUrl = convertApi2FormUrlOnlyOne(data?.enterpriseOperateFileUrl);
+ form.bountyAssignFileUlr = convertApi2FormUrlOnlyOne(data?.bountyAssignFileUlr);
+ form.bountyCollectFileUrl = convertApi2FormUrlOnlyOne(data?.bountyCollectFileUrl);
tableRef.value?.getList();
},
diff --git a/src/views/MaterialReview/MaterialReviewDetail.vue b/src/views/MaterialReview/MaterialReviewDetail.vue
index b04e8fa..ba85cbb 100644
--- a/src/views/MaterialReview/MaterialReviewDetail.vue
+++ b/src/views/MaterialReview/MaterialReviewDetail.vue
@@ -14,7 +14,9 @@
</div>
</template>
<DetailView :form="form">
- <DeclareEnterpriseTableView ref="tableRef"></DeclareEnterpriseTableView>
+ <ChunkCellV2 title="鐢虫姤浼佷笟鍚嶅崟">
+ <DeclareEnterpriseTableView ref="tableRef"></DeclareEnterpriseTableView>
+ </ChunkCellV2>
</DetailView>
<template #footer>
<el-button @click="handleBack">鍏抽棴</el-button>
@@ -26,11 +28,11 @@
<script setup lang="ts">
import { AppContainer, LoadingLayout, UploadUserFile, PageFormLayout } from '@bole-core/components';
-import { DataRangeEnum } from '@/constants';
+import ChunkCellV2 from '@/components/Layout/ChunkCellV2.vue';
import DetailView from '@/components/commonView/DetailView.vue';
import DeclareEnterpriseTableView from '@/components/commonView/DeclareEnterpriseTableView.vue';
import { useQuery } from '@tanstack/vue-query';
-import * as informationServices from '@/services/api/Information';
+import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
import { convertApi2FormUrlOnlyOne } from '@/utils';
import { useRouteView } from '@/hooks';
@@ -42,28 +44,42 @@
const { closeViewPush } = useRouteView();
const id = route.params?.id as string;
const form = reactive({
+ batchNo: '',
+ parkName: '',
+ parkTypeName: '',
+ applyMonth: '',
+ applySumAmount: 0,
+ enterpriseTaxSubFileUrl: [] as UploadUserFile[],
+ enterpriseOperateFileUrl: [] as UploadUserFile[],
+ bountyAssignFileUlr: [] as UploadUserFile[],
+ bountyCollectFileUrl: [] as UploadUserFile[],
+
categoryName: '',
- amount: 0,
- url: [] as UploadUserFile[],
});
const tableRef = ref<InstanceType<typeof DeclareEnterpriseTableView>>();
const { data: detail, isLoading } = useQuery({
- queryKey: ['informationServices/getInformationShowDetail', id],
+ queryKey: ['parkBountyApplyServices/getParkBountyApplyDetail', id],
queryFn: async () => {
- return await informationServices.getInformationShowDetail(
- { id: id },
+ return await parkBountyApplyServices.getParkBountyApplyDetailBaseInfo(
+ { parkBountyApplyId: id },
{
showLoading: false,
}
);
},
- placeholderData: () => ({} as API.InformationShowDetailDto),
+ placeholderData: () => ({} as API.ParkBountyApplyBaseInfo),
onSuccess(data) {
- form.categoryName = data.categoryName;
- form.amount = data.attentionCount;
- form.url = convertApi2FormUrlOnlyOne(data.avatarUrl);
+ form.batchNo = data.batchNo;
+ form.parkName = data.parkName;
+ form.parkTypeName = data.parkTypeName;
+ form.applyMonth = data.applyMonth;
+ form.applySumAmount = data.applySumAmount;
+ form.enterpriseTaxSubFileUrl = convertApi2FormUrlOnlyOne(data?.enterpriseTaxSubFileUrl);
+ form.enterpriseOperateFileUrl = convertApi2FormUrlOnlyOne(data?.enterpriseOperateFileUrl);
+ form.bountyAssignFileUlr = convertApi2FormUrlOnlyOne(data?.bountyAssignFileUlr);
+ form.bountyCollectFileUrl = convertApi2FormUrlOnlyOne(data?.bountyCollectFileUrl);
tableRef.value?.getList();
},
diff --git a/src/views/Reward/RewardDeclareDetail.vue b/src/views/Reward/RewardDeclareDetail.vue
index 94164c5..f93d4e7 100644
--- a/src/views/Reward/RewardDeclareDetail.vue
+++ b/src/views/Reward/RewardDeclareDetail.vue
@@ -3,7 +3,9 @@
<AppContainer>
<PageFormLayout title="鐢虫姤璇︽儏">
<DetailView :form="form">
- <DeclareEnterpriseTableView ref="tableRef"></DeclareEnterpriseTableView>
+ <ChunkCellV2 title="鐢虫姤浼佷笟鍚嶅崟">
+ <DeclareEnterpriseTableView ref="tableRef"></DeclareEnterpriseTableView>
+ </ChunkCellV2>
</DetailView>
<template #footer>
<el-button @click="handleBack">鍏抽棴</el-button>
@@ -16,6 +18,7 @@
<script setup lang="ts">
import { AppContainer, LoadingLayout, UploadUserFile, PageFormLayout } from '@bole-core/components';
import DetailView from '@/components/commonView/DetailView.vue';
+import ChunkCellV2 from '@/components/Layout/ChunkCellV2.vue';
import DeclareEnterpriseTableView from '@/components/commonView/DeclareEnterpriseTableView.vue';
import { useQuery } from '@tanstack/vue-query';
import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
@@ -30,7 +33,6 @@
const { closeViewPush } = useRouteView();
const id = route.params?.id as string;
const form = reactive({
- searchKeyWord: '',
batchNo: '',
parkName: '',
parkTypeName: '',
@@ -47,32 +49,24 @@
const { data: detail, isLoading } = useQuery({
queryKey: ['parkBountyApplyServices/getParkBountyApplyDetail', id],
queryFn: async () => {
- return await parkBountyApplyServices.getParkBountyApplyDetail(
- { parkBountyApplyId: id, searchKeyWord: form.searchKeyWord },
+ return await parkBountyApplyServices.getParkBountyApplyDetailBaseInfo(
+ { parkBountyApplyId: id },
{
showLoading: false,
}
);
},
- placeholderData: () => ({} as API.GetParkBountyApplyInfoOutput),
+ placeholderData: () => ({} as API.ParkBountyApplyBaseInfo),
onSuccess(data) {
- form.batchNo = data.parkBountyApplyBaseInfo.batchNo;
- form.parkName = data.parkBountyApplyBaseInfo.parkName;
- form.parkTypeName = data.parkBountyApplyBaseInfo.parkTypeName;
- form.applyMonth = data.parkBountyApplyBaseInfo.applyMonth;
- form.applySumAmount = data.parkBountyApplyBaseInfo.applySumAmount;
- form.enterpriseTaxSubFileUrl = convertApi2FormUrlOnlyOne(
- data.parkBountyApplyBaseInfo?.enterpriseTaxSubFileUrl
- );
- form.enterpriseOperateFileUrl = convertApi2FormUrlOnlyOne(
- data.parkBountyApplyBaseInfo?.enterpriseOperateFileUrl
- );
- form.bountyAssignFileUlr = convertApi2FormUrlOnlyOne(
- data.parkBountyApplyBaseInfo?.bountyAssignFileUlr
- );
- form.bountyCollectFileUrl = convertApi2FormUrlOnlyOne(
- data.parkBountyApplyBaseInfo?.bountyCollectFileUrl
- );
+ form.batchNo = data.batchNo;
+ form.parkName = data.parkName;
+ form.parkTypeName = data.parkTypeName;
+ form.applyMonth = data.applyMonth;
+ form.applySumAmount = data.applySumAmount;
+ form.enterpriseTaxSubFileUrl = convertApi2FormUrlOnlyOne(data?.enterpriseTaxSubFileUrl);
+ form.enterpriseOperateFileUrl = convertApi2FormUrlOnlyOne(data?.enterpriseOperateFileUrl);
+ form.bountyAssignFileUlr = convertApi2FormUrlOnlyOne(data?.bountyAssignFileUlr);
+ form.bountyCollectFileUrl = convertApi2FormUrlOnlyOne(data?.bountyCollectFileUrl);
tableRef.value?.getList();
},
diff --git a/src/views/Reward/RewardGrant.vue b/src/views/Reward/RewardGrant.vue
index d774178..2fe06d7 100644
--- a/src/views/Reward/RewardGrant.vue
+++ b/src/views/Reward/RewardGrant.vue
@@ -203,6 +203,7 @@
orderInput: [{ property: 'creationTime', order: OrderInputType.Desc }],
},
columnsRenderProps: {
+ applyMonth: { type: 'date', format: 'YYYY骞碝M鏈�' },
creationTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
settleTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
applySumAmount: { type: 'money' },
--
Gitblit v1.10.0