|
@@ -16,7 +16,7 @@
|
|
|
<a-row :gutter="24">
|
|
|
<a-col :md="6" :sm="8">
|
|
|
<a-form-item label="订单号">
|
|
|
- <a-input placeholder="请输入订单号" v-model="queryParam.purchase"></a-input>
|
|
|
+ <a-input placeholder="请输入订单号" v-model="queryParam.orderNumber"></a-input>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
|
|
@@ -168,7 +168,7 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
title: '采购/委外订单号',
|
|
|
- dataIndex: 'purchase',
|
|
|
+ dataIndex: 'purOrSubOrder',
|
|
|
width: 140,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
@@ -181,31 +181,31 @@ export default {
|
|
|
|
|
|
{
|
|
|
title: '工厂单价',
|
|
|
- dataIndex: 'theFactoryPrice',
|
|
|
+ dataIndex: 'factoryUnitPrice',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
title: '数量(按合并规则累计)',
|
|
|
- dataIndex: 'quantity',
|
|
|
+ dataIndex: 'planQuantity',
|
|
|
width: 180,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
title: '箱数',
|
|
|
- dataIndex: 'boxesNum',
|
|
|
+ dataIndex: 'actualPackingQty',
|
|
|
width: 90,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
title: '总净重',
|
|
|
- dataIndex: 'totalSuttle',
|
|
|
+ dataIndex: 'totalNetWeight',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
title: '总毛重',
|
|
|
- dataIndex: 'totalRoughWeigh',
|
|
|
+ dataIndex: 'totalGrossWeight;',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
@@ -231,14 +231,14 @@ export default {
|
|
|
|
|
|
{
|
|
|
title: '集装箱号',
|
|
|
- dataIndex: 'containerNo',
|
|
|
+ dataIndex: 'containerNumber',
|
|
|
width: 120,
|
|
|
fixed: 'right',
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
title: '预托书号',
|
|
|
- dataIndex: 'preBookNum',
|
|
|
+ dataIndex: 'depositaryReceiptNo',
|
|
|
width: 120,
|
|
|
fixed: 'right',
|
|
|
className: 'replacecolor'
|