Commit 55e7ad6b authored by XieZhiXiong's avatar XieZhiXiong

fix: 更改字段

parent 70ef8f2a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: XieZhiXiong * @Author: XieZhiXiong
* @Date: 2020-11-05 15:18:15 * @Date: 2020-11-05 15:18:15
* @LastEditors: XieZhiXiong * @LastEditors: XieZhiXiong
* @LastEditTime: 2020-12-23 10:48:05 * @LastEditTime: 2020-12-25 10:32:49
* @Description: 换货发货统计、换货发货明细 * @Description: 换货发货统计、换货发货明细
*/ */
import React, { useState } from 'react'; import React, { useState } from 'react';
...@@ -277,13 +277,13 @@ const ExchangeDeliverInfo: React.FC<ExchangeDeliverInfoProps> = ({ ...@@ -277,13 +277,13 @@ const ExchangeDeliverInfo: React.FC<ExchangeDeliverInfoProps> = ({
<Row align="middle"> <Row align="middle">
<Col span={16}> <Col span={16}>
<Descriptions> <Descriptions>
<Descriptions.Item label="退货发货单号"> <Descriptions.Item label="货发货单号">
<a>{item.deliveryNo}</a> <a>{item.deliveryNo}</a>
</Descriptions.Item> </Descriptions.Item>
<Descriptions.Item label="物流单号"> <Descriptions.Item label="物流单号">
<a>{item.logisticsOrderNo}</a> <a>{item.logisticsOrderNo}</a>
</Descriptions.Item> </Descriptions.Item>
<Descriptions.Item label="退货入库单号">{item.storageNo}</Descriptions.Item> <Descriptions.Item label="货入库单号">{item.storageNo}</Descriptions.Item>
<Descriptions.Item label="发货时间">{item.deliveryTime}</Descriptions.Item> <Descriptions.Item label="发货时间">{item.deliveryTime}</Descriptions.Item>
<Descriptions.Item label="物流公司"> <Descriptions.Item label="物流公司">
{item.logisticsName} {item.logisticsName}
......
...@@ -143,7 +143,7 @@ const ExchangeForm: React.FC<BillsFormProps> = ({ ...@@ -143,7 +143,7 @@ const ExchangeForm: React.FC<BillsFormProps> = ({
}, },
{ {
title: '已换货数量', title: '已换货数量',
dataIndex: 'returnCount', dataIndex: 'replaceCount',
align: 'center', align: 'center',
}, },
]; ];
......
...@@ -255,7 +255,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({ ...@@ -255,7 +255,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
extraData: { extraData: {
returnReason: item.returnReason, returnReason: item.returnReason,
payList: item.payList || [], payList: item.payList || [],
id: item.orderRecordId || [], id: item.orderRecordId,
taskType, taskType,
}, },
})), })),
...@@ -447,7 +447,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({ ...@@ -447,7 +447,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
const value = []; const value = [];
values.forEach(item => { values.forEach(item => {
const existing = preValues.find(val => val.id === item.id); const existing = preValues.find(val => val.extraData.id === item.id);
const atom = const atom =
existing ? existing ?
existing : existing :
......
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