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

fix: 合同订单详情异常部分内容

parent deac48a7
...@@ -87,32 +87,37 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => { ...@@ -87,32 +87,37 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => {
return ( return (
<> <>
<Row style={{ marginTop: 24 }} gutter={24}> <Row style={{ marginTop: 24 }} gutter={24}>
<Col span={12}> <Col span={data.orderModel > 30 ? 15: 12}>
<MellowCard title='交易信息' fullHeight> <MellowCard title='交易信息' fullHeight>
<RenderCard infoList={payInfo} dataSource={data} /> <RenderCard infoList={payInfo} dataSource={data} />
</MellowCard> </MellowCard>
</Col> </Col>
<Col span={6}> <Col span={data.orderModel > 30 ? 9: 6}>
<MellowCard title='其他信息' fullHeight> <MellowCard title='其他信息' fullHeight>
<RenderCard infoList={otherInfo} dataSource={data} /> <RenderCard infoList={otherInfo} dataSource={data} />
</MellowCard> </MellowCard>
</Col> </Col>
<Col span={6}> {
<MellowCard title='电子合同' fullHeight> (data.orderModel > 30) ?
<ContractList null
dataSource={ :
data.electronicContractUrl ? <Col span={6}>
[ <MellowCard title='电子合同' fullHeight>
{ <ContractList
electronicContractUrl: data.electronicContractUrl, dataSource={
electronicContractName: data.electronicContractName, data.electronicContractUrl ?
}, [
] : {
null electronicContractUrl: data.electronicContractUrl,
} electronicContractName: data.electronicContractName,
/> },
</MellowCard> ] :
</Col> null
}
/>
</MellowCard>
</Col>
}
</Row> </Row>
<Modal title="发票信息" visible={isModalVisible} onOk={()=>setIsModalVisible(false)} onCancel={()=>setIsModalVisible(false)}> <Modal title="发票信息" visible={isModalVisible} onOk={()=>setIsModalVisible(false)} onCancel={()=>setIsModalVisible(false)}>
<Row gutter={[0 ,10]} style={{fontSize: 14}}> <Row gutter={[0 ,10]} style={{fontSize: 14}}>
......
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