Commit d781fc99 authored by XieZhiXiong's avatar XieZhiXiong

fix: 修复数据不展示的问题

parent 79ad14e5
......@@ -223,7 +223,7 @@ const FlowRecords: React.FC<FlowRecordsProps> = ({
{outerData.data && outerData.data.length > 0 ? (
<Tabs.TabPane tab="外部流转记录" key="1">
<PolymericTable
rowKey="operateTime"
rowKey="step"
dataSource={outerData.data}
columns={outerColumns}
loading={outerLoading}
......@@ -238,7 +238,7 @@ const FlowRecords: React.FC<FlowRecordsProps> = ({
) : null}
<Tabs.TabPane tab="内部流转记录" key="2">
<PolymericTable
rowKey="operateTime"
rowKey="step"
dataSource={innerData.data}
columns={innerColumns}
loading={innerLoading}
......
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-05 15:18:15
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-12-09 11:35:12
* @LastEditTime: 2020-12-22 13:34:38
* @Description: 退货收货统计、退货发货明细
*/
import React from 'react';
......@@ -143,8 +143,8 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({
const detailedColumns: EditableColumns[] = [
{
title: '批次号',
dataIndex: 'batch',
title: '订单号',
dataIndex: 'orderNo',
render: (text, record) => (
<EyePreview
url={``}
......@@ -154,38 +154,48 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({
),
},
{
title: '退货发货单号',
dataIndex: 'deliveryNo',
title: '商品ID',
dataIndex: 'productId',
align: 'center',
},
{
title: '商品名称',
dataIndex: 'productName',
align: 'center',
},
{
title: '品类',
dataIndex: 'category',
align: 'center',
},
{
title: '发货时间',
dataIndex: 'deliveryTime',
title: '品牌',
dataIndex: 'brand',
align: 'center',
},
{
title: '物流单号',
dataIndex: 'logisticsOrderNo',
title: '单位',
dataIndex: 'unit',
align: 'center',
},
{
title: '物流公司',
dataIndex: 'logisticsName',
title: '退货数量',
dataIndex: 'count',
align: 'center',
},
{
title: '退货入库单号',
dataIndex: 'storageNo',
title: '退货发货数量',
dataIndex: 'deliveryCount',
align: 'center',
},
{
title: '入库时间',
dataIndex: 'storageTime',
title: '退货入库数量',
dataIndex: 'storageCount',
align: 'center',
},
{
title: '内部状态',
dataIndex: 'innerStatusName',
title: '差异数量',
dataIndex: 'differenceCount',
align: 'center',
},
];
......@@ -241,7 +251,7 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({
key="1"
>
<PolymericTable
rowKey="id"
rowKey={record => Math.random().toFixed(16).slice(2, 10)}
dataSource={summary}
columns={summaryColumns}
loading={false}
......@@ -344,7 +354,7 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({
</div>
<PolymericTable
rowKey={record => `${record.orderNo}+${record.productId}`}
rowKey={record => Math.random().toFixed(16).slice(2, 10)}
dataSource={item.detailList}
columns={detailedColumns}
loading={false}
......
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