|
|
|
@ -137,13 +137,14 @@
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="是否垫资" prop="advance">
|
|
|
|
|
<el-select v-model="advance" placeholder="请选择" clearable :style='{"width":"100%"}'
|
|
|
|
|
<el-select v-model="dataForm.advance" placeholder="请选择" clearable :style='{"width":"100%"}'
|
|
|
|
|
@change="advanceChange">
|
|
|
|
|
<el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName"
|
|
|
|
|
:value="item.id" :disabled="item.disabled"></el-option>
|
|
|
|
|
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="运费" prop="transportPrice">
|
|
|
|
@ -253,7 +254,7 @@
|
|
|
|
|
fileSize: 5,
|
|
|
|
|
unit: "0",
|
|
|
|
|
transportType: "0",
|
|
|
|
|
advance: '',
|
|
|
|
|
// advance: "",
|
|
|
|
|
action: this.define.APIURl + '/api/tradeupload/Tradeupload/UploaderPondList/annexpic',
|
|
|
|
|
imageUrl: '',
|
|
|
|
|
code: '100',
|
|
|
|
@ -642,7 +643,6 @@
|
|
|
|
|
var netWeight = this.dataForm.netWeight; //净重
|
|
|
|
|
this.dataForm.unit = this.dataForm.unit ? this.dataForm.unit : 0;
|
|
|
|
|
this.dataForm.transportType = this.dataForm.transportType ? this.dataForm.transportType : 0;
|
|
|
|
|
// this.dataForm.advance = this.dataForm.advance ? this.dataForm.advance : 0;
|
|
|
|
|
if (grossWeight != this.jnpf.floatAdd(tareWeight, this.jnpf.floatAdd(buckleWeight, netWeight))) {
|
|
|
|
|
this.$message({
|
|
|
|
|
message: '毛重必须等于皮重+扣重+净重',
|
|
|
|
@ -727,7 +727,6 @@
|
|
|
|
|
var netWeight = this.dataForm.netWeight;//净重
|
|
|
|
|
this.dataForm.unit = this.dataForm.unit ? this.dataForm.unit : 0;
|
|
|
|
|
this.dataForm.transportType = this.dataForm.transportType ? this.dataForm.transportType : 0;
|
|
|
|
|
// this.dataForm.advance = this.dataForm.advance ? this.dataForm.advance : 0;
|
|
|
|
|
if(grossWeight < tareWeight + buckleWeight + netWeight){
|
|
|
|
|
this.$message({
|
|
|
|
|
message: '毛重不得小于皮重+扣重+净重',
|
|
|
|
|