|
|
@ -454,7 +454,8 @@
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
grossWeightChange(e, f){
|
|
|
|
grossWeightChange(e, f){
|
|
|
|
this.dataForm.netWeight = this.dataForm.grossWeight - this.dataForm.tareWeight - this.dataForm.buckleWeight;
|
|
|
|
//this.dataForm.netWeight = this.dataForm.grossWeight - this.dataForm.tareWeight - this.dataForm.buckleWeight;
|
|
|
|
|
|
|
|
this.dataForm.netWeight = this.jnpf.floatSub(this.jnpf.floatSub(parseFloat(this.dataForm.grossWeight), parseFloat(this.dataForm.tareWeight)), parseFloat(this.dataForm.buckleWeight))
|
|
|
|
},
|
|
|
|
},
|
|
|
|
unitChange(e){
|
|
|
|
unitChange(e){
|
|
|
|
this.dataForm.unit = e;
|
|
|
|
this.dataForm.unit = e;
|
|
|
@ -489,25 +490,9 @@
|
|
|
|
var grossWeight = this.dataForm.grossWeight;//毛重
|
|
|
|
var grossWeight = this.dataForm.grossWeight;//毛重
|
|
|
|
var buckleWeight = this.dataForm.buckleWeight;//扣重
|
|
|
|
var buckleWeight = this.dataForm.buckleWeight;//扣重
|
|
|
|
var netWeight = this.dataForm.netWeight;//净重
|
|
|
|
var netWeight = this.dataForm.netWeight;//净重
|
|
|
|
if(grossWeight < tareWeight + buckleWeight + netWeight){
|
|
|
|
if(grossWeight != this.jnpf.floatAdd(tareWeight, this.jnpf.floatAdd(buckleWeight, netWeight))){
|
|
|
|
this.$message({
|
|
|
|
this.$message({
|
|
|
|
message: '毛重不得小于皮重+扣重+净重',
|
|
|
|
message: '毛重必须等于皮重+扣重+净重',
|
|
|
|
type: 'warning',
|
|
|
|
|
|
|
|
duration: 1000
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if(buckleWeight >= netWeight){
|
|
|
|
|
|
|
|
this.$message({
|
|
|
|
|
|
|
|
message: '扣重不得大于净重',
|
|
|
|
|
|
|
|
type: 'warning',
|
|
|
|
|
|
|
|
duration: 1000
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if(buckleWeight >= grossWeight){
|
|
|
|
|
|
|
|
this.$message({
|
|
|
|
|
|
|
|
message: '扣重不得大于毛重',
|
|
|
|
|
|
|
|
type: 'warning',
|
|
|
|
type: 'warning',
|
|
|
|
duration: 1000
|
|
|
|
duration: 1000
|
|
|
|
})
|
|
|
|
})
|
|
|
@ -580,33 +565,9 @@
|
|
|
|
this.dataForm.unit = this.dataForm.unit ? this.dataForm.unit : 0;
|
|
|
|
this.dataForm.unit = this.dataForm.unit ? this.dataForm.unit : 0;
|
|
|
|
this.dataForm.transportType = this.dataForm.transportType ? this.dataForm.transportType : 0;
|
|
|
|
this.dataForm.transportType = this.dataForm.transportType ? this.dataForm.transportType : 0;
|
|
|
|
this.dataForm.advance = this.dataForm.advance ? this.dataForm.advance : 0;
|
|
|
|
this.dataForm.advance = this.dataForm.advance ? this.dataForm.advance : 0;
|
|
|
|
if(grossWeight < tareWeight + buckleWeight + netWeight){
|
|
|
|
if(grossWeight != this.jnpf.floatAdd(tareWeight, this.jnpf.floatAdd(buckleWeight, netWeight))){
|
|
|
|
this.$message({
|
|
|
|
|
|
|
|
message: '毛重不得小于皮重+扣重+净重',
|
|
|
|
|
|
|
|
type: 'error',
|
|
|
|
|
|
|
|
duration: 1000
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if(buckleWeight >= netWeight){
|
|
|
|
|
|
|
|
this.$message({
|
|
|
|
|
|
|
|
message: '扣重不得大于净重',
|
|
|
|
|
|
|
|
type: 'error',
|
|
|
|
|
|
|
|
duration: 1000
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if(buckleWeight >= grossWeight){
|
|
|
|
|
|
|
|
this.$message({
|
|
|
|
|
|
|
|
message: '扣重不得大于毛重',
|
|
|
|
|
|
|
|
type: 'error',
|
|
|
|
|
|
|
|
duration: 1000
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if(netWeight <= 0){
|
|
|
|
|
|
|
|
this.$message({
|
|
|
|
this.$message({
|
|
|
|
message: '净重必须大于0',
|
|
|
|
message: '毛重必须等于皮重+扣重+净重',
|
|
|
|
type: 'error',
|
|
|
|
type: 'error',
|
|
|
|
duration: 1000
|
|
|
|
duration: 1000
|
|
|
|
})
|
|
|
|
})
|
|
|
|