fix: bug

wupengfei

7 天以前 27e7433ccf8adae78c7adb2bf7b578a7ae64174e

fix: bug

 src/views/BalanceManage/BalanceManage.vue

@@ -71,7 +71,7 @@
        <ProTabPane lazy label="拨付记录" name="Payment">
          <PaymentRecordView></PaymentRecordView>
        </ProTabPane>
        <template v-if="sceneThree || sceneFour">
        <!-- <template v-if="sceneThree || sceneFour"> -->
          <ProTabPane lazy label="奖励发放记录" name="RewardGrant">
            <RewardGrantRecordView></RewardGrantRecordView>
          </ProTabPane>
@@ -81,8 +81,8 @@
          <ProTabPane lazy label="消费记录" name="Consume">
            <ConsumeRecordView></ConsumeRecordView>
          </ProTabPane>
        </template>
        <ProTabPane lazy label="提现记录" name="Withdrawal" v-if="sceneTwo || sceneFour">
        <!-- </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({

 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,25 +9,30 @@
            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: [
const column = [
    {
      id: '1',
      enCode: 'financeToTime',
@@ -53,16 +58,16 @@
      enCode: 'financeToStatus',
      name: '拨付状态',
    },
  ],
  operationBtns: [
];

const operationBtns = defineOperationBtns([
    {
      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年MM月' },
      financeToAmount: { type: 'money' },

 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 },
    },
  }
);

 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年MM月' },
      transferToAmount: { type: 'money' },

 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,28 +21,29 @@
            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: [
const column = [
    {
      id: '1',
      enCode: 'creationTime',
@@ -68,16 +69,16 @@
      enCode: 'remainAmount',
      name: '资金余额',
    },
  ],
  operationBtns: [
];

const operationBtns = defineOperationBtns([
    {
      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 },
    },
  }
);