|
|
@ -253,7 +253,7 @@
|
|
|
|
fileSize: 5,
|
|
|
|
fileSize: 5,
|
|
|
|
unit: "0",
|
|
|
|
unit: "0",
|
|
|
|
transportType: "0",
|
|
|
|
transportType: "0",
|
|
|
|
advance: "0",
|
|
|
|
advance: '',
|
|
|
|
action: this.define.APIURl + '/api/tradeupload/Tradeupload/UploaderPondList/annexpic',
|
|
|
|
action: this.define.APIURl + '/api/tradeupload/Tradeupload/UploaderPondList/annexpic',
|
|
|
|
imageUrl: '',
|
|
|
|
imageUrl: '',
|
|
|
|
code: '100',
|
|
|
|
code: '100',
|
|
|
@ -275,6 +275,7 @@
|
|
|
|
vehiclePictures: [],
|
|
|
|
vehiclePictures: [],
|
|
|
|
poundDate: '',
|
|
|
|
poundDate: '',
|
|
|
|
poundlistNo: '',
|
|
|
|
poundlistNo: '',
|
|
|
|
|
|
|
|
advance: '',
|
|
|
|
tareWeight: 0,
|
|
|
|
tareWeight: 0,
|
|
|
|
grossWeight: 0,
|
|
|
|
grossWeight: 0,
|
|
|
|
buckleWeight: 0,
|
|
|
|
buckleWeight: 0,
|
|
|
@ -282,7 +283,6 @@
|
|
|
|
netWeight: 0,
|
|
|
|
netWeight: 0,
|
|
|
|
unit: "0",
|
|
|
|
unit: "0",
|
|
|
|
transportType: "0",
|
|
|
|
transportType: "0",
|
|
|
|
advance: "0",
|
|
|
|
|
|
|
|
transportPrice: 0,
|
|
|
|
transportPrice: 0,
|
|
|
|
originPlace: [],
|
|
|
|
originPlace: [],
|
|
|
|
salesPrice: 0,
|
|
|
|
salesPrice: 0,
|
|
|
@ -359,6 +359,11 @@
|
|
|
|
message: '请选择业务员',
|
|
|
|
message: '请选择业务员',
|
|
|
|
trigger: 'change'
|
|
|
|
trigger: 'change'
|
|
|
|
}, ],
|
|
|
|
}, ],
|
|
|
|
|
|
|
|
advance: [{
|
|
|
|
|
|
|
|
required: true,
|
|
|
|
|
|
|
|
message: '请选择是否垫资',
|
|
|
|
|
|
|
|
trigger: 'blur'
|
|
|
|
|
|
|
|
}, ],
|
|
|
|
},
|
|
|
|
},
|
|
|
|
materialIdcolumnOptions: [{
|
|
|
|
materialIdcolumnOptions: [{
|
|
|
|
"label": "物料编码",
|
|
|
|
"label": "物料编码",
|
|
|
@ -568,6 +573,7 @@
|
|
|
|
this.dataForm.vehicleId = res.data.vehicleId;
|
|
|
|
this.dataForm.vehicleId = res.data.vehicleId;
|
|
|
|
this.dataForm.poundDate = res.data.poundDate;
|
|
|
|
this.dataForm.poundDate = res.data.poundDate;
|
|
|
|
this.dataForm.poundlistNo = res.data.poundlistNo;
|
|
|
|
this.dataForm.poundlistNo = res.data.poundlistNo;
|
|
|
|
|
|
|
|
this.dataForm.advance = res.data.advance;
|
|
|
|
this.dataForm.tareWeight = res.data.tareWeight > 1000 ? (res.data.tareWeight / 1000).toFixed(6) : res.data
|
|
|
|
this.dataForm.tareWeight = res.data.tareWeight > 1000 ? (res.data.tareWeight / 1000).toFixed(6) : res.data
|
|
|
|
.tareWeight;
|
|
|
|
.tareWeight;
|
|
|
|
this.dataForm.grossWeight = res.data.grossWeight > 1000 ? (res.data.grossWeight / 1000).toFixed(6) : res
|
|
|
|
this.dataForm.grossWeight = res.data.grossWeight > 1000 ? (res.data.grossWeight / 1000).toFixed(6) : res
|
|
|
@ -636,7 +642,7 @@
|
|
|
|
var netWeight = this.dataForm.netWeight; //净重
|
|
|
|
var netWeight = this.dataForm.netWeight; //净重
|
|
|
|
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 != this.jnpf.floatAdd(tareWeight, this.jnpf.floatAdd(buckleWeight, netWeight))) {
|
|
|
|
if (grossWeight != this.jnpf.floatAdd(tareWeight, this.jnpf.floatAdd(buckleWeight, netWeight))) {
|
|
|
|
this.$message({
|
|
|
|
this.$message({
|
|
|
|
message: '毛重必须等于皮重+扣重+净重',
|
|
|
|
message: '毛重必须等于皮重+扣重+净重',
|
|
|
@ -721,7 +727,7 @@
|
|
|
|
var netWeight = this.dataForm.netWeight;//净重
|
|
|
|
var netWeight = this.dataForm.netWeight;//净重
|
|
|
|
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 < tareWeight + buckleWeight + netWeight){
|
|
|
|
this.$message({
|
|
|
|
this.$message({
|
|
|
|
message: '毛重不得小于皮重+扣重+净重',
|
|
|
|
message: '毛重不得小于皮重+扣重+净重',
|
|
|
@ -885,6 +891,7 @@
|
|
|
|
this.dataForm.buckleWeight = 0; //扣重
|
|
|
|
this.dataForm.buckleWeight = 0; //扣重
|
|
|
|
this.dataForm.netWeight = 0; //净重
|
|
|
|
this.dataForm.netWeight = 0; //净重
|
|
|
|
this.dataForm.poundlistNo = '';
|
|
|
|
this.dataForm.poundlistNo = '';
|
|
|
|
|
|
|
|
this.dataForm.advance = '';
|
|
|
|
this.$refs.poundUpload.handleRemove(0);
|
|
|
|
this.$refs.poundUpload.handleRemove(0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
@ -909,6 +916,7 @@
|
|
|
|
this.dataForm.buckleWeight = 0; //扣重
|
|
|
|
this.dataForm.buckleWeight = 0; //扣重
|
|
|
|
this.dataForm.netWeight = 0; //净重
|
|
|
|
this.dataForm.netWeight = 0; //净重
|
|
|
|
this.dataForm.poundlistNo = '';
|
|
|
|
this.dataForm.poundlistNo = '';
|
|
|
|
|
|
|
|
this.dataForm.advance = '';
|
|
|
|
this.$refs.poundUpload.handleRemove(0);
|
|
|
|
this.$refs.poundUpload.handleRemove(0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
@ -979,7 +987,8 @@
|
|
|
|
_dataAll.buckleWeight = 0; //扣重
|
|
|
|
_dataAll.buckleWeight = 0; //扣重
|
|
|
|
_dataAll.netWeight = 0; //净重
|
|
|
|
_dataAll.netWeight = 0; //净重
|
|
|
|
_dataAll.poundlistNo = '';
|
|
|
|
_dataAll.poundlistNo = '';
|
|
|
|
this.advance = dataAll.advance;
|
|
|
|
// this.advance = '';
|
|
|
|
|
|
|
|
_dataAll.advance= '';
|
|
|
|
this.unit = dataAll.unit;
|
|
|
|
this.unit = dataAll.unit;
|
|
|
|
this.transportType = dataAll.transportType;
|
|
|
|
this.transportType = dataAll.transportType;
|
|
|
|
//this.$refs.poundUpload.handleRemove(0);
|
|
|
|
//this.$refs.poundUpload.handleRemove(0);
|
|
|
@ -1029,6 +1038,7 @@
|
|
|
|
this.dataForm.vehicleId = res.data.vehicleId;
|
|
|
|
this.dataForm.vehicleId = res.data.vehicleId;
|
|
|
|
this.dataForm.poundDate = res.data.poundDate;
|
|
|
|
this.dataForm.poundDate = res.data.poundDate;
|
|
|
|
this.dataForm.poundlistNo = res.data.poundlistNo;
|
|
|
|
this.dataForm.poundlistNo = res.data.poundlistNo;
|
|
|
|
|
|
|
|
this.dataForm.advance = res.data.advance;
|
|
|
|
this.dataForm.tareWeight = res.data.tareWeight;
|
|
|
|
this.dataForm.tareWeight = res.data.tareWeight;
|
|
|
|
this.dataForm.grossWeight = res.data.grossWeight;
|
|
|
|
this.dataForm.grossWeight = res.data.grossWeight;
|
|
|
|
this.dataForm.buckleWeight = res.data.buckleWeight;
|
|
|
|
this.dataForm.buckleWeight = res.data.buckleWeight;
|
|
|
|