From f3d746181155c223bccdafcbbc45041e944e5eaa Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 21 十月 2025 20:20:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into dev-1.2.0.2
---
src/views/FinanceManage/FinanceManageList.vue | 72 ++++--------------------------------
1 files changed, 8 insertions(+), 64 deletions(-)
diff --git a/src/views/FinanceManage/FinanceManageList.vue b/src/views/FinanceManage/FinanceManageList.vue
index fc1c742..8163c16 100644
--- a/src/views/FinanceManage/FinanceManageList.vue
+++ b/src/views/FinanceManage/FinanceManageList.vue
@@ -1,54 +1,6 @@
<template>
<LoadingLayout :loading="state.loading">
<AppContainer>
- <ProTableQueryFilterBar @on-reset="reset">
- <template #query>
- <QueryFilterItem tip-content="鍙戝竷鐘舵��">
- <FieldRadio
- v-model="extraParamState.status"
- :value-enum="[
- { value: true, label: '鍙戝竷涓�' },
- { value: false, label: '宸插仠姝�' },
- ]"
- buttonStyle
- showAllBtn
- @change="getList()"
- />
- </QueryFilterItem>
- <QueryFilterItem tip-content="鎺ㄨ崘鐘舵��">
- <FieldRadio
- v-model="extraParamState.status"
- :value-enum="[
- { value: true, label: '宸叉帹鑽�' },
- { value: false, label: '鏈帹鑽�' },
- ]"
- buttonStyle
- showAllBtn
- @change="getList()"
- />
- </QueryFilterItem>
- <QueryFilterItem tip-content="鍙戝竷鏃堕棿">
- <FieldDatePicker
- v-model="extraParamState.beginDate"
- type="daterange"
- range-separator="~"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- clearable
- @change="getList()"
- ></FieldDatePicker>
- </QueryFilterItem>
- <QueryFilterItem>
- <SearchInput
- v-model="extraParamState.keyword"
- style="width: 260px"
- placeholder="浠诲姟鍚嶇О"
- @on-click-search="getList"
- >
- </SearchInput>
- </QueryFilterItem>
- </template>
- </ProTableQueryFilterBar>
<ProTableV2 v-bind="proTableProps" :columns="column" :operationBtns="operationBtns">
</ProTableV2>
</AppContainer>
@@ -58,21 +10,16 @@
<script setup lang="ts">
import {
- ProTableQueryFilterBar,
OperationBtnType,
ProTableV2,
- SearchInput,
LoadingLayout,
AppContainer,
- QueryFilterItem,
useTable,
- FieldDatePicker,
- FieldRadio,
useFormDialog,
} from '@bole-core/components';
import { useAccess } from '@/hooks';
import { ModelValueType } from 'element-plus';
-import * as enterpriseServices from '@/services/api/enterprise';
+import * as userServices from '@/services/api/user';
import FinanceDetailDialog from './components/FinanceDetailDialog.vue';
defineOptions({
@@ -108,15 +55,15 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let params: API.GetEnterprisesQuery = {
+ let params: API.GetPersonalUserTransactionsQuery = {
pageModel: {
rows: pageSize,
page: pageIndex,
orderInput: extraParamState.orderInput,
},
- // searchKeys: extraParamState.keyword,
+ type: EnumUserWalletTransactionType.Income,
};
- let res = await enterpriseServices.getEnterprises(params, {
+ let res = await userServices.getPersonalUserTransactions(params, {
showLoading: !state.loading,
});
return res;
@@ -124,14 +71,11 @@
},
{
defaultExtraParams: {
- keyword: '',
- pageType: '' as any as number,
- status: '' as any as boolean,
- beginDate: [] as unknown as ModelValueType,
- endDate: [] as unknown as ModelValueType,
- orderInput: [{ property: 'id', order: EnumPagedListOrder.Asc }],
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
- columnsRenderProps: {},
+ columnsRenderProps: {
+ transDate: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+ },
}
);
--
Gitblit v1.9.1