Skip to content

J
jinfa-platform
Commit 95710f94 authored by XieZhiXiong's avatar XieZhiXiong
Browse files
Options

feat: 新增退款余额、对公账户信息查询、新增申请单隐藏申请单号、内外部状态

parent da89aa65
Hide whitespace changes
Inline Side-by-side
Showing with 490 additions and 391 deletions
src/pages/afterService/components/RefundModal/Balance/index.tsx
View file @ 95710f94
import React, { useState } from 'react'; import React, { useEffect, useState } from 'react';
import { Descriptions, Space, Button } from 'antd'; import { Descriptions, Space, Button, Spin } from 'antd';
import { PublicApi } from '@/services/api';
interface bankAccount {
id: number, interface BalanceProps {
name: string, /**
bankAccount: string, * 弹窗需要的数据值
bankDeposit: string, */
memberId: number, value: {[key: string]: any};
}; /**
* 关闭事件
interface BalanceProps { */
/** handleModalVisible: () => void;
* 弹窗需要的数据值 /**
*/ * 弹窗内确认事件
value: {[key: string]: any}; */
/** handleConfirm: (values: {[key: string]: any}, modalName: string) => void;
* 关闭事件 /**
*/ * 弹窗提交 loading
handleModalVisible: () => void; */
/** submitLoading: boolean;
* 弹窗内确认事件 /**
*/ * 采购商id
handleConfirm: (values: {[key: string]: any}, modalName: string) => void; */
/** purchaserId: number,
* 弹窗提交 loading /**
*/ * 采购商角色id
submitLoading: boolean; */
}; purchaserRoleId: number,
};
const Balance: React.FC<BalanceProps> = ({
handleModalVisible, const Balance: React.FC<BalanceProps> = ({
handleConfirm, handleModalVisible,
value, handleConfirm,
submitLoading, value,
}) => { submitLoading,
const [bankAccount, setBankAccount] = useState<bankAccount>({ }) => {
id: 0, const [balance, setBalance] = useState(0);
name: '', const [loading, setLoading] = useState(false);
bankAccount: '',
bankDeposit: '', const getPayAssetAccountGetUserBalance = () => {
memberId: 0, // setLoading(false);
}); // // todo 这个接口可能要改
// PublicApi.getPayAssetAccountGetUserBalance({
return ( // payType: `${1}`,
<> // parentMemberId: `${0}`,
<Descriptions title="账户余额信息" column={1}> // parentMemberRoleId: `${0}`,
<Descriptions.Item label="账户可用余额">￥500000.00</Descriptions.Item> // }).then(res => {
<Descriptions.Item label="当前退款金额"> // if (res.code === 1000) {
<span style={{ color: '#EF6260' }}>￥6000.00</span> // setBalance(res.data);
</Descriptions.Item> // }
</Descriptions> // }).finally(() => {
// setLoading(false);
<div style={{ marginTop: 20, textAlign: 'center' }}> // });
<Space> };
<Button onClick={handleModalVisible}>
取消 useEffect(() => {
</Button> getPayAssetAccountGetUserBalance();
<Button }, []);
type="primary"
onClick={() => handleConfirm(value, 'balance')} return (
loading={submitLoading} <Spin spinning={loading}>
> <Descriptions title="账户余额信息" column={1}>
退款 <Descriptions.Item label="账户可用余额">￥{balance}</Descriptions.Item>
</Button> <Descriptions.Item label="当前退款金额">
</Space> <span style={{ color: '#EF6260' }}>￥{value.refundAmount}</span>
</div> </Descriptions.Item>
</> </Descriptions>
)
}; <div style={{ marginTop: 20, textAlign: 'center' }}>
<Space>
<Button onClick={handleModalVisible}>
取消
</Button>
<Button
type="primary"
onClick={() => handleConfirm(value, 'balance')}
loading={submitLoading}
>
退款
</Button>
</Space>
</div>
</Spin>
)
};
export default Balance; export default Balance;
\ No newline at end of file
src/pages/afterService/components/RefundModal/COD/index.tsx
View file @ 95710f94
import React, { useState } from 'react'; import React, { useState } from 'react';
import { Descriptions, Space, Button } from 'antd'; import { Descriptions, Space, Button } from 'antd';
interface bankAccount { interface bankAccount {
id: number, id: number,
name: string, name: string,
bankAccount: string, bankAccount: string,
bankDeposit: string, bankDeposit: string,
memberId: number, memberId: number,
}; };
interface BalanceProps { interface BalanceProps {
/** /**
* 弹窗需要的数据值 * 弹窗需要的数据值
*/ */
value: {[key: string]: any}; value: {[key: string]: any};
/** /**
* 关闭事件 * 关闭事件
*/ */
handleModalVisible: () => void; handleModalVisible: () => void;
/** /**
* 弹窗内确认事件 * 弹窗内确认事件
*/ */
handleConfirm: (values: {[key: string]: any}, modalName: string) => void; handleConfirm: (values: {[key: string]: any}, modalName: string) => void;
/** /**
* 弹窗提交 loading * 弹窗提交 loading
*/ */
submitLoading: boolean; submitLoading: boolean;
}; };
const COD: React.FC<BalanceProps> = ({ const COD: React.FC<BalanceProps> = ({
handleModalVisible, handleModalVisible,
handleConfirm, handleConfirm,
value, value,
submitLoading, submitLoading,
}) => { }) => {
const [bankAccount, setBankAccount] = useState<bankAccount>({
id: 0, return (
name: '', <>
bankAccount: '', <p>
bankDeposit: '', 支付方式为货到付款的订单，用户确认退款方式与退款金额后，
memberId: 0, 系统会按照退款流程来完成退款动作，实际资金的退款结算由
}); 交易双方线下处理。
</p>
return (
<> <Descriptions column={1}>
<p> <Descriptions.Item label="支付方式">货到付款</Descriptions.Item>
支付方式为货到付款的订单，用户确认退款方式与退款金额后， <Descriptions.Item label="退款金额">
系统会按照退款流程来完成退款动作，实际资金的退款结算由 <span style={{ color: '#EF6260' }}>￥{value.refundAmount}</span>
交易双方线下处理。 </Descriptions.Item>
</p> </Descriptions>
<Descriptions column={1}> <div style={{ marginTop: 20, textAlign: 'center' }}>
<Descriptions.Item label="支付方式">货到付款</Descriptions.Item> <Space>
<Descriptions.Item label="退款金额"> <Button onClick={handleModalVisible}>
<span style={{ color: '#EF6260' }}>￥6000.00</span> 取消
</Descriptions.Item> </Button>
</Descriptions> <Button
type="primary"
<div style={{ marginTop: 20, textAlign: 'center' }}> onClick={() => handleConfirm(value, 'COD')}
<Space> loading={submitLoading}
<Button onClick={handleModalVisible}> >
取消 确认
</Button> </Button>
<Button </Space>
type="primary" </div>
onClick={() => handleConfirm(value, 'COD')} </>
loading={submitLoading} )
> };
确认
</Button>
</Space>
</div>
</>
)
};
export default COD; export default COD;
\ No newline at end of file
src/pages/afterService/components/RefundModal/UploadVoucher/index.tsx
View file @ 95710f94
import React, { useState } from 'react'; import React, { useState, useEffect } from 'react';
import { Button, Space, message } from 'antd'; import { Button, Space, message, Spin } from 'antd';
import { createFormActions } from '@formily/antd'; import { createFormActions } from '@formily/antd';
import NiceForm from '@/components/NiceForm'; import { PublicApi } from '@/services/api';
import { uploadVoucherModalSchema } from './schema'; import NiceForm from '@/components/NiceForm';
import { uploadVoucherModalSchema } from './schema';
const uploadVoucherFormActions = createFormActions();
const uploadVoucherFormActions = createFormActions();
interface bankAccount {
name: string, interface bankAccount {
bankAccount: string, name: string,
bankDeposit: string, bankAccount: string,
}; bankDeposit: string,
};
interface UploadVoucherProps {
/** interface UploadVoucherProps {
* 弹窗需要的数据值 /**
*/ * 弹窗需要的数据值
value: {[key: string]: any}; */
/** value: {[key: string]: any};
* 关闭事件 /**
*/ * 关闭事件
handleModalVisible: () => void; */
/** handleModalVisible: () => void;
* 弹窗内确认事件 /**
*/ * 弹窗内确认事件
handleConfirm: (values: {[key: string]: any}, modalName: string) => void; */
/** handleConfirm: (values: {[key: string]: any}, modalName: string) => void;
* 弹窗提交 loading /**
*/ * 弹窗提交 loading
submitLoading: boolean; */
}; submitLoading: boolean;
/**
const UploadVoucher: React.FC<UploadVoucherProps> = ({ * 采购商id
handleConfirm, */
handleModalVisible, purchaserId: number,
value, /**
submitLoading, * 采购商角色id
}) => { */
const [bankAccount, setBankAccount] = useState<bankAccount>({ purchaserRoleId: number,
name: '', };
bankAccount: '',
bankDeposit: '', const UploadVoucher: React.FC<UploadVoucherProps> = ({
}); handleConfirm,
handleModalVisible,
const beforeUploadVoucher = file => { value,
console.log(file.size) submitLoading,
if (file.size / 1024 > 200) { purchaserId,
message.warning('图片大小超过200K'); purchaserRoleId,
return Promise.reject(); }) => {
} const [bankAccount, setBankAccount] = useState<bankAccount>({
}; name: '',
bankAccount: '',
const handleUploadVoucherSubmit = values => { bankDeposit: '',
const { fileList = [] } = values; });
const [loading, setLoading] = useState(false);
if (handleConfirm) {
if (!bankAccount || !bankAccount.name) { // 获取对公账户信息
message.error('没有收款账户相关信息，无法退款'); const getSettleAccountsCorporateAccountConfig = (memberId: number, memberRoleId: number) => {
return; if (!memberId || !memberRoleId) {
} return;
handleConfirm({ }
...value, setLoading(true);
payProve: { PublicApi.getSettleAccountsCorporateAccountConfig({
...values, memberId: `${memberId}`,
fileList: fileList.map(item => item.status === 'done' && ({ memberRoleId: `${memberRoleId}`,
name: item.name, }).then(res => {
proveUrl: item.data.url, if (res.code === 1000) {
})).filter(Boolean), setBankAccount(res.data);
}, }
}, 'uploadVoucher'); }).finally(() => {
} setLoading(false);
}; });
};
return (
<> useEffect(() => {
<NiceForm getSettleAccountsCorporateAccountConfig(purchaserId, purchaserRoleId);
previewPlaceholder="" }, []);
initialValues={bankAccount}
effects={($, { setFieldState }) => { const beforeUploadVoucher = file => {
console.log(file.size)
}} if (file.size / 1024 > 200) {
expressionScope={{ message.warning('图片大小超过200K');
beforeUpload: beforeUploadVoucher, return Promise.reject();
}} }
actions={uploadVoucherFormActions} };
schema={uploadVoucherModalSchema}
onSubmit={handleUploadVoucherSubmit} const handleUploadVoucherSubmit = values => {
/> const { fileList = [] } = values;
<div style={{ marginTop: 20, textAlign: 'center' }}> if (handleConfirm) {
<Space> if (!bankAccount || !bankAccount.name) {
<Button onClick={handleModalVisible}> message.error('没有收款账户相关信息，无法退款');
取消 return;
</Button> }
<Button handleConfirm({
type="primary" ...value,
onClick={() => uploadVoucherFormActions.submit()} payProve: {
loading={submitLoading} ...values,
> fileList: fileList.map(item => item.status === 'done' && ({
退款 name: item.name,
</Button> proveUrl: item.data.url,
</Space> })).filter(Boolean),
</div> },
</> }, 'uploadVoucher');
) }
}; };
return (
<Spin spinning={loading}>
<NiceForm
previewPlaceholder=""
initialValues={bankAccount}
effects={($, { setFieldState }) => {
}}
expressionScope={{
beforeUpload: beforeUploadVoucher,
}}
actions={uploadVoucherFormActions}
schema={uploadVoucherModalSchema}
onSubmit={handleUploadVoucherSubmit}
/>
<div style={{ marginTop: 20, textAlign: 'center' }}>
<Space>
<Button onClick={handleModalVisible}>
取消
</Button>
<Button
type="primary"
onClick={() => uploadVoucherFormActions.submit()}
loading={submitLoading}
>
退款
</Button>
</Space>
</div>
</Spin>
)
};
export default UploadVoucher; export default UploadVoucher;
\ No newline at end of file
src/pages/afterService/components/RefundModal/index.tsx
View file @ 95710f94
import React, { Suspense } from 'react'; import React, { Suspense } from 'react';
import { Modal } from 'antd'; import { Modal } from 'antd';
const UploadVoucher = React.lazy(() => import('./UploadVoucher')); const UploadVoucher = React.lazy(() => import('./UploadVoucher'));
const Balance = React.lazy(() => import('./Balance')); const Balance = React.lazy(() => import('./Balance'));
const Credit = React.lazy(() => import('./Credit')); const Credit = React.lazy(() => import('./Credit'));
const COD = React.lazy(() => import('./COD')); const COD = React.lazy(() => import('./COD'));
export interface RefundModalProps { export interface RefundModalProps {
/** /**
* 是否可见 * 是否可见
*/ */
visible: boolean; visible: boolean;
/** /**
* 对应的弹窗名称 * 对应的弹窗名称
*/ */
modalName: string; modalName: string;
/** /**
* 关闭事件 * 关闭事件
*/ */
handleModalVisible: () => void; handleModalVisible: () => void;
/** /**
* 弹窗内确认事件 * 弹窗内确认事件
*/ */
handleConfirm: (values: {[key: string]: any}, modalName: string) => void; handleConfirm: (values: {[key: string]: any}, modalName: string) => void;
/** /**
* 弹窗需要的数据值 * 弹窗需要的数据值
*/ */
value: {[key: string]: any}; value: {[key: string]: any};
/** /**
* 弹窗提交 loading * 弹窗提交 loading
*/ */
submitLoading: boolean; submitLoading: boolean;
}; };
const RefundModal: React.FC<RefundModalProps> = ({ const RefundModal: React.FC<RefundModalProps> = ({
visible = false, visible = false,
modalName = 'uploadVoucher', modalName = 'uploadVoucher',
handleModalVisible, handleModalVisible,
handleConfirm, handleConfirm,
value, value,
submitLoading, submitLoading,
}) => { }) => {
const tempMap = { const tempMap = {
uploadVoucher: { uploadVoucher: {
width: 600, width: 600,
title: '上传退款凭证', title: '上传退款凭证',
render: () => ( render: () => (
<Suspense fallback={null}> <Suspense fallback={null}>
<UploadVoucher <UploadVoucher
value={value} value={value}
handleConfirm={handleConfirm} purchaserId={value.purchaserId}
handleModalVisible={handleModalVisible} purchaserRoleId={value.purchaserRoleId}
submitLoading={submitLoading} handleConfirm={handleConfirm}
/> handleModalVisible={handleModalVisible}
</Suspense> submitLoading={submitLoading}
), />
}, </Suspense>
balance: { ),
width: 600, },
title: '退款处理', balance: {
render: () => ( width: 600,
<Suspense fallback={null}> title: '退款处理',
<Balance render: () => (
value={value} <Suspense fallback={null}>
handleConfirm={handleConfirm} <Balance
handleModalVisible={handleModalVisible} value={value}
submitLoading={submitLoading} handleConfirm={handleConfirm}
/> handleModalVisible={handleModalVisible}
</Suspense> submitLoading={submitLoading}
), />
}, </Suspense>
credit: { ),
width: 600, },
title: '退款处理', credit: {
render: () => ( width: 600,
<Suspense fallback={null}> title: '退款处理',
<Credit render: () => (
value={value} <Suspense fallback={null}>
handleConfirm={handleConfirm} <Credit
handleModalVisible={handleModalVisible} value={value}
submitLoading={submitLoading} handleConfirm={handleConfirm}
/> handleModalVisible={handleModalVisible}
</Suspense> submitLoading={submitLoading}
), />
}, </Suspense>
COD: { ),
width: 500, },
title: '货到付款退款确认', COD: {
render: () => ( width: 500,
<Suspense fallback={null}> title: '货到付款退款确认',
<COD render: () => (
value={value} <Suspense fallback={null}>
handleConfirm={handleConfirm} <COD
handleModalVisible={handleModalVisible} value={value}
submitLoading={submitLoading} handleConfirm={handleConfirm}
/> handleModalVisible={handleModalVisible}
</Suspense> submitLoading={submitLoading}
), />
}, </Suspense>
}; ),
},
const template = tempMap[modalName] || { };
width: 640,
title: '标题', const template = tempMap[modalName] || {
render: () => ('没有找到 modal 模板'), width: 640,
}; title: '标题',
render: () => ('没有找到 modal 模板'),
return ( };
<Modal
width={template.width} return (
title={template.title} <Modal
visible={visible} width={template.width}
footer={null} title={template.title}
onCancel={() => handleModalVisible()} visible={visible}
destroyOnClose footer={null}
> onCancel={() => handleModalVisible()}
{template.render()} destroyOnClose
</Modal> >
); {template.render()}
}; </Modal>
);
};
export default RefundModal; export default RefundModal;
\ No newline at end of file
src/pages/afterService/components/ReturnDetailInfo/index.tsx
View file @ 95710f94
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: XieZhiXiong * @Author: XieZhiXiong
* @Date: 2020-11-05 18:02:18 * @Date: 2020-11-05 18:02:18
* @LastEditors: XieZhiXiong * @LastEditors: XieZhiXiong
* @LastEditTime: 2020-12-15 10:26:44 * @LastEditTime: 2020-12-28 13:53:00
* @Description: 退款明细 * @Description: 退款明细
*/ */
import React, { useState } from 'react'; import React, { useState } from 'react';
...@@ -58,6 +58,14 @@ interface ReturnDetailInfoProps { ...@@ -58,6 +58,14 @@ interface ReturnDetailInfoProps {
* 退货申请单内部状态 * 退货申请单内部状态
*/ */
innerStatus: number; innerStatus: number;
/**
* 采购商id
*/
purchaserId: number,
/**
* 采购商角色id
*/
purchaserRoleId: number,
}; };
const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
...@@ -66,6 +74,8 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({ ...@@ -66,6 +74,8 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
onConfirm, onConfirm,
isPurchaser = false, isPurchaser = false,
innerStatus, innerStatus,
purchaserId,
purchaserRoleId,
}) => { }) => {
const [visibleResult, setVisibleResult] = useState(false); const [visibleResult, setVisibleResult] = useState(false);
const [notReceivedLoading, setNotReceivedLoading] = useState(false); const [notReceivedLoading, setNotReceivedLoading] = useState(false);
...@@ -143,34 +153,34 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({ ...@@ -143,34 +153,34 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
}, },
]; ];
const handleRefund = (id, channel) => { const handleRefund = (id, channel, amount) => {
switch(channel) { switch(channel) {
// 余额支付 // 余额支付
case PAY_CHANNEL_BALANCE: { case PAY_CHANNEL_BALANCE: {
setModalName('balance'); setModalName('balance');
setRefundModalVisible(true); setRefundModalVisible(true);
setRefundModalValue({ id }); setRefundModalValue({ id, refundAmount: amount });
break; break;
}; };
// 线下支付 // 线下支付
case PAY_CHANNEL_OFFLINE: { case PAY_CHANNEL_OFFLINE: {
setModalName('uploadVoucher'); setModalName('uploadVoucher');
setRefundModalVisible(true); setRefundModalVisible(true);
setRefundModalValue({ id }); setRefundModalValue({ id, purchaserId, purchaserRoleId });
break; break;
}; };
// 授信支付 // 授信支付
case PAY_CHANNEL_CREDIT: { case PAY_CHANNEL_CREDIT: {
setModalName('credit'); setModalName('credit');
setRefundModalVisible(true); setRefundModalVisible(true);
setRefundModalValue({ id }); setRefundModalValue({ id, refundAmount: amount });
break; break;
}; };
// 货到付款 // 货到付款
case PAY_CHANNEL_COD: { case PAY_CHANNEL_COD: {
setModalName('COD'); setModalName('COD');
setRefundModalVisible(true); setRefundModalVisible(true);
setRefundModalValue({ id }); setRefundModalValue({ id, refundAmount: amount });
break; break;
}; };
default: { default: {
...@@ -215,9 +225,11 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({ ...@@ -215,9 +225,11 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
const handleRefundConfirm = (values, modalName) => { const handleRefundConfirm = (values, modalName) => {
setSubmitLoading(true); setSubmitLoading(true);
onRefund(values).finally(() => { if (onRefund) {
setSubmitLoading(false); onRefund(values).finally(() => {
}); setSubmitLoading(false);
});
}
}; };
return ( return (
...@@ -264,14 +276,15 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({ ...@@ -264,14 +276,15 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
<div className={styles['deliver-item-actions']}> <div className={styles['deliver-item-actions']}>
{ {
!isPurchaser && !isPurchaser &&
innerStatus === RETURN_INNER_STATUS_TO_BE_REFUNDED && ( innerStatus === RETURN_INNER_STATUS_TO_BE_REFUNDED &&
!!item.canRefund && (
item.outerStatus === REFUND_OUTER_STATUS_NOT_RECEIVED || item.outerStatus === REFUND_OUTER_STATUS_NOT_RECEIVED ||
item.innerStatus === REFUND_INNER_STATUS_NO_REFUND || item.innerStatus === REFUND_INNER_STATUS_NO_REFUND ||
item.innerStatus === REFUND_INNER_STATUS_REFUND_FAILED item.innerStatus === REFUND_INNER_STATUS_REFUND_FAILED
) && ( ) && (
<div <div
className={styles['deliver-item-return']} className={styles['deliver-item-return']}
onClick={() => handleRefund(item.refundId, item.channel)} onClick={() => handleRefund(item.refundId, item.channel, item.refundAmount)}
> >
退款 退款
</div> </div>
......
src/pages/afterService/exchangeApplication/exchangePrSubmit/components/ExchangeForm/index.tsx
View file @ 95710f94
...@@ -28,6 +28,7 @@ import { ...@@ -28,6 +28,7 @@ import {
const addSchemaAction = createFormActions(); const addSchemaAction = createFormActions();
const { const {
onFormInputChange$, onFormInputChange$,
onFormInit$,
} = FormEffectHooks; } = FormEffectHooks;
interface BillsFormProps { interface BillsFormProps {
...@@ -511,12 +512,22 @@ const ExchangeForm: React.FC<BillsFormProps> = ({ ...@@ -511,12 +512,22 @@ const ExchangeForm: React.FC<BillsFormProps> = ({
}} }}
editable={isEdit || !id} editable={isEdit || !id}
effects={($, actions) => { effects={($, actions) => {
const { setFieldState } = actions;
createEffects($, actions) createEffects($, actions)
onFormInputChange$().subscribe(() => { onFormInputChange$().subscribe(() => {
if (!unsaved) { if (!unsaved) {
setUnsaved(true); setUnsaved(true);
} }
}); });
onFormInit$().subscribe(() => {
if (!id && isEdit) {
setFieldState('*(applyNo,outerStatus,innerStatus)', field => {
field.visible = false;
});
}
});
}} }}
onSubmit={handleSubmit} onSubmit={handleSubmit}
actions={addSchemaAction} actions={addSchemaAction}
......
src/pages/afterService/repairApplication/repairPrSubmit/components/RepairForm/index.tsx
View file @ 95710f94
...@@ -26,6 +26,7 @@ import { ...@@ -26,6 +26,7 @@ import {
const addSchemaAction = createFormActions(); const addSchemaAction = createFormActions();
const { const {
onFormInputChange$, onFormInputChange$,
onFormInit$,
} = FormEffectHooks; } = FormEffectHooks;
interface DetailInfo { interface DetailInfo {
...@@ -356,12 +357,22 @@ const RepairForm: React.FC<BillsFormProps> = ({ ...@@ -356,12 +357,22 @@ const RepairForm: React.FC<BillsFormProps> = ({
}} }}
editable={isEdit || !id} editable={isEdit || !id}
effects={($, actions) => { effects={($, actions) => {
const { setFieldState } = actions;
createEffects($, actions) createEffects($, actions)
onFormInputChange$().subscribe(() => { onFormInputChange$().subscribe(() => {
if (!unsaved) { if (!unsaved) {
setUnsaved(true); setUnsaved(true);
} }
}); });
onFormInit$().subscribe(() => {
if (!id && isEdit) {
setFieldState('*(applyNo,outerStatus,innerStatus)', field => {
field.visible = false;
});
}
});
}} }}
onSubmit={handleSubmit} onSubmit={handleSubmit}
actions={addSchemaAction} actions={addSchemaAction}
......
src/pages/afterService/returnApplication/components/DetailInfo/index.tsx
View file @ 95710f94
...@@ -416,6 +416,8 @@ const DetailInfo: React.FC<DetailInfoProps> = ({ ...@@ -416,6 +416,8 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
dataSource={detailInfo && detailInfo.refundList ? detailInfo.refundList : []} dataSource={detailInfo && detailInfo.refundList ? detailInfo.refundList : []}
onConfirm={handleConfirm} onConfirm={handleConfirm}
innerStatus={detailInfo?.innerStatus} innerStatus={detailInfo?.innerStatus}
purchaserId={detailInfo?.memberId}
purchaserRoleId={detailInfo?.roleId}
isPurchaser isPurchaser
/> />
</Suspense> </Suspense>
......
src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/index.tsx
View file @ 95710f94
...@@ -29,6 +29,7 @@ import { ...@@ -29,6 +29,7 @@ import {
const addSchemaAction = createFormActions(); const addSchemaAction = createFormActions();
const { const {
onFormInputChange$, onFormInputChange$,
onFormInit$,
} = FormEffectHooks; } = FormEffectHooks;
interface BillsFormProps { interface BillsFormProps {
...@@ -575,12 +576,22 @@ const ReturnForm: React.FC<BillsFormProps> = ({ ...@@ -575,12 +576,22 @@ const ReturnForm: React.FC<BillsFormProps> = ({
}} }}
editable={isEdit || !id} editable={isEdit || !id}
effects={($, actions) => { effects={($, actions) => {
const { setFieldState } = actions;
createEffects($, actions) createEffects($, actions)
onFormInputChange$().subscribe(() => { onFormInputChange$().subscribe(() => {
if (!unsaved) { if (!unsaved) {
setUnsaved(true); setUnsaved(true);
} }
}); });
onFormInit$().subscribe(() => {
if (!id && isEdit) {
setFieldState('*(applyNo,outerStatus,innerStatus)', field => {
field.visible = false;
});
}
});
}} }}
onSubmit={handleSubmit} onSubmit={handleSubmit}
actions={addSchemaAction} actions={addSchemaAction}
......
src/pages/afterService/returnManage/components/DetailInfo/index.tsx
View file @ 95710f94
...@@ -329,7 +329,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({ ...@@ -329,7 +329,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
// 退款 // 退款
const handleRefund = (values): Promise<any> => { const handleRefund = (values): Promise<any> => {
const { id, ...rest } = values; const { id, refundAmount, ...rest } = values;
return PublicApi.postAsReturnGoodsRefund({ return PublicApi.postAsReturnGoodsRefund({
dataId: id, dataId: id,
...rest, ...rest,
...@@ -463,6 +463,8 @@ const DetailInfo: React.FC<DetailInfoProps> = ({ ...@@ -463,6 +463,8 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
dataSource={detailInfo && detailInfo.refundList ? detailInfo.refundList : []} dataSource={detailInfo && detailInfo.refundList ? detailInfo.refundList : []}
onRefund={handleRefund} onRefund={handleRefund}
innerStatus={detailInfo?.innerStatus} innerStatus={detailInfo?.innerStatus}
purchaserId={detailInfo?.memberId}
purchaserRoleId={detailInfo?.roleId}
/> />
</Suspense> </Suspense>
</Col> </Col>
......
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