Commit 4f5cf08e authored by Bill's avatar Bill

fix:修改bug

parent fa088a1e
...@@ -3,47 +3,16 @@ import EyePreview from '@/components/EyePreview'; ...@@ -3,47 +3,16 @@ import EyePreview from '@/components/EyePreview';
// import { TO_BE_RECONCILED, TO_BE_PAY, TO_BE_COLLECTED, COMPLETED, PRODUCT_NOTICE_SETTLEMENT_DETAIL, LOGISTICS_DETAIL, ORDER_DETAIL, CONTRACT_FUND_BILL } from '../common/constants'; // import { TO_BE_RECONCILED, TO_BE_PAY, TO_BE_COLLECTED, COMPLETED, PRODUCT_NOTICE_SETTLEMENT_DETAIL, LOGISTICS_DETAIL, ORDER_DETAIL, CONTRACT_FUND_BILL } from '../common/constants';
import { priceFormat } from '@/utils/numberFomat' import { priceFormat } from '@/utils/numberFomat'
import StatusTag, { STATUS_TYPE } from '@/components/StatusTag'; import StatusTag, { STATUS_TYPE } from '@/components/StatusTag';
import React, { useMemo, useState } from 'react'; import React, { useMemo, useState } from 'react';
// import { payStatus } from '../common'; // import { payStatus } from '../common';
import moment from 'moment';
import { COMPLETED, CONTRACT_FUND_BILL, LOGISTICS_DETAIL, ORDER_DETAIL, PRODUCT_NOTICE_SETTLEMENT_DETAIL, TO_BE_COLLECTED, TO_BE_PAY, TO_BE_RECONCILED, IS_UNIVERSAL_PAY } from '@/pages/balance/common/constants'; import { COMPLETED, CONTRACT_FUND_BILL, LOGISTICS_DETAIL, ORDER_DETAIL, PRODUCT_NOTICE_SETTLEMENT_DETAIL, TO_BE_COLLECTED, TO_BE_PAY, TO_BE_RECONCILED, IS_UNIVERSAL_PAY } from '@/pages/balance/common/constants';
import { useCallback } from 'react'; import { useCallback } from 'react';
import { GetSettleAccountsMemberSettlementPagePayableSettlementResponseDetail, GetSettleAccountsPlatformScoreSettlementPageReceivableSettlementResponseDetail } from '@/services/SettleV2Api'; import { GetSettleAccountsMemberSettlementPagePayableSettlementResponseDetail, GetSettleAccountsPlatformScoreSettlementPageReceivableSettlementResponseDetail } from '@/services/SettleV2Api';
import { ColumnsType } from 'antd/lib/table';
import { getIntl } from 'umi'; import { getIntl } from 'umi';
import { getPayAllInPayGetUserInfo, postPayAllInPayGetUserInfo } from '@/services/PayV2Api';
import { message } from 'antd';
import { getAuth } from '@/utils/auth'; import { getAuth } from '@/utils/auth';
import { payStatus } from '@/pages/balance/common'; import { payStatus } from '@/pages/balance/common';
import { STATUS_TEXT } from '@/constants/balance'; import { STATUS_TEXT } from '@/constants/balance';
const intl = getIntl(); const intl = getIntl();
const format = "YYYY-MM-DD HH:mm:ss"
const URL_MAP = {
[PRODUCT_NOTICE_SETTLEMENT_DETAIL]: "productNoticeSettlementDetail",
[LOGISTICS_DETAIL]: "logisticsDetail",
[ORDER_DETAIL]: "orderDetail",
[CONTRACT_FUND_BILL]: '',
}
const STATUS_COLOR = ["default", "warning", "primary", "danger", "success"];
/** 通联支付 个人会员 */
const USER_MEMBER_TYPE = 3
/** 通联支付企业会员 */
const ENTERPRISE_MERBER_TYPE = 2
/** 通联支付 未认证提示 */
const BALANCE_UNVERIFY_TIPS = {
[USER_MEMBER_TYPE]: '该结算方会员未进行通联实名认证,暂不可收款',
[ENTERPRISE_MERBER_TYPE]: '该结算方会员暂未完成企业信息审核,暂不可收款;',
}
/** 付款方 */
const PAY_UNVERIFY_TIPS = {
[USER_MEMBER_TYPE]: '该会员未进行通联实名认证,暂不可收款',
[ENTERPRISE_MERBER_TYPE]: '该会员暂未完成企业信息审核,暂不可收款;',
}
type ModalsType = { type ModalsType = {
/** 待对账 */ /** 待对账 */
...@@ -54,6 +23,7 @@ type ModalsType = { ...@@ -54,6 +23,7 @@ type ModalsType = {
viewPay: boolean, viewPay: boolean,
/** 查看通联支付 */ /** 查看通联支付 */
viewUniversalPay: boolean, viewUniversalPay: boolean,
} }
function useHandleSettlementList() { function useHandleSettlementList() {
...@@ -62,6 +32,7 @@ function useHandleSettlementList() { ...@@ -62,6 +32,7 @@ function useHandleSettlementList() {
const [modals, setModals] = useState<ModalsType>({ const [modals, setModals] = useState<ModalsType>({
viewPay: false, viewPay: false,
viewUniversalPay: false, viewUniversalPay: false,
reconciledComfirm: false, reconciledComfirm: false,
confirmCompletePaymentStatus: false confirmCompletePaymentStatus: false
}) })
...@@ -85,6 +56,8 @@ function useHandleSettlementList() { ...@@ -85,6 +56,8 @@ function useHandleSettlementList() {
const handleAction = async (record: GetSettleAccountsPlatformScoreSettlementPageReceivableSettlementResponseDetail, key: keyof ModalsType) => { const handleAction = async (record: GetSettleAccountsPlatformScoreSettlementPageReceivableSettlementResponseDetail, key: keyof ModalsType) => {
setItemInfo(record); setItemInfo(record);
handleOpen(key);
} }
const columns = [ const columns = [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment