From 0b73bba28e2a8473ab71f5c8b4760c1995ff4fc1 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 21 十月 2025 18:29:07 +0800
Subject: [PATCH] fix: s
---
src/views/Reward/RewardApplyTradeCheck.vue | 76 +++++++++++++++++++++++++++++++-------
1 files changed, 62 insertions(+), 14 deletions(-)
diff --git a/src/views/Reward/RewardApplyTradeCheck.vue b/src/views/Reward/RewardApplyTradeCheck.vue
index 32b478b..75bc690 100644
--- a/src/views/Reward/RewardApplyTradeCheck.vue
+++ b/src/views/Reward/RewardApplyTradeCheck.vue
@@ -3,6 +3,26 @@
<AppContainer>
<ProTableQueryFilterBar @on-reset="reset">
<template #query>
+ <QueryFilterItem>
+ <FieldSelect
+ v-model="extraParamState.enterpriseId"
+ placeholder="璇烽�夋嫨鍥尯"
+ :value-enum="fourStreamsIndustrialParkList"
+ enumLabelKey="parkName"
+ enum-value-key="id"
+ clearable
+ @change="getList()"
+ />
+ </QueryFilterItem>
+ <QueryFilterItem tip-content="瀹℃牳鐘舵��">
+ <FieldRadio
+ v-model="extraParamState.auditStatus"
+ :value-enum="EnumParkBountyTradeDetailAuditStatusText"
+ buttonStyle
+ showAllBtn
+ @change="getList()"
+ ></FieldRadio>
+ </QueryFilterItem>
<QueryFilterItem tip-content="鐢宠鍑鸿处鏃ユ湡">
<FieldDatePicker
v-model="extraParamState.creationTime"
@@ -17,8 +37,8 @@
<QueryFilterItem>
<SearchInput
v-model="extraParamState.searchKeyWord"
- style="width: 200px"
- placeholder="浼佷笟鍚嶇О/淇＄敤浠ｇ爜"
+ style="width: 300px"
+ placeholder="浼佷笟鍚�/淇＄敤浠ｇ爜/鑱旂郴浜�/鑱旂郴鏂瑰紡"
@on-click-search="getList"
>
</SearchInput>
@@ -31,7 +51,7 @@
:operationBtns="operationBtns"
>
</ProTableV2>
- <RewardApplyTradeCheckDialog v-bind="dialogProps"></RewardApplyTradeCheckDialog>
+ <RewardApplyTradeCheckDialog isApplyTrade v-bind="dialogProps"></RewardApplyTradeCheckDialog>
</AppContainer>
</LoadingLayout>
</template>
@@ -39,7 +59,7 @@
<script setup lang="ts">
import {
ProTableQueryFilterBar,
- OperationBtnType,
+ FieldSelect,
ProTableV2,
SearchInput,
LoadingLayout,
@@ -50,6 +70,7 @@
useFormDialog,
UploadUserFile,
defineOperationBtns,
+ FieldRadio,
} from '@bole-core/components';
import { Message, OrderInputType } from '@bole-core/core';
import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
@@ -59,11 +80,13 @@
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';
defineOptions({
name: 'RewardApplyTradeCheck',
@@ -103,6 +126,11 @@
};
const state = reactive({ ...BaseState });
+const { industrialParkList } = useIndustrialParkDropDownList();
+
+const fourStreamsIndustrialParkList = computed(() => {
+ return industrialParkList.value.filter((x) => !!x.rewardEnable);
+});
onMounted(async () => {
await getList();
@@ -125,12 +153,12 @@
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,
+ selfAuditStatus: EnumParkBountyTradeDetailAuditStatus.Pass,
+ financeType: FinanceTypeEnum.PlatReward,
};
let res = await parkBountyApplyServices.getParkBountyTradeDetailList(params, {
showLoading: !state.loading,
@@ -141,14 +169,17 @@
{
defaultExtraParams: {
searchKeyWord: '',
+ enterpriseId: '',
+ auditStatus: '' 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' },
+ auditTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
tradeAmount: { type: 'money' },
- remianAmount: { type: 'money' },
+ bountyAmount: { type: 'money' },
auditStatus: {
type: 'tag',
valueEnum: EnumParkBountyTradeDetailAuditStatusText,
@@ -167,7 +198,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,
@@ -176,11 +207,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,
});
}
@@ -200,11 +239,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