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/views/Reward/FinancialApproval.vue | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/src/views/Reward/FinancialApproval.vue b/src/views/Reward/FinancialApproval.vue
index 59c2461..af7b6fe 100644
--- a/src/views/Reward/FinancialApproval.vue
+++ b/src/views/Reward/FinancialApproval.vue
@@ -16,7 +16,7 @@
</QueryFilterItem>
<QueryFilterItem tip-content="瀹℃牳鐘舵��">
<FieldRadio
- v-model="extraParamState.auditStatus"
+ v-model="extraParamState.financeAuditStatus"
:value-enum="EnumParkBountyTradeDetailAuditStatusText"
buttonStyle
showAllBtn
@@ -37,8 +37,8 @@
<QueryFilterItem>
<SearchInput
v-model="extraParamState.searchKeyWord"
- style="width: 200px"
- placeholder="浼佷笟鍚嶇О/淇＄敤浠ｇ爜"
+ style="width: 300px"
+ placeholder="浼佷笟鍚�/淇＄敤浠ｇ爜/鑱旂郴浜�/鑱旂郴鏂瑰紡"
@on-click-search="getList"
>
</SearchInput>
@@ -47,7 +47,7 @@
</ProTableQueryFilterBar>
<ProTableV2
v-bind="proTableProps"
- :columns="RewardApplyTradeCheckColumns"
+ :columns="FinancialApprovalColumns"
:operationBtns="operationBtns"
>
</ProTableV2>
@@ -84,7 +84,7 @@
import { ModelValueType } from 'element-plus';
import RewardApplyTradeCheckDialog from './components/RewardApplyTradeCheckDialog.vue';
import { convertApi2FormUrlOnlyOne, format } from '@/utils';
-import { RewardApplyTradeCheckColumns } from './constants';
+import { FinancialApprovalColumns } from './constants';
import { useIndustrialParkDropDownList } from '@/hooks/industrialPark';
defineOptions({
@@ -102,7 +102,7 @@
},
extraProps: {
hide: (row: API.GetParkBountyTradeDetailOutput) =>
- row.auditStatus === EnumParkBountyTradeDetailAuditStatus.Wait,
+ row.financeAuditStatus === EnumParkBountyTradeDetailAuditStatus.Wait,
},
},
{
@@ -115,7 +115,7 @@
},
extraProps: {
hide: (row: API.GetParkBountyTradeDetailOutput) =>
- row.auditStatus !== EnumParkBountyTradeDetailAuditStatus.Wait,
+ row.financeAuditStatus !== EnumParkBountyTradeDetailAuditStatus.Wait,
},
},
]);
@@ -152,12 +152,10 @@
orderInput: extraParamState.orderInput,
},
searchKeyWord: extraParamState.searchKeyWord,
- // transferTimeBegin: format(extraParamState.transferTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
- // transferTimeEnd: format(extraParamState.transferTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
- creationTimeBegin: format(extraParamState.creationTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
- creationTimeEnd: format(extraParamState.creationTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
- // "enterpriseId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
- // "auditStatus": 10
+ parkId: extraParamState.enterpriseId,
+ financeAuditStatus: extraParamState.financeAuditStatus,
+ auditTimeBegin: format(extraParamState.creationTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
+ auditTimeEnd: format(extraParamState.creationTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
};
let res = await parkBountyApplyServices.getParkBountyTradeDetailList(params, {
showLoading: !state.loading,
@@ -169,16 +167,17 @@
defaultExtraParams: {
searchKeyWord: '',
enterpriseId: '',
- auditStatus: '' as any as EnumParkBountyTradeDetailAuditStatus,
+ financeAuditStatus: '' as any as EnumParkBountyTradeDetailAuditStatus,
creationTime: [] as unknown as ModelValueType,
orderInput: [{ property: 'tradeTime', order: OrderInputType.Desc }],
},
columnsRenderProps: {
authType: { type: 'enum', valueEnum: EnterpriseTypeText },
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' },
- auditStatus: {
+ bountyAmount: { type: 'money' },
+ financeAuditStatus: {
type: 'tag',
valueEnum: EnumParkBountyTradeDetailAuditStatusText,
tagTypeEnum: EnumParkBountyTradeDetailAuditStatusTag,
@@ -192,11 +191,13 @@
id: row.id,
isCheck,
auditStatus:
- row.auditStatus === EnumParkBountyTradeDetailAuditStatus.Reject
+ row.financeAuditStatus === EnumParkBountyTradeDetailAuditStatus.Reject
? EnumParkBountyTradeDetailAuditStatus.Reject
: EnumParkBountyTradeDetailAuditStatus.Pass,
- auditRemark: row.auditRemark,
- payAuditFileUrl: convertApi2FormUrlOnlyOne(row.payAuditFileUrl),
+ auditRemark: row.financeAuditRemark,
+ payAuditFileUrl: isCheck
+ ? convertApi2FormUrlOnlyOne(row.payAuditFileUrl)
+ : ([] as UploadUserFile[]),
userName: row.userName,
enterpriseName: row.enterpriseName,
societyCreditCode: row.societyCreditCode,
@@ -207,9 +208,10 @@
tradeAmount: row.tradeAmount,
remianAmount: row.remianAmount,
tradeTime: row.tradeTime,
- auditTime: row.auditTime,
+ auditTime: row.financeAuditTime,
payRemark: row.payRemark,
payFileUrl: convertApi2FormUrlOnlyOne(row.payFileUrl),
+ title: isCheck ? '璇︽儏' : '璐㈠姟瀹℃壒',
});
}
@@ -234,6 +236,7 @@
auditTime: '',
payRemark: '',
payFileUrl: [] as UploadUserFile[],
+ title: '',
},
});
@@ -247,7 +250,7 @@
/** 瀹℃牳鍑瘉 */
payAuditFileUrl: editForm.payAuditFileUrl?.[0]?.path ?? '',
};
- let res = await parkBountyApplyServices.auditParkBountyApplyTrade(params);
+ let res = await parkBountyApplyServices.financeAuditParkBountyApplyTrade(params);
if (res) {
Message.successMessage('鎿嶄綔鎴愬姛');
getList(paginationState.pageIndex);
--
Gitblit v1.9.1