提交 3a70ae86 作者: 龚洪江

修复:意向订单流程操作问题

上级 07829189
...@@ -172,12 +172,11 @@ const SureOrder: FC<ModalProps & selfProps> = ({ open, onOk, onCancel, orderItem ...@@ -172,12 +172,11 @@ const SureOrder: FC<ModalProps & selfProps> = ({ open, onOk, onCancel, orderItem
const amount = const amount =
orderInfoForm.getFieldValue('orderTotalAmount') > orderInfoForm.getFieldValue('orderTotalAmount') >
(orderInfoForm.getFieldValue('cashAmt') || 0) (orderInfoForm.getFieldValue('cashAmt') || 0)
? '¥' + ? (
(
orderInfoForm.getFieldValue('orderTotalAmount') - orderInfoForm.getFieldValue('cashAmt') orderInfoForm.getFieldValue('orderTotalAmount') - orderInfoForm.getFieldValue('cashAmt')
).toLocaleString() ).toLocaleString()
: 0; : 0;
setTotalAmountPaid(amount); setTotalAmountPaid('¥' + amount);
}; };
const handleOk = () => { const handleOk = () => {
if (orderItem) { if (orderItem) {
...@@ -304,11 +303,7 @@ const SureOrder: FC<ModalProps & selfProps> = ({ open, onOk, onCancel, orderItem ...@@ -304,11 +303,7 @@ const SureOrder: FC<ModalProps & selfProps> = ({ open, onOk, onCancel, orderItem
listType='text' listType='text'
fileLength={1} fileLength={1}
onChange={uploadSuccess} onChange={uploadSuccess}
fileType={[ fileType={['application/pdf']}
'application/pdf',
'application/msword',
'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
]}
defaultFileList={contractFileList} defaultFileList={contractFileList}
> >
<Button icon={<UploadOutlined />} /> <Button icon={<UploadOutlined />} />
......
...@@ -347,7 +347,9 @@ function ProductOrderView() { ...@@ -347,7 +347,9 @@ function ProductOrderView() {
title: '订单交期', title: '订单交期',
dataIndex: 'deliveryTime', dataIndex: 'deliveryTime',
align: 'center', align: 'center',
render: (text: string) => <TableItem tr={<div>{dayjs(text).format('YYYY-MM-DD')}</div>} />, render: (text: string) => (
<TableItem tr={<div> {text ? dayjs(text).format('YYYY-MM-DD') : ''}</div>} />
),
}, },
{ {
title: '备注', title: '备注',
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论