|
|
@ -1273,7 +1273,6 @@ export default {
|
|
|
|
businessType: '5',
|
|
|
|
businessType: '5',
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.dataForm.deliveryVoucherRelationList.push(item)
|
|
|
|
this.dataForm.deliveryVoucherRelationList.push(item)
|
|
|
|
debugger
|
|
|
|
|
|
|
|
let productEntity = {}
|
|
|
|
let productEntity = {}
|
|
|
|
e.warehousingOutboundProductEntityList.forEach(item => {
|
|
|
|
e.warehousingOutboundProductEntityList.forEach(item => {
|
|
|
|
debugger
|
|
|
|
debugger
|
|
|
@ -1299,6 +1298,7 @@ export default {
|
|
|
|
product.grossWeight = this.jnpf.floatAdd(product.grossWeight, productEntity.grossWeight)
|
|
|
|
product.grossWeight = this.jnpf.floatAdd(product.grossWeight, productEntity.grossWeight)
|
|
|
|
product.tareWeight = this.jnpf.floatAdd(product.tareWeight, productEntity.tareWeight)
|
|
|
|
product.tareWeight = this.jnpf.floatAdd(product.tareWeight, productEntity.tareWeight)
|
|
|
|
product.buckleWeight = this.jnpf.floatAdd(product.buckleWeight, productEntity.buckleWeight)
|
|
|
|
product.buckleWeight = this.jnpf.floatAdd(product.buckleWeight, productEntity.buckleWeight)
|
|
|
|
|
|
|
|
product.deliveryNum = this.jnpf.floatAdd(product.deliveryNum, productEntity.deliveryNum)
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
this.dataForm.deliveryProductRelationList.push(productEntity)
|
|
|
|
this.dataForm.deliveryProductRelationList.push(productEntity)
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -1489,22 +1489,22 @@ export default {
|
|
|
|
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
|
|
|
|
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
|
|
|
|
type: 'warning'
|
|
|
|
type: 'warning'
|
|
|
|
}).then(() => {
|
|
|
|
}).then(() => {
|
|
|
|
const delObj = scope.row.list[0]
|
|
|
|
const delObj = scope.row
|
|
|
|
var productId = delObj.id
|
|
|
|
var storageProductId = delObj.storageProductId
|
|
|
|
var unit = delObj.unit
|
|
|
|
|
|
|
|
var productNetWeight = delObj.netWeight
|
|
|
|
var productNetWeight = delObj.netWeight
|
|
|
|
var productGrossWeight = delObj.grossWeight
|
|
|
|
var productGrossWeight = delObj.grossWeight
|
|
|
|
var productTareWeight = delObj.tareWeight
|
|
|
|
var productTareWeight = delObj.tareWeight
|
|
|
|
var productBuckleWeight = delObj.buckleWeight
|
|
|
|
var productBuckleWeight = delObj.buckleWeight
|
|
|
|
const target = this.dataForm.deliveryProductRelationList.find(e => e.id == productId && e.deliveryUnit == unit)
|
|
|
|
const target = this.dataForm.deliveryProductRelationList.find(e => e.id == storageProductId)
|
|
|
|
if (target.netWeight == productNetWeight) {
|
|
|
|
if (target.netWeight == productNetWeight) {
|
|
|
|
const idx = this.dataForm.deliveryProductRelationList.findIndex(e => e.id == productId && e.deliveryUnit == unit)
|
|
|
|
const idx = this.dataForm.deliveryProductRelationList.findIndex(e => e.id == storageProductId)
|
|
|
|
this.dataForm.deliveryProductRelationList.splice(idx, 1)
|
|
|
|
this.dataForm.deliveryProductRelationList.splice(idx, 1)
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
target.netWeight = this.jnpf.floatSub(target.netWeight, productNetWeight)
|
|
|
|
target.netWeight = this.jnpf.floatSub(target.netWeight, productNetWeight)
|
|
|
|
target.grossWeight = this.jnpf.floatSub(target.grossWeight, productGrossWeight)
|
|
|
|
target.grossWeight = this.jnpf.floatSub(target.grossWeight, productGrossWeight)
|
|
|
|
target.tareWeight = this.jnpf.floatSub(target.tareWeight, productTareWeight)
|
|
|
|
target.tareWeight = this.jnpf.floatSub(target.tareWeight, productTareWeight)
|
|
|
|
target.buckleWeight = this.jnpf.floatSub(target.buckleWeight, productBuckleWeight)
|
|
|
|
target.buckleWeight = this.jnpf.floatSub(target.buckleWeight, productBuckleWeight)
|
|
|
|
|
|
|
|
target.deliveryNum = this.jnpf.floatSub(target.deliveryNum, productNetWeight)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.dataForm.deliveryVoucherRelationList.splice(scope.$index, 1);
|
|
|
|
this.dataForm.deliveryVoucherRelationList.splice(scope.$index, 1);
|
|
|
|
}).catch(() => {
|
|
|
|
}).catch(() => {
|
|
|
|