提交 c1549b94 作者: 龚洪江

修复:采购订单id关联商城订单

上级 c8f66798
......@@ -1464,6 +1464,7 @@ type purchaseOrderItemType = {
location?: string;
}[];
};
uavOrderNo: string;
};
export type listPurchaseOrderType = InterListFunction<
{
......
......@@ -136,13 +136,13 @@ const ProcurementOrderDetail = () => {
</Descriptions.Item>
</Descriptions>
<Descriptions title='订单' style={{ marginTop: '10px' }} column={3}>
<Descriptions.Item label='订单编号' labelStyle={{ color: '#000' }}>
{purchaseOrderDetail?.orderNo}
<Descriptions.Item label='订单编号' labelStyle={{ color: '#000' }}>
{purchaseOrderDetail?.uavOrderNo}
</Descriptions.Item>
<Descriptions.Item label='创建时间' labelStyle={{ color: '#000' }}>
<Descriptions.Item label='创建时间' labelStyle={{ color: '#000' }}>
{dayjs(purchaseOrderDetail?.createTime).format('YYYY-MM-DD HH:mm:ss')}
</Descriptions.Item>
<Descriptions.Item label='合同编号' labelStyle={{ color: '#000' }}>
<Descriptions.Item label='合同编号' labelStyle={{ color: '#000' }}>
{purchaseOrderDetail?.contractInfoDTO?.contractNo || '--'}
</Descriptions.Item>
<Descriptions.Item span={3}>
......
......@@ -100,7 +100,7 @@ const ProcurementOrderList = () => {
td={
<div>
<span>订单编号:</span>
<span>{record.orderNo}</span>
<span>{record.uavOrderNo}</span>
</div>
}
tr={record?.skuDTOList?.map((v) => (
......
......@@ -348,7 +348,7 @@ function ProductOrderView() {
dataIndex: 'deliveryTime',
align: 'center',
render: (text: string) => (
<TableItem tr={<div> {text ? dayjs(text).format('YYYY-MM-DD') : ''}</div>} />
<TableItem tr={<div> {text ? dayjs(text).format('YYYY-MM-DD') : '--'}</div>} />
),
},
{
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论