|
|
@ -2734,21 +2734,18 @@ export default { |
|
|
|
// ParcelLisList |
|
|
|
// ParcelLisList |
|
|
|
const submitFormData = this.form; |
|
|
|
const submitFormData = this.form; |
|
|
|
// 当有零担数据时 |
|
|
|
// 当有零担数据时 |
|
|
|
|
|
|
|
console.log(zeroOrderList,'zeroOrderList'); |
|
|
|
if (zeroOrderList.length !== 0) { |
|
|
|
if (zeroOrderList.length !== 0) { |
|
|
|
// console.log(zeroOrderList,'zeroOrderList'); |
|
|
|
console.log(zeroOrderList,'zeroOrderList222'); |
|
|
|
// console.log(1); |
|
|
|
// console.log(1); |
|
|
|
// submitFormData.parcelLisList = []; |
|
|
|
submitFormData.parcelLisList = []; |
|
|
|
submitFormData.zeroType = '2'; |
|
|
|
submitFormData.zeroType = '2'; |
|
|
|
// zeroOrderList.forEach(val => { |
|
|
|
zeroOrderList.forEach(valE => { |
|
|
|
// console.log(val,'val'); |
|
|
|
console.log(valE,'valE==>'); |
|
|
|
// submitFormData.parcelLisList = [ |
|
|
|
if(valE.ParcelLisList.length){ |
|
|
|
// ...submitFormData.parcelLisList, |
|
|
|
submitFormData.parcelLisList = [...submitFormData.parcelLisList, ...valE.ParcelLisList]; |
|
|
|
// ...val.ParcelLisList, |
|
|
|
} |
|
|
|
// ]; |
|
|
|
}); |
|
|
|
// // val.ParcelLisList.forEach(item => { |
|
|
|
|
|
|
|
// // submitFormData.parcelLisList.push(item); |
|
|
|
|
|
|
|
// // }); |
|
|
|
|
|
|
|
// }); |
|
|
|
|
|
|
|
// submitFormData.parcelLisList.forEach(val => (val.quantity = val.tiQuantity)); |
|
|
|
// submitFormData.parcelLisList.forEach(val => (val.quantity = val.tiQuantity)); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
submitFormData.zeroType = '1'; |
|
|
|
submitFormData.zeroType = '1'; |
|
|
@ -2762,7 +2759,10 @@ export default { |
|
|
|
_billPackageEntityList = [..._billPackageEntityList, ...val.billPackageEntityList]; |
|
|
|
_billPackageEntityList = [..._billPackageEntityList, ...val.billPackageEntityList]; |
|
|
|
}); |
|
|
|
}); |
|
|
|
submitFormData.billPackageEntityList = _billPackageEntityList; |
|
|
|
submitFormData.billPackageEntityList = _billPackageEntityList; |
|
|
|
|
|
|
|
// SM24010411 |
|
|
|
|
|
|
|
console.log(submitFormData,'submitFormData'); |
|
|
|
this.Selfpickuploading = true; //开启加载效果 |
|
|
|
this.Selfpickuploading = true; //开启加载效果 |
|
|
|
|
|
|
|
|
|
|
|
add(submitFormData) |
|
|
|
add(submitFormData) |
|
|
|
.then(res => { |
|
|
|
.then(res => { |
|
|
|
this.Selfpickuploading = false; //开启加载效果 |
|
|
|
this.Selfpickuploading = false; //开启加载效果 |
|
|
@ -2782,7 +2782,6 @@ export default { |
|
|
|
this.Selfpickuploading = false; //开启加载效果 |
|
|
|
this.Selfpickuploading = false; //开启加载效果 |
|
|
|
}); |
|
|
|
}); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
|
|
|
|
|
|
|
|
console.log('111 :>> ', 111); |
|
|
|
console.log('111 :>> ', 111); |
|
|
|
// return |
|
|
|
// return |
|
|
|
let fei = new Map(); |
|
|
|
let fei = new Map(); |
|
|
|