From 81adf03a60f6b4452be4e3ad1f9e3915e0c78bf6 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期三, 17 九月 2025 17:25:00 +0800 Subject: [PATCH] Merge branch 'dev-v1.1' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-v1.1 --- src/views/ServiceChargeManage/BalanceManage.vue | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/views/ServiceChargeManage/BalanceManage.vue b/src/views/ServiceChargeManage/BalanceManage.vue index e4fac28..c632be7 100644 --- a/src/views/ServiceChargeManage/BalanceManage.vue +++ b/src/views/ServiceChargeManage/BalanceManage.vue @@ -5,14 +5,14 @@ <template #query> <QueryFilterItem tip-content="浣欓鑼冨洿"> <el-input-number - v-model="extraParamState.minAmount" + v-model="extraParamState.balanceMin" placeholder="浣欓鏈�灏忛噾棰�" size="small" style="width: 150px" :controls="false" />~ <el-input-number - v-model="extraParamState.maxAmount" + v-model="extraParamState.balanceMax" placeholder="浣欓鏈�澶ч噾棰�" size="small" style="width: 150px" @@ -21,7 +21,7 @@ </QueryFilterItem> <QueryFilterItem> <SearchInput - v-model="extraParamState.keyword" + v-model="extraParamState.keywords" style="width: 260px" placeholder="濮撳悕/鎵嬫満鍙�/韬唤璇佸彿" @on-click-search="getList" @@ -53,12 +53,12 @@ useFormDialog, defineOperationBtns, } from '@bole-core/components'; -import * as enterpriseServices from '@/services/api/enterprise'; +import * as userServices from '@/services/api/user'; import BalanceDetailDialog from './components/BalanceDetailDialog.vue'; import { BalanceManageColumns } from './constants'; defineOptions({ - name: 'BalanceManage', + name: 'WithdrawManageList', }); const operationBtns = defineOperationBtns([ @@ -69,9 +69,6 @@ }, emits: { onClick: (role) => openDialog(role), - }, - extraProps: { - hide: () => false, }, }, ]); @@ -97,15 +94,18 @@ } = useTable( async ({ pageIndex, pageSize }, extraParamState) => { try { - let params: API.GetEnterprisesQuery = { + let params: API.GetPersonalUserWalletBalancesQuery = { pageModel: { rows: pageSize, page: pageIndex, orderInput: extraParamState.orderInput, }, - // searchKeys: extraParamState.keyword, + keywords: extraParamState.keywords, + balanceMin: extraParamState.balanceMin, + balanceMax: extraParamState.balanceMax, }; - let res = await enterpriseServices.getEnterprises(params, { + + let res = await userServices.getPersonalUserWalletBalances(params, { showLoading: !state.loading, }); return res; @@ -113,13 +113,14 @@ }, { defaultExtraParams: { - keyword: '', - status: '', - minAmount: null as number, - maxAmount: null as number, + keywords: '', + balanceMin: null as number, + balanceMax: null as number, orderInput: [{ property: 'id', order: EnumPagedListOrder.Asc }], }, - columnsRenderProps: {}, + columnsRenderProps: { + balance: { type: 'money' }, + }, } ); -- Gitblit v1.9.1