|
|
|
@ -18,8 +18,6 @@
|
|
|
|
|
</JNPF-UploadImg>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="24">
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="物料名称" prop="materialId">
|
|
|
|
|
<popupSelect v-model="dataForm.materialId" placeholder="请选择物料编码" clearable field="materialId"
|
|
|
|
@ -72,12 +70,12 @@
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="皮重" prop="tareWeight">
|
|
|
|
|
<el-input-number v-model="dataForm.tareWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
|
|
|
|
|
<el-input-number v-model="dataForm.tareWeight" :style='{"width":"100%"}' @change="grossWeightChange" :precision="6"></el-input-number>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="扣重" prop="buckleWeight">
|
|
|
|
|
<el-input-number v-model="dataForm.buckleWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
|
|
|
|
|
<el-input-number v-model="dataForm.buckleWeight" :style='{"width":"100%"}' @change="grossWeightChange" :precision="6"></el-input-number>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
@ -95,7 +93,7 @@
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="磅单号" prop="poundlistNo">
|
|
|
|
|
<el-input v-model="dataForm.poundlistNo" placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
|
|
|
|
|
<el-input v-model="dataForm.poundlistNo" placeholder="请输入" clearable :style='{"width":"100%"}'>
|
|
|
|
|
|
|
|
|
|
</el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
@ -434,22 +432,21 @@
|
|
|
|
|
this.dataForm.vehicleId = res.data.vehicleId;
|
|
|
|
|
this.dataForm.poundDate = res.data.poundDate;
|
|
|
|
|
this.dataForm.poundlistNo = res.data.poundlistNo;
|
|
|
|
|
this.dataForm.tareWeight = res.data.tareWeight;
|
|
|
|
|
this.dataForm.grossWeight = res.data.grossWeight;
|
|
|
|
|
this.dataForm.buckleWeight = res.data.buckleWeight;
|
|
|
|
|
this.dataForm.netWeight = res.data.netWeight;
|
|
|
|
|
if(res.data.grossWeight>=1000){
|
|
|
|
|
this.dataForm.unit = '1';
|
|
|
|
|
this.unit = '1';
|
|
|
|
|
this.dataForm.tareWeight = res.data.tareWeight > 1000 ? (res.data.tareWeight/1000).toFixed(6) : res.data.tareWeight;
|
|
|
|
|
this.dataForm.grossWeight = res.data.grossWeight > 1000 ? (res.data.grossWeight/1000).toFixed(6) : res.data.grossWeight;
|
|
|
|
|
this.dataForm.buckleWeight = res.data.buckleWeight > 1000 ? (res.data.buckleWeight/1000).toFixed(6) : res.data.buckleWeight;
|
|
|
|
|
if(this.dataForm.netWeight && this.dataForm.netWeight > 0){
|
|
|
|
|
this.dataForm.netWeight = res.data.netWeight > 1000 ? (res.data.netWeight/1000).toFixed(6) : res.data.netWeight;
|
|
|
|
|
}else{
|
|
|
|
|
this.dataForm.netWeight = res.data.grossWeight - res.data.tareWeight - res.data.buckleWeight;
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
grossWeightChange(){
|
|
|
|
|
var grossWeight = this.dataForm.grossWeight;
|
|
|
|
|
if(grossWeight>=1000){
|
|
|
|
|
this.dataForm.unit = '1';
|
|
|
|
|
this.unit = '1';
|
|
|
|
|
if(res.data.vehiclePictures && res.data.vehiclePictures.length > 0){
|
|
|
|
|
this.dataForm.vehiclePictures = JSON.parse(res.data.vehiclePictures);
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
grossWeightChange(e, f){
|
|
|
|
|
this.dataForm.netWeight = this.dataForm.grossWeight - this.dataForm.tareWeight - this.dataForm.buckleWeight;
|
|
|
|
|
},
|
|
|
|
|
unitChange(e){
|
|
|
|
|
this.dataForm.unit = e;
|
|
|
|
|
},
|
|
|
|
|