|
@@ -184,9 +184,9 @@
|
|
|
<span slot="boxNumberTitle" class="form-table-heard">
|
|
|
箱数
|
|
|
</span>
|
|
|
- <span slot="netWeightTooTitle" class="form-table-heard">
|
|
|
+ <!-- <span slot="netWeightTooTitle" class="form-table-heard">
|
|
|
净净重
|
|
|
- </span>
|
|
|
+ </span> -->
|
|
|
<!-- prepackSku -->
|
|
|
<template slot="prepackSku" slot-scope="text, record, index">
|
|
|
<a-form-model-item prop="prepackSku" :rules="rules.prepackSku">
|
|
@@ -564,12 +564,11 @@ export default {
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
- // title: '净净重',
|
|
|
+ title: '净净重',
|
|
|
dataIndex: 'netWeightToo',
|
|
|
width: 120,
|
|
|
className: 'replacecolor',
|
|
|
scopedSlots: { customRender: 'netWeightToo' } ,
|
|
|
- slots:{title:'netWeightTooTitle'}
|
|
|
|
|
|
},
|
|
|
// {
|
|
@@ -776,10 +775,10 @@ export default {
|
|
|
|
|
|
handleValueChange(record) {
|
|
|
var dataRow = record
|
|
|
- // if (dataRow.startingBoxNumber != undefined && dataRow.startingBoxNumber != "" &&
|
|
|
- // dataRow.endCaseNumber != undefined && dataRow.endCaseNumber != ""){
|
|
|
- // dataRow.boxNumber = dataRow.endCaseNumber*1-dataRow.startingBoxNumber*1+1;
|
|
|
- // }
|
|
|
+ if (dataRow.startingBoxNumber != undefined && dataRow.startingBoxNumber != "" &&
|
|
|
+ dataRow.endCaseNumber != undefined && dataRow.endCaseNumber != ""){
|
|
|
+ dataRow.boxNumber = dataRow.endCaseNumber*1-dataRow.startingBoxNumber*1+1;
|
|
|
+ }
|
|
|
var allSizeSum = this.getAllSizeSum(dataRow);
|
|
|
dataRow.piecesBox = allSizeSum
|
|
|
dataRow.total = dataRow.piecesBox*dataRow.boxNumber
|
|
@@ -909,7 +908,7 @@ export default {
|
|
|
{key:'outerBoxLength',value:'外箱长度'},
|
|
|
{key:'outerBoxWidth',value:'外箱宽度'},
|
|
|
{key:'outerBoxHeight',value:'外箱高度'},
|
|
|
- {key:'netWeightToo',value:'净净重'},
|
|
|
+ // {key:'netWeightToo',value:'净净重'},
|
|
|
{key:'boxNumber',value:'箱数'},
|
|
|
]
|
|
|
for(var j=0 ; j<Valuable.length;j++){
|
|
@@ -1190,12 +1189,11 @@ export default {
|
|
|
ellipsis: true,
|
|
|
},
|
|
|
{
|
|
|
- // title: '净净重',
|
|
|
+ title: '净净重',
|
|
|
dataIndex : 'netWeightToo',
|
|
|
width: 120,
|
|
|
className: 'replacecolor',
|
|
|
scopedSlots: { customRender: 'netWeightToo' } ,
|
|
|
- slots:{title:'netWeightTooTitle'}
|
|
|
},
|
|
|
{
|
|
|
title: '备注',
|