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

fix: 处理订单详情账期月结和合同下单商品id显示异常

parent 805285dd
......@@ -29,7 +29,7 @@ const OrderDetailSection:React.FC<OrderDetailSectionProps> = ({formContext, type
...item,
status: item.isExecute ? 'finish' : 'wait',
})) :
[]
null
}
innerVerifySteps={
formContext.data.interiorWorkflowFlowRecordLogResponses ?
......@@ -37,7 +37,7 @@ const OrderDetailSection:React.FC<OrderDetailSectionProps> = ({formContext, type
...item,
status: item.isExecute ? 'finish' : 'wait',
})) :
[]
null
}
></AuditProcess>
......
......@@ -100,10 +100,10 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
<Col>{v.payNode}</Col>
</Row>
{
v.payWay === -1 ?
v.channel === -1 ?
<Row>
<Col className={style.fontGray} span={4}>支付方式: </Col>
<Col>{v.channel === 100 ? '账期' : '月结'}</Col>
<Col>{v.payWay === 5 ? '账期' : '月结'}</Col>
</Row>
:
<>
......
......@@ -396,9 +396,9 @@ const OrderProductTable:React.FC<OrderProductTableProps> = ({editable}) => {
},
{
title: '关联报价商品ID/名称/规格/品类/品牌',
dataIndex: 'materialId',
dataIndex: 'productId',
align: 'center',
key: 'materialId',
key: 'productId',
render: (t, r) => `${t}/${r.productName}/${r.category}/${r.brand}`
},
{
......
......@@ -502,9 +502,9 @@ const SaleOrderProductTable:React.FC<OrderProductTableProps> = (props) => {
},
{
title: '关联报价商品ID/名称/规格/品类/品牌',
dataIndex: 'materialId',
dataIndex: 'productId',
align: 'center',
key: 'materialId',
key: 'productId',
render: (t, r) => `${t}/${r.productName}/${r.category}/${r.brand}`
},
{
......
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