From 27f846dc2415f9a962c09e45b5447ad0f9106e2b Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 16 十月 2025 17:07:03 +0800
Subject: [PATCH] fix: s
---
vite.config.ts | 9 +++-
src/services/api/typings.d.ts | 56 +++++++++++++++++++++++++++
src/views/Reward/RewardApplyTradeCheck.vue | 1
src/services/api/ParkBountyApply.ts | 15 +++++++
src/views/Reward/constants/columns.ts | 24 ++++++++++++
src/views/Reward/FinancialApproval.vue | 1
6 files changed, 102 insertions(+), 4 deletions(-)
diff --git a/src/services/api/ParkBountyApply.ts b/src/services/api/ParkBountyApply.ts
index a85c998..fd6e378 100644
--- a/src/services/api/ParkBountyApply.ts
+++ b/src/services/api/ParkBountyApply.ts
@@ -1131,6 +1131,21 @@
});
}
+/** 鍚屾濂栧姳閲�-浼佷笟鑷韩鍑鸿处-瀹℃壒 POST /api/ParkBountyApply/SyncAuditParkBountyApplyTradeBySelf */
+export async function syncAuditParkBountyApplyTradeBySelf(
+ body: API.SyncAuditParkBountyApplyTradeBySelfInput,
+ options?: API.RequestConfig
+) {
+ return request<number>('/api/ParkBountyApply/SyncAuditParkBountyApplyTradeBySelf', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 鍚屾濂栧姳閲戝嚭璐︿俊鎭� POST /api/ParkBountyApply/SyncParkBountyApplyTrade */
export async function syncParkBountyApplyTrade(
body: API.CreateParkBountyTradeInput,
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index ef76c8a..0fd93ec 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -5175,7 +5175,6 @@
}
interface CreateParkBountyTradeInput {
- enterpriseId?: string;
/** 鏈�杩戝嚭璐﹂噾棰� */
tradeAmount?: number;
/** 鍑鸿处鍑瘉 */
@@ -5193,6 +5192,8 @@
incomeBankCardNumber?: string;
/** 寮�鎴疯 */
incomeBankName?: string;
+ enterpriseId?: string;
+ selfAuditStatus?: EnumParkBountyTradeDetailAuditStatus;
}
interface CreateParkOrHRAdvertiseInput {
@@ -9083,6 +9084,7 @@
financeType?: FinanceTypeEnum;
auditStatus?: EnumParkBountyTradeDetailAuditStatus;
financeAuditStatus?: EnumParkBountyTradeDetailAuditStatus;
+ selfAuditStatus?: EnumParkBountyTradeDetailAuditStatus;
}
interface GetParkBountyTradeDetailOutput {
@@ -9143,6 +9145,25 @@
/** 寮�鎴疯 */
incomeBankName?: string;
creationTime?: string;
+ selfAuditStatus?: EnumParkBountyTradeDetailAuditStatus;
+ /** 浼佷笟鑷韩鍑鸿处瀹℃牳澶囨敞 */
+ selfAuditRemark?: string;
+ /** 浼佷笟鑷韩鍑鸿处瀹℃牳鏃堕棿 */
+ selfAuditTime?: string;
+ /** 浼佷笟鑷韩瀹℃牳鍑瘉 */
+ selfAuditFileUrl?: string;
+ /** 鍑鸿处鎿嶄綔浜� */
+ auditOperator?: string;
+ /** 鍑鸿处鎿嶄綔浜篒D */
+ auditOperatorId?: string;
+ /** 璐㈠姟瀹℃牳鎿嶄綔浜� */
+ financeAuditOperator?: string;
+ /** 璐㈠姟瀹℃牳鎿嶄綔浜篒d */
+ financeAuditOperatorId?: string;
+ /** 浼佷笟鑷韩鎿嶄綔浜� */
+ selfAuditOperator?: string;
+ /** 浼佷笟鑷韩鎿嶄綔浜篒d */
+ selfAuditOperatorId?: string;
}
interface GetParkBountyTradeDetailOutputPageOutput {
@@ -21510,6 +21531,22 @@
sequence?: number;
}
+ interface SyncAuditParkBountyApplyTradeBySelfInput {
+ /** 姹熶綉淇濆嚭璐﹁褰旾d */
+ id?: string;
+ /** 818鍑鸿处璁板綍Id */
+ parkBountyApplyDetailId?: string;
+ selfAuditStatus?: EnumParkBountyTradeDetailAuditStatus;
+ /** 瀹℃牳澶囨敞 */
+ selfAuditRemark?: string;
+ /** 瀹℃牳鍑瘉 */
+ selfAuditFileUrl?: string;
+ /** 浼佷笟鑷韩鎿嶄綔浜� */
+ selfAuditOperator?: string;
+ /** 浼佷笟鑷韩鎿嶄綔浜篒d */
+ selfAuditOperatorId?: string;
+ }
+
interface SyncParkBountyApplyTradeOutput {
bountyAmount?: number;
rechargeAmount?: number;
@@ -21532,6 +21569,23 @@
auditById?: string;
/** 瀹℃牳鏃堕棿 */
auditTime?: string;
+ /** 杩涜处鍗曚綅 */
+ incomeCompanyName?: string;
+ /** 淇濆崟鍙� */
+ insureBillNo?: string;
+ /** 鏀舵鍗曚綅鍚嶇О */
+ incomeBankAccount?: string;
+ /** 鏀舵鍗曚綅璐﹀彿 */
+ incomeBankCardNumber?: string;
+ /** 寮�鎴疯 */
+ incomeBankName?: string;
+ selfAuditStatus?: EnumParkBountyTradeDetailAuditStatus;
+ /** 浼佷笟鑷韩鍑鸿处瀹℃牳澶囨敞 */
+ selfAuditRemark?: string;
+ /** 浼佷笟鑷韩鍑鸿处瀹℃牳鏃堕棿 */
+ selfAuditTime?: string;
+ /** 浼佷笟鑷韩瀹℃牳鍑瘉 */
+ selfAuditFileUrl?: string;
}
interface SysOrgDetailOutput {
diff --git a/src/views/Reward/FinancialApproval.vue b/src/views/Reward/FinancialApproval.vue
index 160765c..93d7e26 100644
--- a/src/views/Reward/FinancialApproval.vue
+++ b/src/views/Reward/FinancialApproval.vue
@@ -158,6 +158,7 @@
auditTimeBegin: format(extraParamState.creationTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
auditTimeEnd: format(extraParamState.creationTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
auditStatus: EnumParkBountyTradeDetailAuditStatus.Pass,
+ selfAuditStatus: EnumParkBountyTradeDetailAuditStatus.Pass,
financeType: FinanceTypeEnum.PlatReward,
};
let res = await parkBountyApplyServices.getParkBountyTradeDetailList(params, {
diff --git a/src/views/Reward/RewardApplyTradeCheck.vue b/src/views/Reward/RewardApplyTradeCheck.vue
index a5a887d..75bc690 100644
--- a/src/views/Reward/RewardApplyTradeCheck.vue
+++ b/src/views/Reward/RewardApplyTradeCheck.vue
@@ -157,6 +157,7 @@
creationTimeBegin: format(extraParamState.creationTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
creationTimeEnd: format(extraParamState.creationTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
auditStatus: extraParamState.auditStatus,
+ selfAuditStatus: EnumParkBountyTradeDetailAuditStatus.Pass,
financeType: FinanceTypeEnum.PlatReward,
};
let res = await parkBountyApplyServices.getParkBountyTradeDetailList(params, {
diff --git a/src/views/Reward/constants/columns.ts b/src/views/Reward/constants/columns.ts
index c1e9ac2..c2d188b 100644
--- a/src/views/Reward/constants/columns.ts
+++ b/src/views/Reward/constants/columns.ts
@@ -68,10 +68,22 @@
width: 180,
},
{
+ id: '11-1',
+ enCode: 'incomeCompanyName',
+ name: '杩涜处鍗曚綅',
+ width: 180,
+ },
+ {
id: '12',
enCode: 'bountyAmount',
name: '璧勯噾浣欓',
width: 120,
+ },
+ {
+ id: '12-1',
+ enCode: 'auditOperator',
+ name: '瀹℃牳浜�',
+ width: 180,
},
{
id: '13',
@@ -145,6 +157,12 @@
width: 160,
},
{
+ id: '11-1',
+ enCode: 'incomeCompanyName',
+ name: '杩涜处鍗曚綅',
+ width: 180,
+ },
+ {
id: '10',
enCode: 'auditTime',
name: '鍑鸿处瀹℃牳鏃ユ湡',
@@ -163,6 +181,12 @@
width: 160,
},
{
+ id: '12-1',
+ enCode: 'financeAuditOperator',
+ name: '瀹℃牳浜�',
+ width: 180,
+ },
+ {
id: '13',
enCode: 'financeAuditTime',
name: '瀹℃牳鏃堕棿',
diff --git a/vite.config.ts b/vite.config.ts
index 8b78943..33df6f8 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -97,9 +97,12 @@
__INTLIFY_PROD_DEVTOOLS__: false,
},
build: {
- outDir: `dist/${dayjs().format(
- 'YYYY-MM-DD'
- )}/dist-12333Governmentback-${VITE_AppType}-${mode}-${dayjs().format('YYYYMMDD')}`,
+ outDir:
+ mode === 'staging'
+ ? `dist/dist-12333Governmentback-${VITE_AppType}-${mode}`
+ : `dist/${dayjs().format(
+ 'YYYY-MM-DD'
+ )}/dist-12333Governmentback-${VITE_AppType}-${mode}-${dayjs().format('YYYYMMDD')}`,
},
optimizeDeps: {
include: [
--
Gitblit v1.9.1