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

fix: 取消采购商订单物流单跳转,采购合同下单隐藏订单详情隐藏电子合同项

parent b8da003c
...@@ -193,7 +193,7 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => { ...@@ -193,7 +193,7 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
dataIndex: 'logisticsNo', dataIndex: 'logisticsNo',
align: 'center', align: 'center',
key: 'logisticsNo', key: 'logisticsNo',
render: text => <a target="blank" href={`/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitSearchList/detail?code=${text}`}>{text}</a> // render: text => <a target="blank" href={`/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitSearchList/detail?code=${text}`}>{text}</a>
}, },
{ {
title: '物流公司', title: '物流公司',
......
...@@ -77,20 +77,22 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => { ...@@ -77,20 +77,22 @@ 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.externalStateName !== '不接受订单') || (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.externalStateName !== '不接受订单') || (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.externalStateName !== '不接受订单') || (data.orderModel > 30) ? (data.externalStateName !== '不接受订单') || (data.orderModel > 30) ?
null
:
<Col span={6}>
<MellowCard title='电子合同' fullHeight>
<ContractList <ContractList
dataSource={ dataSource={
data.electronicContractUrl ? data.electronicContractUrl ?
...@@ -103,11 +105,9 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => { ...@@ -103,11 +105,9 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => {
null null
} }
/> />
:
null
}
</MellowCard> </MellowCard>
</Col> </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