|
@@ -451,9 +451,8 @@ export default {
|
|
|
// }
|
|
|
this.addAdpacking.syPreAssembledPackingListItemList = [];
|
|
|
this.setHeadCalField();
|
|
|
- var selectData = val[0];
|
|
|
-
|
|
|
- queryShippingDetails({id:selectData.id}).then(res => {
|
|
|
+ var selectData = val[0];
|
|
|
+ queryShippingDetails({id:selectData.id,groupId:selectData.groupId}).then(res => {
|
|
|
if (res.success) {
|
|
|
// 放在前面,有小数位数设置
|
|
|
this.setHeadData(val[0], res.result);
|
|
@@ -530,6 +529,7 @@ export default {
|
|
|
var sort = 0;
|
|
|
for (var i=0; i<newObj.syPreAssembledPackingListItemList.length;i++){
|
|
|
var tableRow = newObj.syPreAssembledPackingListItemList[i];
|
|
|
+ tableRow = JSON.parse(JSON.stringify(tableRow))
|
|
|
var allSizeSum = this.getAllSizeSum(tableRow);
|
|
|
if (allSizeSum == 0){
|
|
|
this.$message.error('第'+(i+1)+'行所有尺码数量为0,无法保存');
|
|
@@ -543,10 +543,19 @@ export default {
|
|
|
this.$message.error('第'+(i+1)+'行起始箱号未填,无法保存');
|
|
|
return;
|
|
|
}
|
|
|
+ if(!Number.isInteger(Number(tableRow.startingBoxNumber))){
|
|
|
+ debugger
|
|
|
+ this.$message.error('第'+(i+1)+'行起始箱号不为整数,无法保存');
|
|
|
+ return;
|
|
|
+ }
|
|
|
if (tableRow.endCaseNumber == ""){
|
|
|
this.$message.error('第'+(i+1)+'行结束箱号未填,无法保存');
|
|
|
return;
|
|
|
}
|
|
|
+ if(!Number.isInteger(Number(tableRow.endCaseNumber))){
|
|
|
+ this.$message.error('第'+(i+1)+'行结束箱号不为整数,无法保存');
|
|
|
+ return;
|
|
|
+ }
|
|
|
if (tableRow.boxNumber == "" || tableRow.boxNumber == 0){
|
|
|
this.$message.error('第'+(i+1)+'行箱数,无法保存');
|
|
|
return;
|
|
@@ -555,14 +564,36 @@ export default {
|
|
|
this.$message.error('第'+(i+1)+'行净重/箱未填,无法保存');
|
|
|
return;
|
|
|
}
|
|
|
+ if(!Number.isInteger(Number(tableRow.netWeight))){
|
|
|
+ var position = tableRow.netWeight.toString().indexOf('.') + 1; //小数点的位置
|
|
|
+ var digit = tableRow.netWeight.toString().length - position; //小数的位数
|
|
|
+ if(digit > 2){
|
|
|
+ this.$message.error('第'+(i+1)+'行净重/箱超过两位小数,无法保存');
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
if (tableRow.piecesBox == null || tableRow.piecesBox == "" || tableRow.piecesBox == undefined){
|
|
|
this.$message.error('第'+(i+1)+'行件数/箱未填,无法保存');
|
|
|
return;
|
|
|
}
|
|
|
+ if(!Number.isInteger(Number(tableRow.piecesBox))){
|
|
|
+ this.$message.error('第'+(i+1)+'行件数/箱不为整数,无法保存');
|
|
|
+ return;
|
|
|
+ }
|
|
|
if (tableRow.grossWeight == null || tableRow.grossWeight == "" || tableRow.grossWeight == undefined){
|
|
|
this.$message.error('第'+(i+1)+'行毛重/箱未填,无法保存');
|
|
|
return;
|
|
|
}
|
|
|
+ if(!Number.isInteger(Number(tableRow.grossWeight))){
|
|
|
+ debugger
|
|
|
+ var position = tableRow.grossWeight.toString().indexOf('.') + 1; //小数点的位置
|
|
|
+ var digit = tableRow.grossWeight.toString().length - position; //小数的位数
|
|
|
+ debugger
|
|
|
+ if(digit > 2){
|
|
|
+ this.$message.error('第'+(i+1)+'行毛重/箱超过两位小数,无法保存');
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
if (tableRow.outerBoxLength == null || tableRow.outerBoxLength == "" || tableRow.outerBoxLength == undefined){
|
|
|
this.$message.error('第'+(i+1)+'行外箱长度未填,无法保存');
|
|
|
return;
|
|
@@ -575,10 +606,31 @@ export default {
|
|
|
this.$message.error('第'+(i+1)+'行外箱高度未填,无法保存');
|
|
|
return;
|
|
|
}
|
|
|
+ if(!Number.isInteger(Number(tableRow.totalVolume))){
|
|
|
+ debugger
|
|
|
+ var position = tableRow.totalVolume.toString().indexOf('.') + 1; //小数点的位置
|
|
|
+ var digit = tableRow.totalVolume.toString().length - position; //小数的位数
|
|
|
+ if(digit > 3){
|
|
|
+ this.$message.error('第'+(i+1)+'行总体积超过三位小数,无法保存');
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
if (tableRow.netWeightToo == null || tableRow.netWeightToo == "" || tableRow.netWeightToo == undefined){
|
|
|
this.$message.error('第'+(i+1)+'行净净重未填,无法保存');
|
|
|
return;
|
|
|
}
|
|
|
+ if(!Number.isInteger(Number(tableRow.netWeightToo))){
|
|
|
+ debugger
|
|
|
+ var position = tableRow.netWeightToo.toString().indexOf('.') + 1; //小数点的位置
|
|
|
+ var digit = tableRow.netWeightToo.toString().length - position; //小数的位数
|
|
|
+ if(digit > 2){
|
|
|
+ this.$message.error('第'+(i+1)+'行净净重超过两位小数,无法保存');
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(parseInt(tableRow.startingBoxNumber) !== tableRow.startingBoxNumber){
|
|
|
+ debugger
|
|
|
+ }
|
|
|
for (var j=0; j<tableRow.sizeTables.length; j++){
|
|
|
var sizeTable = tableRow.sizeTables[j];
|
|
|
var field = 'size-'+sizeTable.size;
|
|
@@ -741,7 +793,7 @@ export default {
|
|
|
event.row.boxNumber = event.row.endCaseNumber*1-event.row.startingBoxNumber*1+1;
|
|
|
}
|
|
|
var allSizeSum = this.getAllSizeSum(event.row);
|
|
|
- event.row.piecesBox = allSizeSum.toFixed(this.dotConfig.quantity);
|
|
|
+ event.row.piecesBox = allSizeSum;
|
|
|
event.row.total = (event.row.piecesBox*event.row.boxNumber).toFixed(this.dotConfig.quantity);
|
|
|
if (event.row.unitPrice != undefined && event.row.unitPrice != ""){
|
|
|
event.row.totalPrice = (event.row.unitPrice*event.row.total).toFixed(this.dotConfig.money);
|