From 27e7433ccf8adae78c7adb2bf7b578a7ae64174e Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 23 十月 2025 13:24:29 +0800
Subject: [PATCH] fix: bug
---
src/views/BalanceManage/BalanceManage.vue | 32 +++---
src/views/BalanceManage/components/RewardGrantRecordView.vue | 6
src/views/BalanceManage/components/WithdrawalRecordView.vue | 97 +++++++++---------
src/views/BalanceManage/components/PaymentRecordView.vue | 89 +++++++++--------
src/views/BalanceManage/components/RechargeRecordView.vue | 19 +--
5 files changed, 122 insertions(+), 121 deletions(-)
diff --git a/src/views/BalanceManage/BalanceManage.vue b/src/views/BalanceManage/BalanceManage.vue
index 2946d2b..15e8037 100644
--- a/src/views/BalanceManage/BalanceManage.vue
+++ b/src/views/BalanceManage/BalanceManage.vue
@@ -71,18 +71,18 @@
<ProTabPane lazy label="鎷ㄤ粯璁板綍" name="Payment">
<PaymentRecordView></PaymentRecordView>
</ProTabPane>
- <template v-if="sceneThree || sceneFour">
- <ProTabPane lazy label="濂栧姳鍙戞斁璁板綍" name="RewardGrant">
- <RewardGrantRecordView></RewardGrantRecordView>
- </ProTabPane>
- <ProTabPane lazy label="鍏呭�艰褰�" name="Recharge">
- <RechargeRecordView ref="rechargeRecordRef"></RechargeRecordView>
- </ProTabPane>
- <ProTabPane lazy label="娑堣垂璁板綍" name="Consume">
- <ConsumeRecordView></ConsumeRecordView>
- </ProTabPane>
- </template>
- <ProTabPane lazy label="鎻愮幇璁板綍" name="Withdrawal" v-if="sceneTwo || sceneFour">
+ <!-- <template v-if="sceneThree || sceneFour"> -->
+ <ProTabPane lazy label="濂栧姳鍙戞斁璁板綍" name="RewardGrant">
+ <RewardGrantRecordView></RewardGrantRecordView>
+ </ProTabPane>
+ <ProTabPane lazy label="鍏呭�艰褰�" name="Recharge">
+ <RechargeRecordView ref="rechargeRecordRef"></RechargeRecordView>
+ </ProTabPane>
+ <ProTabPane lazy label="娑堣垂璁板綍" name="Consume">
+ <ConsumeRecordView></ConsumeRecordView>
+ </ProTabPane>
+ <!-- </template> -->
+ <ProTabPane lazy label="鎻愮幇璁板綍" name="Withdrawal">
<WithdrawalRecordView ref="withdrawalRecordRef"></WithdrawalRecordView>
</ProTabPane>
</ProTabs>
@@ -118,16 +118,16 @@
const state = reactive({ ...BaseState });
const sceneOne = computed(() => {
- return !userDetail.value?.suportPlatRecharge && !userDetail.value?.suportWithDraw;
+ // return !userDetail.value?.suportPlatRecharge && !userDetail.value?.suportWithDraw;
});
const sceneTwo = computed(() => {
- return !userDetail.value?.suportPlatRecharge && userDetail.value?.suportWithDraw;
+ // return !userDetail.value?.suportPlatRecharge && userDetail.value?.suportWithDraw;
});
const sceneThree = computed(() => {
- return userDetail.value?.suportPlatRecharge && !userDetail.value?.suportWithDraw;
+ // return userDetail.value?.suportPlatRecharge && !userDetail.value?.suportWithDraw;
});
const sceneFour = computed(() => {
- return userDetail.value?.suportPlatRecharge && userDetail.value?.suportWithDraw;
+ // return userDetail.value?.suportPlatRecharge && userDetail.value?.suportWithDraw;
});
const { isLoading, data: detail } = useQuery({
diff --git a/src/views/BalanceManage/components/PaymentRecordView.vue b/src/views/BalanceManage/components/PaymentRecordView.vue
index 94e1377..c047694 100644
--- a/src/views/BalanceManage/components/PaymentRecordView.vue
+++ b/src/views/BalanceManage/components/PaymentRecordView.vue
@@ -1,7 +1,7 @@
<template>
<LoadingLayout :loading="state.loading">
<AppContainer>
- <Table v-bind="{ ...proTableProps, ...columnsProps }">
+ <ProTableV2 v-bind="proTableProps" :columns="column" :operationBtns="operationBtns">
<template #operationBtn-checkBtn="{ data, row }">
<PreviewBtnV2
class="pro-table-operation-btn"
@@ -9,60 +9,65 @@
preview-btn-text="鏌ョ湅鍑瘉"
/>
</template>
- </Table>
+ </ProTableV2>
</AppContainer>
</LoadingLayout>
</template>
<script setup lang="ts">
-import { AppContainer, useTable, PreviewBtnV2 } from '@bole-core/components';
+import {
+ AppContainer,
+ useTable,
+ PreviewBtnV2,
+ defineOperationBtns,
+ ProTableV2,
+} from '@bole-core/components';
import { OrderInputType } from '@bole-core/core';
import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
-import { FinanceStatusEnum, FinanceStatusEnumText } from '@/constants';
-import { useDefineColumns, useUser } from '@/hooks';
+// import { FinanceStatusEnum, FinanceStatusEnumText } from '@/constants';
+import { useUser } from '@/hooks';
import { convertApi2FormUrlBySeparator } from '@/utils';
defineOptions({
name: 'PaymentRecordView',
});
-const columnsProps = useDefineColumns({
- columns: [
- {
- id: '1',
- enCode: 'financeToTime',
- name: '鎷ㄤ粯鏃堕棿',
+const column = [
+ {
+ id: '1',
+ enCode: 'financeToTime',
+ name: '鎷ㄤ粯鏃堕棿',
+ },
+ {
+ id: '2',
+ enCode: 'financeToAmount',
+ name: '鎷ㄤ粯閲戦',
+ },
+ {
+ id: '3',
+ enCode: 'batchNo',
+ name: '鎷ㄤ粯鎵规',
+ },
+ {
+ id: '4',
+ enCode: 'applyMonth',
+ name: '鎷ㄤ粯鏈堜唤',
+ },
+ {
+ id: '5',
+ enCode: 'financeToStatus',
+ name: '鎷ㄤ粯鐘舵��',
+ },
+];
+
+const operationBtns = defineOperationBtns([
+ {
+ data: {
+ enCode: 'checkBtn',
+ name: '鏌ョ湅鍑瘉',
},
- {
- id: '2',
- enCode: 'financeToAmount',
- name: '鎷ㄤ粯閲戦',
- },
- {
- id: '3',
- enCode: 'batchNo',
- name: '鎷ㄤ粯鎵规',
- },
- {
- id: '4',
- enCode: 'applyMonth',
- name: '鎷ㄤ粯鏈堜唤',
- },
- {
- id: '5',
- enCode: 'financeToStatus',
- name: '鎷ㄤ粯鐘舵��',
- },
- ],
- operationBtns: [
- {
- data: {
- enCode: 'checkBtn',
- name: '鏌ョ湅鍑瘉',
- },
- },
- ],
-});
+ },
+]);
const { userDetail } = useUser();
const BaseState = {
@@ -99,7 +104,7 @@
orderInput: [{ property: 'financeToTime', order: OrderInputType.Desc }],
},
columnsRenderProps: {
- financeToStatus: { type: 'enum', valueEnum: FinanceStatusEnumText },
+ // financeToStatus: { type: 'enum', valueEnum: FinanceStatusEnumText },
financeToTime: { type: 'date', format: 'YYYY-MM-DD' },
applyMonth: { type: 'date', format: 'YYYY骞碝M鏈�' },
financeToAmount: { type: 'money' },
diff --git a/src/views/BalanceManage/components/RechargeRecordView.vue b/src/views/BalanceManage/components/RechargeRecordView.vue
index 1db603d..d686886 100644
--- a/src/views/BalanceManage/components/RechargeRecordView.vue
+++ b/src/views/BalanceManage/components/RechargeRecordView.vue
@@ -4,14 +4,14 @@
<ProTableV2 v-bind="proTableProps" :columns="column" :operationBtns="operationBtns">
<template #checkStatus="{ data, row }">
<div style="display: flex; justify-content: center; align-items: center">
- {{ EnterpriseRechargeStatusEnumText[row.checkStatus] }}
- <el-tooltip
+ <!-- {{ EnterpriseRechargeStatusEnumText[row.checkStatus] }} -->
+ <!-- <el-tooltip
placement="top"
v-if="row.checkStatus === EnterpriseRechargeStatusEnum.CheckReject && row.checkRemark"
:content="row.checkRemark"
>
<el-icon color="#ff0000"><WarningFilled /></el-icon>
- </el-tooltip>
+ </el-tooltip> -->
</div>
</template>
<template #operationBtn-checkBtn="{ data, row }">
@@ -37,12 +37,7 @@
import { OrderInputType } from '@bole-core/core';
import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
import { useUser } from '@/hooks';
-import {
- EnterprisePrechargeInComeStatusEnum,
- EnterprisePrechargeInComeStatusEnumText,
- EnterpriseRechargeStatusEnum,
- EnterpriseRechargeStatusEnumText,
-} from '@/constants';
+
import { convertApi2FormUrlBySeparator } from '@/utils';
defineOptions({
@@ -79,7 +74,7 @@
name: '鏌ョ湅鍑瘉',
},
extraProps: {
- hide: (row) => row.inComeStatus !== EnterprisePrechargeInComeStatusEnum.HasInCome,
+ // hide: (row) => row.inComeStatus !== EnterprisePrechargeInComeStatusEnum.HasInCome,
},
},
]);
@@ -122,8 +117,8 @@
columnsRenderProps: {
creationTime: { type: 'date', format: 'YYYY-MM-DD' },
prechargeAmount: { type: 'money' },
- checkStatus: { type: 'enum', valueEnum: EnterpriseRechargeStatusEnumText },
- inComeStatus: { type: 'enum', valueEnum: EnterprisePrechargeInComeStatusEnumText },
+ // checkStatus: { type: 'enum', valueEnum: EnterpriseRechargeStatusEnumText },
+ // inComeStatus: { type: 'enum', valueEnum: EnterprisePrechargeInComeStatusEnumText },
},
}
);
diff --git a/src/views/BalanceManage/components/RewardGrantRecordView.vue b/src/views/BalanceManage/components/RewardGrantRecordView.vue
index b3c3963..1c09155 100644
--- a/src/views/BalanceManage/components/RewardGrantRecordView.vue
+++ b/src/views/BalanceManage/components/RewardGrantRecordView.vue
@@ -54,7 +54,7 @@
};
const state = reactive({ ...BaseState });
-const { userDetail } = useUser();
+// const { userDetail } = useUser();
const {
getDataSource: getList,
@@ -70,7 +70,7 @@
page: pageIndex,
orderInput: extraParamState.orderInput,
},
- id: userDetail.value?.userId ?? '',
+ // id: userDetail.value?.userId ?? '',
};
let res = await parkBountyApplyServices.getParkCustomerBountySettleList(params, {
showLoading: !state.loading,
@@ -83,7 +83,7 @@
orderInput: [{ property: 'settleTime', order: OrderInputType.Desc }],
},
columnsRenderProps: {
- transferToStatus: { type: 'enum', valueEnum: TransferToStatusEnumText },
+ // transferToStatus: { type: 'enum', valueEnum: TransferToStatusEnumText },
transferToTime: { type: 'date', format: 'YYYY-MM-DD' },
applyMonth: { type: 'date', format: 'YYYY骞碝M鏈�' },
transferToAmount: { type: 'money' },
diff --git a/src/views/BalanceManage/components/WithdrawalRecordView.vue b/src/views/BalanceManage/components/WithdrawalRecordView.vue
index 78d4948..0c86755 100644
--- a/src/views/BalanceManage/components/WithdrawalRecordView.vue
+++ b/src/views/BalanceManage/components/WithdrawalRecordView.vue
@@ -1,17 +1,17 @@
<template>
<LoadingLayout :loading="state.loading">
<AppContainer>
- <Table v-bind="{ ...proTableProps, ...columnsProps }">
+ <ProTableV2 v-bind="proTableProps" :columns="column" :operationBtns="operationBtns">
<template #checkStatus="{ data, row }">
<div style="display: flex; justify-content: center; align-items: center">
- {{ EnterpriseRechargeStatusEnumTextWithdrawal[row.checkStatus] }}
- <el-tooltip
+ <!-- {{ EnterpriseRechargeStatusEnumTextWithdrawal[row.checkStatus] }} -->
+ <!-- <el-tooltip
placement="top"
v-if="row.checkStatus === EnterpriseRechargeStatusEnum.CheckReject && row.checkRemark"
:content="row.checkRemark"
>
<el-icon color="#ff0000"><WarningFilled /></el-icon>
- </el-tooltip>
+ </el-tooltip> -->
</div>
</template>
<template #operationBtn-checkBtn="{ data, row }">
@@ -21,63 +21,64 @@
preview-btn-text="鏌ョ湅鍑瘉"
/>
</template>
- </Table>
+ </ProTableV2>
</AppContainer>
</LoadingLayout>
</template>
<script setup lang="ts">
-import { AppContainer, useTable, PreviewBtnV2, TextOverTooltip } from '@bole-core/components';
+import {
+ AppContainer,
+ useTable,
+ PreviewBtnV2,
+ ProTableV2,
+ defineOperationBtns,
+} from '@bole-core/components';
import { OrderInputType } from '@bole-core/core';
import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
-import { useDefineColumns, useUser } from '@/hooks';
+import { useUser } from '@/hooks';
import { convertApi2FormUrlBySeparator } from '@/utils';
-import {
- EnterpriseRechargeStatusEnumTextWithdrawal,
- EnterpriseRechargeStatusEnum,
-} from '@/constants';
defineOptions({
name: 'WithdrawalRecordView',
});
-const columnsProps = useDefineColumns({
- columns: [
- {
- id: '1',
- enCode: 'creationTime',
- name: '鐢宠鏃堕棿',
+const column = [
+ {
+ id: '1',
+ enCode: 'creationTime',
+ name: '鐢宠鏃堕棿',
+ },
+ {
+ id: '2',
+ enCode: 'amount',
+ name: '鎻愮幇閲戦',
+ },
+ {
+ id: '3',
+ enCode: 'checkStatus',
+ name: '瀹℃牳鐘舵��',
+ },
+ {
+ id: '4',
+ enCode: 'checkTime',
+ name: '瀹℃牳鏃堕棿',
+ },
+ {
+ id: '5',
+ enCode: 'remainAmount',
+ name: '璧勯噾浣欓',
+ },
+];
+
+const operationBtns = defineOperationBtns([
+ {
+ data: {
+ enCode: 'checkBtn',
+ name: '鏌ョ湅鍑瘉',
},
- {
- id: '2',
- enCode: 'amount',
- name: '鎻愮幇閲戦',
- },
- {
- id: '3',
- enCode: 'checkStatus',
- name: '瀹℃牳鐘舵��',
- },
- {
- id: '4',
- enCode: 'checkTime',
- name: '瀹℃牳鏃堕棿',
- },
- {
- id: '5',
- enCode: 'remainAmount',
- name: '璧勯噾浣欓',
- },
- ],
- operationBtns: [
- {
- data: {
- enCode: 'checkBtn',
- name: '鏌ョ湅鍑瘉',
- },
- },
- ],
-});
+ },
+]);
const route = useRoute();
const router = useRouter();
@@ -119,7 +120,7 @@
checkTime: { type: 'date', format: 'YYYY-MM-DD' },
amount: { type: 'money' },
remainAmount: { type: 'money' },
- checkStatus: { type: 'enum', valueEnum: EnterpriseRechargeStatusEnumTextWithdrawal },
+ // checkStatus: { type: 'enum', valueEnum: EnterpriseRechargeStatusEnumTextWithdrawal },
},
}
);
--
Gitblit v1.9.1