From e1aeb653d656b3c3be05f06cac212f435cec07c3 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 25 七月 2025 15:55:36 +0800
Subject: [PATCH] Merge branch 'dev-3.4.2.5' of http://120.26.58.240:8888/r/12333GovernmentWeb into dev-3.4.2.5
---
src/constants/fourStreams.ts | 3 +
src/services/api/typings.d.ts | 60 +++++++++++++++++++++++++++++-
src/views/Reward/RewardApplyTradeCheck.vue | 2
src/views/Reward/constants/columns.ts | 4 +-
src/views/Reward/FinancialApproval.vue | 2
src/views/Reward/RewardGrantRegister.vue | 4 +-
6 files changed, 66 insertions(+), 9 deletions(-)
diff --git a/src/constants/fourStreams.ts b/src/constants/fourStreams.ts
index a9944a6..b8c2138 100644
--- a/src/constants/fourStreams.ts
+++ b/src/constants/fourStreams.ts
@@ -104,17 +104,18 @@
id: '5',
enCode: 'authType',
name: '浼佷笟绫诲瀷',
+ width: 120,
},
{
id: '6',
enCode: 'licenseUrl',
name: '钀ヤ笟鎵х収',
+ width: 120,
},
{
id: '7',
enCode: 'bankAccountInfo',
name: '鍩烘湰鎴蜂俊鎭�',
- width: 300,
},
]);
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 2d78064..d8c1ae5 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -4130,6 +4130,16 @@
industrialParkIds?: string[];
/** 瑙掕壊 */
roleNames?: string[];
+ /** 鏄惁鐞嗚禂鎻愰啋 */
+ sendClaimMessage?: boolean;
+ /** 鏄惁淇濆崟鍒版湡鎻愰啋 */
+ sendBillExpireMessage?: boolean;
+ /** 鏄惁鐭俊鎻愰啋 */
+ isSendMessage?: boolean;
+ /** 鏄惁浜哄憳鍙樻洿鎻愰啋 */
+ staffChangeMessage?: boolean;
+ /** 鏄惁鎵规敼鎻愰啋 */
+ batchUpdateMessage?: boolean;
/** 瀵嗙爜 */
password?: string;
}
@@ -5590,10 +5600,14 @@
industrialParkId?: string;
/** 浜т笟鍥尯鍚嶇О */
industrialParkName?: string;
+ /** 缁存姢鐨勫叕鍙� */
+ companyOrgId?: string;
+ /** 缁存姢鐨勯儴闂� */
+ departmentOrgId?: string;
/** 鏄惁鏈夋湇鍔′汉鍛� */
isHasServiceStaff?: boolean;
- /** 鏈嶅姟浜哄憳id */
- userServiceStaffId?: string;
+ /** 鏈嶅姟浜哄憳鍚嶇О */
+ userServiceStaffs?: CustomerManageListOutputUserServiceStaff[];
/** 鏈嶅姟浜哄憳鍚嶇О */
userServiceStaffName?: string;
/** 鏄惁濂栧姳閲戝彂鏀� */
@@ -5608,6 +5622,14 @@
pageModel?: Pagination;
objectData?: any;
data?: CustomerManageListOutput[];
+ }
+
+ interface CustomerManageListOutputUserServiceStaff {
+ /** 鐢ㄦ埛Id */
+ userId?: string;
+ /** 鏈嶅姟浜哄憳Id */
+ userServiceStaffId?: string;
+ name?: string;
}
interface CustomerMenu {
@@ -9042,6 +9064,8 @@
tradeTime?: string;
/** 濂栧姳閲戜綑棰� */
remianAmount?: number;
+ /** 濂栧姳閲戜綑棰� */
+ bountyAmount?: number;
financeType?: FinanceTypeEnum;
showAuditStatus?: EnumParkBountyTradeDetailAuditStatus;
auditStatus?: EnumParkBountyTradeDetailAuditStatus;
@@ -9530,6 +9554,10 @@
amount?: number;
/** 鍑瘉鍦板潃 */
url?: string;
+ /** 瀹℃牳鍑瘉 */
+ payAuditFileUrl?: string;
+ /** 瀹℃牳鍑瘉 */
+ financeAuditFileUrl?: string;
/** 濂栧姳閲戠敵鎶ヨ缁咺d */
parkBountyApplyDetailId?: string;
/** 鍏宠仈Id */
@@ -9562,6 +9590,10 @@
industrialParkId?: string;
/** 鎵�灞炲洯鍖� */
industrialParkName?: string;
+ /** 鏄惁鏀寔骞冲彴鍏呭�� */
+ suportPlatRecharge?: boolean;
+ /** 鏄惁鏀寔鐢ㄦ埛鎻愮幇 */
+ suportWithDraw?: boolean;
/** 鑱旂郴浜� */
contact?: string;
/** 鑱旂郴鐢佃瘽 */
@@ -18457,6 +18489,8 @@
/** 鏈嶅姟浜哄憳Id */
userServiceStaffId?: string;
userId?: string;
+ /** 浜т笟鍥尯id */
+ industrialParkId?: string;
}
interface QueryCustomerTemplateListInput {
@@ -21933,6 +21967,16 @@
industrialParkIds?: string[];
/** 瑙掕壊 */
roleNames?: string[];
+ /** 鏄惁鐞嗚禂鎻愰啋 */
+ sendClaimMessage?: boolean;
+ /** 鏄惁淇濆崟鍒版湡鎻愰啋 */
+ sendBillExpireMessage?: boolean;
+ /** 鏄惁鐭俊鎻愰啋 */
+ isSendMessage?: boolean;
+ /** 鏄惁浜哄憳鍙樻洿鎻愰啋 */
+ staffChangeMessage?: boolean;
+ /** 鏄惁鎵规敼鎻愰啋 */
+ batchUpdateMessage?: boolean;
/** 瀵嗙爜 */
password?: string;
/** 鐢ㄦ埛Id */
@@ -23240,8 +23284,20 @@
companyOrgId?: string;
/** 缁勭粐鏋舵瀯閮ㄩ棬id */
departmentOrgId?: string;
+ /** 鐢ㄦ埛绔疘d */
+ clientId?: string;
/** 鍥尯Ids */
industrialParkIds?: string[];
+ /** 鏄惁鐞嗚禂鎻愰啋 */
+ sendClaimMessage?: boolean;
+ /** 鏄惁淇濆崟鍒版湡鎻愰啋 */
+ sendBillExpireMessage?: boolean;
+ /** 鏄惁鐭俊鎻愰啋 */
+ isSendMessage?: boolean;
+ /** 鏄惁浜哄憳鍙樻洿鎻愰啋 */
+ staffChangeMessage?: boolean;
+ /** 鏄惁鎵规敼鎻愰啋 */
+ batchUpdateMessage?: boolean;
}
interface UserDtoPageOutput {
diff --git a/src/views/Reward/FinancialApproval.vue b/src/views/Reward/FinancialApproval.vue
index 78ec38c..af7b6fe 100644
--- a/src/views/Reward/FinancialApproval.vue
+++ b/src/views/Reward/FinancialApproval.vue
@@ -176,7 +176,7 @@
tradeTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
financeAuditTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
tradeAmount: { type: 'money' },
- remianAmount: { type: 'money' },
+ bountyAmount: { type: 'money' },
financeAuditStatus: {
type: 'tag',
valueEnum: EnumParkBountyTradeDetailAuditStatusText,
diff --git a/src/views/Reward/RewardApplyTradeCheck.vue b/src/views/Reward/RewardApplyTradeCheck.vue
index 62ae73f..1ce39a1 100644
--- a/src/views/Reward/RewardApplyTradeCheck.vue
+++ b/src/views/Reward/RewardApplyTradeCheck.vue
@@ -176,7 +176,7 @@
tradeTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
auditTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
tradeAmount: { type: 'money' },
- remianAmount: { type: 'money' },
+ bountyAmount: { type: 'money' },
auditStatus: {
type: 'tag',
valueEnum: EnumParkBountyTradeDetailAuditStatusText,
diff --git a/src/views/Reward/RewardGrantRegister.vue b/src/views/Reward/RewardGrantRegister.vue
index 0515dc7..c4fa6d6 100644
--- a/src/views/Reward/RewardGrantRegister.vue
+++ b/src/views/Reward/RewardGrantRegister.vue
@@ -262,11 +262,11 @@
},
});
-async function handleImportParkBountyData(response: UploadUserFile) {
+async function handleImportParkBountyData() {
try {
let params: API.ImportBountyApplyDataInput = {
parkBountyApplyId: uploadFileForm.parkBountyApplyId,
- url: response.url,
+ url: uploadFileForm.url?.[0]?.path ?? '',
financeToFileUrl: convertFormUrl2ApiBySeparator(uploadFileForm.financeToFileUrl),
transferToFileUrl: convertFormUrl2ApiBySeparator(uploadFileForm.transferToFileUrl),
};
diff --git a/src/views/Reward/constants/columns.ts b/src/views/Reward/constants/columns.ts
index 428f1cc..b9d017c 100644
--- a/src/views/Reward/constants/columns.ts
+++ b/src/views/Reward/constants/columns.ts
@@ -69,7 +69,7 @@
},
{
id: '12',
- enCode: 'remianAmount',
+ enCode: 'bountyAmount',
name: '璧勯噾浣欓',
width: 120,
},
@@ -152,7 +152,7 @@
},
{
id: '11',
- enCode: 'remianAmount',
+ enCode: 'bountyAmount',
name: '璧勯噾浣欓',
width: 160,
},
--
Gitblit v1.9.1