Commit 6957c03a authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix: 处理niceform内上传组件空值异常

parent 9264cbad
......@@ -284,12 +284,13 @@ export const Upload = connect({
</UploadDragger>
)
}
return (<div>
{
value.map(item => (<p key={item.uid} style={{width: 424, display: 'flex', justifyContent: 'space-between'}}>
value ? value.map(item => (<p key={item.uid} style={{width: 424, display: 'flex', justifyContent: 'space-between'}}>
<a href={item.url} target="_blank"><FileFilled /> {item.name}</a>
{!others.readOnly ? <span style={{cursor: 'pointer'}} onClick={() => this.removeItem(item)}><DeleteOutlined /></span> : null}
</p>))
</p>)) : null
}
<AntdUpload
{...others}
......
......@@ -289,6 +289,7 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
// 确认全部发货单已收到回单
const handelReciveReturnOrder = async () => {
// @ts-ignore
const res = await PublicApi.getOrderIsDeliveryCompleted({id: data.id}, {ctlType: "none"})
let tip = ''
if(res.data)
......@@ -307,6 +308,7 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
// 继续发货
const handleContinueDeliver = async () => {
// @ts-ignore
const res = await PublicApi.getOrderIsDeliveryCompleted({id: data.id}, {ctlType: 'none'})
let tip = ''
if(res.data)
......
......@@ -28,7 +28,7 @@ const outOrderCols: any[] = [
dataIndex: 'state',
align: 'center',
key: 'state',
render: text => <StatusColors status={text} type='transformOut'/>
render: (text, record) => <StatusColors status={text} type='transformOut' text={record.stateName} />
// @todo 需传递工作流状态重新render
},
{
......@@ -82,7 +82,7 @@ const PurchaseSideOrderCols: any[] = [
dataIndex: 'state',
align: 'center',
key: 'state',
render: text => <StatusColors status={text} type='transformInside'/>
render: (text, record) => <StatusColors status={text} type='transformInside' text={record.stateName} />
},
{
title: '操作',
......@@ -135,7 +135,7 @@ const SaleSideOrderCols: any[] = [
dataIndex: 'state',
align: 'center',
key: 'state',
render: text => <StatusColors status={text} type='transformSaleInside'/>
render: (text, record) => <StatusColors status={text} type='transformSaleInside' text={record.stateName} />
},
{
title: '操作',
......
import React, { useState, useCallback, useRef } from 'react';
import { OrderDetailContext } from '../../../_public/order/context';
import { PublicApi } from '@/services/api';
import { Button } from 'antd';
import OrderDetailHeader from '@/pages/transaction/components/OrderDetailHeader';
import OrderDetailWrapper from '@/pages/transaction/components/OrderDetailWrapper';
import PreLoading from '@/components/PreLoading';
import { useOrderDetail } from '../../../_public/order/effects/useOrderDetail';
import { history } from 'umi'
import { useHttpRequest } from '@/hooks/useHttpRequest';
import OrderDetailSection from '../../../components/orderDetailSection';
import CreateOrderElectronModal from '@/pages/transaction/components/createElectronModal';
const ReadyApprovedOrderDetail: React.FC = () => {
const { formContext, id, detailList } = useOrderDetail({type: 'saleOrder'})
const electronRef = useRef<any>({})
const handleClick = useCallback(() => {
electronRef.current.setVisible(true)
}, [])
return (
<div>
<OrderDetailContext.Provider value={formContext}>
<OrderDetailHeader detailList={detailList} detailData={formContext.data} extraRight={
<Button type='primary' onClick={handleClick}>
提交审核
</Button>
} />
<OrderDetailWrapper>
<PreLoading loading={!formContext.data} active paragraph={{rows: 6}}>
<OrderDetailSection formContext={formContext} type='saleOrder'/>
</PreLoading>
</OrderDetailWrapper>
{/* 提交时触发的弹窗集合 */}
<CreateOrderElectronModal
currentRef={electronRef}
/>
</OrderDetailContext.Provider>
</div>
);
};
export default ReadyApprovedOrderDetail;
\ No newline at end of file
import React, { useCallback, useRef } from 'react';
import { OrderDetailContext } from '../../../_public/order/context';
import { Button } from 'antd';
import OrderDetailHeader from '@/pages/transaction/components/OrderDetailHeader';
import OrderDetailWrapper from '@/pages/transaction/components/OrderDetailWrapper';
import PreLoading from '@/components/PreLoading';
import { useOrderDetail } from '../../../_public/order/effects/useOrderDetail';
import OrderDetailSection from '../../../components/orderDetailSection';
import CreateOrderElectronModal from '@/pages/transaction/components/createElectronModal';
const ReadyApprovedOrderDetail: React.FC = () => {
const { formContext, id, detailList } = useOrderDetail({type: 'saleOrder'})
const electronRef = useRef<any>({})
const handleClick = useCallback(() => {
electronRef.current.setVisible(true)
}, [])
return (
<div>
<OrderDetailContext.Provider value={formContext}>
<OrderDetailHeader detailList={detailList} detailData={formContext.data} extraRight={
<Button type='primary' onClick={handleClick}>
提交审核
</Button>
} />
<OrderDetailWrapper>
<PreLoading loading={!formContext.data} active paragraph={{rows: 6}}>
<OrderDetailSection formContext={formContext} type='saleOrder'/>
</PreLoading>
</OrderDetailWrapper>
{/* 提交时触发的弹窗集合 */}
<CreateOrderElectronModal
currentRef={electronRef}
/>
</OrderDetailContext.Provider>
</div>
);
};
export default ReadyApprovedOrderDetail;
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