From 752badd812a5fab53770033cd8d33d2f4d85d6e4 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 26 十一月 2025 16:23:37 +0800
Subject: [PATCH] fix: 多模板
---
src/services/api/index.ts | 2 +
src/services/api/WaterDropCloud.ts | 11 +++++
src/services/api/typings.d.ts | 63 ++++++++++++++++++++++++++++++-
src/hooks/fourStreams.ts | 9 +++-
src/views/Reward/RewardDeclareDetail.vue | 4 ++
src/services/api/IndustrialPark.ts | 18 +++++++++
src/views/MaterialReview/MaterialReviewDetail.vue | 5 ++
src/views/MaterialReview/components/MaterialReviewAuditView.vue | 4 ++
src/views/Reward/RewardGrantRegister.vue | 4 ++
9 files changed, 114 insertions(+), 6 deletions(-)
diff --git a/src/hooks/fourStreams.ts b/src/hooks/fourStreams.ts
index 0ea2acc..7464dda 100644
--- a/src/hooks/fourStreams.ts
+++ b/src/hooks/fourStreams.ts
@@ -91,10 +91,11 @@
id?: Ref<string>;
applyMonth?: Ref<string>;
enableUploadExtraFiles?: boolean;
+ bountyTemplateId?: Ref<string>;
};
export function useDeclareEnterpriseTable(options: UseDeclareEnterpriseTableOptions = {}) {
- const { id, applyMonth, enableUploadExtraFiles = false } = options;
+ const { id, applyMonth, enableUploadExtraFiles = false, bountyTemplateId } = options;
const {
getDataSource: getList,
@@ -158,14 +159,16 @@
try {
const applyFilesRes = await queryClient.ensureQueryData({
queryKey: [
- 'enterpriseApplyFileServices/getCustomerUploadApplyFiles',
+ 'enterpriseApplyFileServices/getCustomerUploadApplyFilesV2',
row.enterpriseId,
applyMonth.value,
+ bountyTemplateId.value,
],
queryFn: async () => {
- return await enterpriseApplyFileServices.getCustomerUploadApplyFiles({
+ return await enterpriseApplyFileServices.getCustomerUploadApplyFilesV2({
enterpriseId: row.enterpriseId,
withMonth: applyMonth.value,
+ bountyTemplateId: bountyTemplateId.value,
});
},
});
diff --git a/src/services/api/IndustrialPark.ts b/src/services/api/IndustrialPark.ts
index 2f0af63..d07dcca 100644
--- a/src/services/api/IndustrialPark.ts
+++ b/src/services/api/IndustrialPark.ts
@@ -99,6 +99,24 @@
);
}
+/** 鏌ヨ鍥尯濂栧姳閲戞ā鏉垮悕绉� POST /api/IndustrialPark/GetIndustrialPartBountyTemplates */
+export async function getIndustrialPartBountyTemplates(
+ body: API.GetIndustrialPartBountyTemplatesInput,
+ options?: API.RequestConfig
+) {
+ return request<API.GetIndustrialPartBountyTemplatesOutput>(
+ '/api/IndustrialPark/GetIndustrialPartBountyTemplates',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
/** 璁剧疆濂栧姳閲戠敵鎶ョ姸鎬� POST /api/IndustrialPark/SetIndustrialParkRewardEnable */
export async function setIndustrialParkRewardEnable(
body: API.SetIndustrialParkRewardEnableInput,
diff --git a/src/services/api/WaterDropCloud.ts b/src/services/api/WaterDropCloud.ts
new file mode 100644
index 0000000..b4cdc31
--- /dev/null
+++ b/src/services/api/WaterDropCloud.ts
@@ -0,0 +1,11 @@
+/* eslint-disable */
+// @ts-ignore
+import { request } from '@/utils/request';
+
+/** 鍚屾瀹㈡埛鏉愭枡 POST /api/WaterDropCloud/SyncCompanyMaterial */
+export async function syncCompanyMaterial(options?: API.RequestConfig) {
+ return request<any>('/api/WaterDropCloud/SyncCompanyMaterial', {
+ method: 'POST',
+ ...(options || {}),
+ });
+}
diff --git a/src/services/api/index.ts b/src/services/api/index.ts
index a0a2349..f1c9fa4 100644
--- a/src/services/api/index.ts
+++ b/src/services/api/index.ts
@@ -90,6 +90,7 @@
import * as Version from './Version';
import * as Wallet from './Wallet';
import * as WalletChannel from './WalletChannel';
+import * as WaterDropCloud from './WaterDropCloud';
import * as Withdraw from './Withdraw';
import * as WxNotify from './WxNotify';
import * as WxPayNotify from './WxPayNotify';
@@ -182,6 +183,7 @@
Version,
Wallet,
WalletChannel,
+ WaterDropCloud,
Withdraw,
WxNotify,
WxPayNotify,
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 3e48d67..e8c345f 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -249,7 +249,7 @@
/** 鏄惁鏀寔璐㈡斂鎷ㄤ粯 */
suportFinance?: boolean;
/** 鏂囦欢 */
- industrialParkApplyFileFile?: IndustrialParkApplyFileFile[];
+ bountTemplates?: AddIndustrialParkInputBountTemplate[];
/** 鏃犻渶鏀垮姟绔鏍� */
notNeedGovernmentAudit?: boolean;
/** 鏃犻渶杩愯惀绔鏍� */
@@ -258,6 +258,15 @@
dualReviewOfGovernmentAffairs?: boolean;
/** 鍏徃淇℃伅 */
industrialParkCompanyFile?: IndustrialParkCompanyFile[];
+ }
+
+ interface AddIndustrialParkInputBountTemplate {
+ /** 妯℃澘Id */
+ templateId?: string;
+ /** 妯℃澘鍚嶇О */
+ templateName?: string;
+ /** 鏂囦欢 */
+ items?: IndustrialParkApplyFileFile[];
}
interface AddIndustryBodyAuditInput {
@@ -467,6 +476,8 @@
interface AddParkBountyApplyStepOneInput {
batchNo?: string;
parkId?: string;
+ /** 濂栧姳閲戞ā鏉縄d */
+ bountyTemplateId?: string;
applyMonth?: string;
removeCompanyIds?: string[];
}
@@ -1398,6 +1409,7 @@
interface APIgetCustomerFileTypeHeadParams {
enterpriseId?: string;
+ templateId?: string;
}
interface APIgetCustomerTemplateDetailParams {
@@ -5851,6 +5863,8 @@
applyAmount?: number;
fileTypes?: CustomerUploadMonthApplyFileType[];
enterpriseId?: string;
+ /** 濂栧姳閲戞ā鏉縄d */
+ bountyTemplateId?: string;
/** 鏄惁鏄繍钀ョ浠ｄ笂浼� */
isAdminFileUpload?: boolean;
}
@@ -5880,6 +5894,8 @@
applyAmount?: number;
fileTypes?: CustomerUploadMonthApplyFileType[];
enterpriseId?: string;
+ /** 濂栧姳閲戞ā鏉縄d */
+ bountyTemplateId?: string;
/** 鏄惁鏄繍钀ョ浠ｄ笂浼� */
isAdminFileUpload?: boolean;
/** 姹囨�绘潗鏂� */
@@ -7722,6 +7738,8 @@
interface GetCustomerUploadApplyFilesInput {
id?: string;
enterpriseId?: string;
+ /** 濂栧姳閲戞ā鏉縄d */
+ bountyTemplateId?: string;
userId?: string;
withMonth?: string;
parkBountyApplyId?: string;
@@ -7746,6 +7764,8 @@
interface GetCustomerUploadApplyFilesResponse {
/** 鎵�灞炴湀浠� */
withMonth?: string;
+ /** 濂栧姳閲戞ā鏉縄d */
+ bountyTemplateId?: string;
/** 浼佷笟鍚嶇О */
enterpriseName?: string;
/** 鐢虫姤閲戦 */
@@ -7759,6 +7779,8 @@
interface GetCustomerUploadApplyFilesV2Response {
/** 鎵�灞炴湀浠� */
withMonth?: string;
+ /** 濂栧姳閲戞ā鏉縄d */
+ bountyTemplateId?: string;
/** 浼佷笟鍚嶇О */
enterpriseName?: string;
/** 鐢虫姤閲戦 */
@@ -7775,6 +7797,8 @@
interface GetCustomerUploadFileRecordInput {
withMonth?: string;
+ /** 濂栧姳閲戞ā鏉縄d */
+ bountyTemplateId?: string;
userId?: string;
}
@@ -8215,6 +8239,21 @@
categoryId?: string;
/** 鏌ヨ鏉′欢锛氫骇鍝佸悕绉�/鏈嶅姟鍟嗗悕绉� */
queryCondition?: string;
+ }
+
+ interface GetIndustrialPartBountyTemplatesInput {
+ /** 鍥尯Id */
+ id?: string;
+ }
+
+ interface GetIndustrialPartBountyTemplatesOutput {
+ /** 濂栧姳閲戞ā鏉垮悕绉� */
+ bountyTemplates?: GetIndustrialPartBountyTemplatesOutputItem[];
+ }
+
+ interface GetIndustrialPartBountyTemplatesOutputItem {
+ id?: string;
+ templateName?: string;
}
interface GetInformationAdvertiseByCategoryInput {
@@ -9605,6 +9644,8 @@
interface GetParkCollectFileTypeListInput {
parkId?: string;
+ /** 濂栧姳閲戞ā鏉縄d */
+ bountyTemplateId?: string;
searchType?: number;
}
@@ -11725,8 +11766,18 @@
registerAddress?: string;
/** 澶囨敞 */
remark?: string;
- industrialParkFileTypeList?: IndustrialParkFileTypeOutput[];
+ /** 濂栧姳閲戞ā鏉� */
+ bountyTemplates?: IndustrialParkDetailOutputFileTypeTemplate[];
industrialParkCompanyList?: IndustrialParkCompanyOutput[];
+ }
+
+ interface IndustrialParkDetailOutputFileTypeTemplate {
+ /** 妯℃澘Id */
+ templateId?: string;
+ /** 妯℃澘鍚嶇О */
+ templateName?: string;
+ /** 鏉愭枡 */
+ items?: IndustrialParkFileTypeOutput[];
}
interface IndustrialParkDropDownOutput {
@@ -16659,6 +16710,10 @@
interface OutCheckParkBountyApplyBaseInfo {
/** 鐢宠鎵规鍙� */
batchNo?: string;
+ /** 濂栧姳閲戞ā鏉� */
+ bountyTemplateId?: string;
+ /** 濂栧姳閲戞ā鏉垮悕绉� */
+ bountyTemplateName?: string;
/** 鐢宠鍥尯Id */
parkId?: string;
/** 鐢宠鍥尯 */
@@ -22899,7 +22954,7 @@
/** 鏄惁鏀寔璐㈡斂鎷ㄤ粯 */
suportFinance?: boolean;
/** 鏂囦欢 */
- industrialParkApplyFileFile?: IndustrialParkApplyFileFile[];
+ bountTemplates?: AddIndustrialParkInputBountTemplate[];
/** 鏃犻渶鏀垮姟绔鏍� */
notNeedGovernmentAudit?: boolean;
/** 鏃犻渶杩愯惀绔鏍� */
@@ -23587,6 +23642,8 @@
fileSearchTypeId?: string;
listFiles?: CustomerUploadMonthApplyFileTypeDto[];
enterpriseId?: string;
+ /** 濂栧姳閲戞ā鏉縄d */
+ bountyTemplateId?: string;
}
interface UploadParkApplyCustomerFilesInput {
diff --git a/src/views/MaterialReview/MaterialReviewDetail.vue b/src/views/MaterialReview/MaterialReviewDetail.vue
index f893421..efc708f 100644
--- a/src/views/MaterialReview/MaterialReviewDetail.vue
+++ b/src/views/MaterialReview/MaterialReviewDetail.vue
@@ -122,6 +122,8 @@
suportPlatRecharge: false,
suportFinance: false,
+
+ bountyTemplateId: '',
});
const { addRewardApplyStep3Columns } = useAddRewardApplyStep3Columns({
@@ -133,6 +135,7 @@
useDeclareEnterpriseTable({
id: ref(id),
applyMonth: toRef(form, 'applyMonth'),
+ bountyTemplateId: toRef(form, 'bountyTemplateId'),
});
const tableRef = ref<InstanceType<typeof DeclareEnterpriseTableView>>();
@@ -174,6 +177,8 @@
form.suportFinance = data.suportFinance;
form.reasonForWithdrawal = data.reasonForWithdrawal ?? '';
+ form.bountyTemplateId = data.bountyTemplateId ?? '';
+
getList();
},
});
diff --git a/src/views/MaterialReview/components/MaterialReviewAuditView.vue b/src/views/MaterialReview/components/MaterialReviewAuditView.vue
index b60976d..5016956 100644
--- a/src/views/MaterialReview/components/MaterialReviewAuditView.vue
+++ b/src/views/MaterialReview/components/MaterialReviewAuditView.vue
@@ -126,6 +126,7 @@
suportPlatRecharge: false,
suportFinance: false,
+ bountyTemplateId: '',
});
const { addRewardApplyStep3Columns } = useAddRewardApplyStep3Columns({
@@ -138,6 +139,7 @@
id: ref(id),
applyMonth: toRef(form, 'applyMonth'),
enableUploadExtraFiles: true,
+ bountyTemplateId: toRef(form, 'bountyTemplateId'),
});
const { data: detail, isLoading } = useQuery({
@@ -172,6 +174,8 @@
form.suportPlatRecharge = data.suportPlatRecharge;
form.suportFinance = data.suportFinance;
+ form.bountyTemplateId = data.bountyTemplateId;
+
getList();
},
});
diff --git a/src/views/Reward/RewardDeclareDetail.vue b/src/views/Reward/RewardDeclareDetail.vue
index 28e9717..f582f1e 100644
--- a/src/views/Reward/RewardDeclareDetail.vue
+++ b/src/views/Reward/RewardDeclareDetail.vue
@@ -63,6 +63,7 @@
extraListFiles: [] as CustomerApplyFileTypeListItem[],
suportPlatRecharge: false,
suportFinance: false,
+ bountyTemplateId: '',
});
const { addRewardApplyStep3Columns } = useAddRewardApplyStep3Columns({
@@ -74,6 +75,7 @@
useDeclareEnterpriseTable({
id: ref(id),
applyMonth: toRef(form, 'applyMonth'),
+ bountyTemplateId: toRef(form, 'bountyTemplateId'),
});
const { data: detail, isLoading } = useQuery({
@@ -107,6 +109,8 @@
form.suportPlatRecharge = data.suportPlatRecharge;
form.suportFinance = data.suportFinance;
+ form.bountyTemplateId = data.bountyTemplateId;
+
getList();
},
});
diff --git a/src/views/Reward/RewardGrantRegister.vue b/src/views/Reward/RewardGrantRegister.vue
index bd2dfa9..0915d1b 100644
--- a/src/views/Reward/RewardGrantRegister.vue
+++ b/src/views/Reward/RewardGrantRegister.vue
@@ -101,6 +101,7 @@
suportPlatRecharge: false,
suportFinance: false,
+ bountyTemplateId: '',
});
const { rewardGrantRegisterColumns } = useRewardGrantRegisterColumns();
@@ -109,6 +110,7 @@
useDeclareEnterpriseTable({
id: ref(id),
applyMonth: toRef(form, 'applyMonth'),
+ bountyTemplateId: toRef(form, 'bountyTemplateId'),
});
const registerOperationBtns = defineOperationBtns([
@@ -170,6 +172,8 @@
form.suportPlatRecharge = data.suportPlatRecharge;
form.suportFinance = data.suportFinance;
+ form.bountyTemplateId = data.bountyTemplateId;
+
getList();
},
});
--
Gitblit v1.9.1