yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
main
17602169347 1 year ago
parent 01fc040bdd ef9ea3f9c9
commit 96e4b0b789
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File

2
SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue
Unescape View File

@ -137,7 +137,7 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="是否垫资" prop="advance"> <el-form-item label="是否垫资" prop="advance">
<el-select disabled v-model="advance" placeholder="请选择" clearable :style='{"width":"100%"}' @change="advanceChange"> <el-select disabled 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" <el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option> :disabled="item.disabled"></el-option>
</el-select> </el-select>

5
SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
Unescape View File

@ -83,7 +83,7 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="是否垫资" prop="advance"> <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"> @change="advanceChange">
<el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName" <el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option> :value="item.id" :disabled="item.disabled"></el-option>
@ -235,7 +235,7 @@
sizeUnit: 'MB', sizeUnit: 'MB',
fileSize: 5, fileSize: 5,
unit: "0", unit: "0",
advance: "", // advance: "",
transportType: "0", transportType: "0",
action: this.define.APIURl + '/api/tradeupload/Tradeupload/UploaderPondList/annexpic', action: this.define.APIURl + '/api/tradeupload/Tradeupload/UploaderPondList/annexpic',
imageUrl: '', imageUrl: '',
@ -604,7 +604,6 @@
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;
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: '毛重必须等于皮重+扣重+净重',

7
SC-web/src/views/scm/basicInformation/tradeupload/Form3.vue
Unescape View File

@ -137,13 +137,14 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="是否垫资" prop="advance"> <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"> @change="advanceChange">
<el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName" <el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option> :value="item.id" :disabled="item.disabled"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="运费" prop="transportPrice"> <el-form-item label="运费" prop="transportPrice">
@ -253,7 +254,7 @@
fileSize: 5, fileSize: 5,
unit: "0", unit: "0",
transportType: "0", transportType: "0",
advance: '', // 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',
@ -642,7 +643,6 @@
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;
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: '毛重必须等于皮重+扣重+净重',
@ -727,7 +727,6 @@
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;
if(grossWeight < tareWeight + buckleWeight + netWeight){ if(grossWeight < tareWeight + buckleWeight + netWeight){
this.$message({ this.$message({
message: '毛重不得小于皮重+扣重+净重', message: '毛重不得小于皮重+扣重+净重',

Write Preview
Loading…
Cancel
Save