From 1c9958b4088f9f90d397c890e575c72ef80dea54 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 16 十月 2025 15:51:34 +0800
Subject: [PATCH] fix: bug
---
src/views/Reward/RewardApplyTradeCheck.vue | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/src/views/Reward/RewardApplyTradeCheck.vue b/src/views/Reward/RewardApplyTradeCheck.vue
index 9c7a057..a5a887d 100644
--- a/src/views/Reward/RewardApplyTradeCheck.vue
+++ b/src/views/Reward/RewardApplyTradeCheck.vue
@@ -37,8 +37,8 @@
<QueryFilterItem>
<SearchInput
v-model="extraParamState.searchKeyWord"
- style="width: 200px"
- placeholder="浼佷笟鍚嶇О/淇＄敤浠ｇ爜"
+ style="width: 300px"
+ placeholder="浼佷笟鍚�/淇＄敤浠ｇ爜/鑱旂郴浜�/鑱旂郴鏂瑰紡"
@on-click-search="getList"
>
</SearchInput>
@@ -51,7 +51,7 @@
:operationBtns="operationBtns"
>
</ProTableV2>
- <RewardApplyTradeCheckDialog v-bind="dialogProps"></RewardApplyTradeCheckDialog>
+ <RewardApplyTradeCheckDialog isApplyTrade v-bind="dialogProps"></RewardApplyTradeCheckDialog>
</AppContainer>
</LoadingLayout>
</template>
@@ -80,10 +80,11 @@
EnumParkBountyTradeDetailAuditStatus,
EnumParkBountyTradeDetailAuditStatusTag,
EnumParkBountyTradeDetailAuditStatusText,
+ FinanceTypeEnum,
} from '@/constants';
import { ModelValueType } from 'element-plus';
import RewardApplyTradeCheckDialog from './components/RewardApplyTradeCheckDialog.vue';
-import { convertApi2FormUrlOnlyOne, format } from '@/utils';
+import { convertApi2FormUrlObjectBySeparator, convertApi2FormUrlOnlyOne, format } from '@/utils';
import { RewardApplyTradeCheckColumns } from './constants';
import { useIndustrialParkDropDownList } from '@/hooks/industrialPark';
@@ -152,12 +153,11 @@
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'),
+ parkId: extraParamState.enterpriseId,
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
+ auditStatus: extraParamState.auditStatus,
+ financeType: FinanceTypeEnum.PlatReward,
};
let res = await parkBountyApplyServices.getParkBountyTradeDetailList(params, {
showLoading: !state.loading,
@@ -176,8 +176,9 @@
columnsRenderProps: {
authType: { type: 'enum', valueEnum: EnterpriseTypeText },
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,
@@ -196,7 +197,7 @@
? EnumParkBountyTradeDetailAuditStatus.Reject
: EnumParkBountyTradeDetailAuditStatus.Pass,
auditRemark: row.auditRemark,
- payAuditFileUrl: convertApi2FormUrlOnlyOne(row.payAuditFileUrl),
+ payAuditFileUrl: convertApi2FormUrlObjectBySeparator(row.payAuditFileUrl),
userName: row.userName,
enterpriseName: row.enterpriseName,
societyCreditCode: row.societyCreditCode,
@@ -205,11 +206,19 @@
parkName: row.parkName,
parkTypeName: row.parkTypeName,
tradeAmount: row.tradeAmount,
- remianAmount: row.remianAmount,
+ bountyAmount: row.bountyAmount,
tradeTime: row.tradeTime,
auditTime: row.auditTime,
+ financeAuditTime: row.financeAuditTime,
payRemark: row.payRemark,
- payFileUrl: convertApi2FormUrlOnlyOne(row.payFileUrl),
+ payFileUrl: convertApi2FormUrlObjectBySeparator(row.payFileUrl),
+ title: isCheck ? '璇︽儏' : '鍑鸿处瀹℃壒',
+ incomeCompanyName: row.incomeCompanyName,
+ insureBillNo: row.insureBillNo,
+ incomeBankAccount: row.incomeBankAccount,
+ incomeBankCardNumber: row.incomeBankCardNumber,
+ incomeBankName: row.incomeBankName,
+ creationTime: row.creationTime,
});
}
@@ -229,11 +238,20 @@
parkName: '',
parkTypeName: '',
tradeAmount: '' as any as number,
- remianAmount: '' as any as number,
+ bountyAmount: '' as any as number,
tradeTime: '',
auditTime: '',
+ financeAuditTime: '',
payRemark: '',
payFileUrl: [] as UploadUserFile[],
+ title: '',
+
+ incomeCompanyName: '',
+ insureBillNo: '',
+ incomeBankAccount: '',
+ incomeBankCardNumber: '',
+ incomeBankName: '',
+ creationTime: '',
},
});
--
Gitblit v1.9.1