From 659c75ad412155d04c8b38da47b1d3baf11a4c41 Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期五, 25 七月 2025 19:10:49 +0800 Subject: [PATCH] fix: bug --- src/views/Reward/RewardApplyTradeCheck.vue | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 38 insertions(+), 8 deletions(-) diff --git a/src/views/Reward/RewardApplyTradeCheck.vue b/src/views/Reward/RewardApplyTradeCheck.vue index 32b478b..1ce39a1 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="浼佷笟鍚嶇О/淇$敤浠g爜" + style="width: 300px" + placeholder="浼佷笟鍚�/淇$敤浠g爜/鑱旂郴浜�/鑱旂郴鏂瑰紡" @on-click-search="getList" > </SearchInput> @@ -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'; @@ -64,6 +85,7 @@ import RewardApplyTradeCheckDialog from './components/RewardApplyTradeCheckDialog.vue'; import { convertApi2FormUrlOnlyOne, format } from '@/utils'; import { RewardApplyTradeCheckColumns } from './constants'; +import { useIndustrialParkDropDownList } from '@/hooks/industrialPark'; defineOptions({ name: 'RewardApplyTradeCheck', @@ -103,6 +125,11 @@ }; const state = reactive({ ...BaseState }); +const { industrialParkList } = useIndustrialParkDropDownList(); + +const fourStreamsIndustrialParkList = computed(() => { + return industrialParkList.value.filter((x) => !!x.rewardEnable); +}); onMounted(async () => { await getList(); @@ -125,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'), + 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, }; let res = await parkBountyApplyServices.getParkBountyTradeDetailList(params, { showLoading: !state.loading, @@ -141,14 +166,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, @@ -181,6 +209,7 @@ auditTime: row.auditTime, payRemark: row.payRemark, payFileUrl: convertApi2FormUrlOnlyOne(row.payFileUrl), + title: isCheck ? '璇︽儏' : '鍑鸿处瀹℃壒', }); } @@ -205,6 +234,7 @@ auditTime: '', payRemark: '', payFileUrl: [] as UploadUserFile[], + title: '', }, }); -- Gitblit v1.9.1