From b572a2fb5cb06cc8cc116b9397236ab292d6f235 Mon Sep 17 00:00:00 2001 From: bawei <95887577@qq.com> Date: Thu, 24 Aug 2023 19:40:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=B8=E6=98=93=E4=B8=8A=E4=BC=A0=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=9E=AB=E8=B5=84=E9=BB=98=E8=AE=A4=E5=80=BC=E5=8F=96?= =?UTF-8?q?=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scm/basicInformation/tradeupload/Form.vue | 13 ++++++++---- .../basicInformation/tradeupload/Form3.vue | 20 ++++++++++++++----- .../basicInformation/tradeupload/Form4.vue | 11 +++++++--- 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue index 9730c663..2203e5db 100644 --- a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue +++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue @@ -235,8 +235,8 @@ sizeUnit: 'MB', fileSize: 5, unit: "0", + advance: "", transportType: "0", - advance: "0", action: this.define.APIURl + '/api/tradeupload/Tradeupload/UploaderPondList/annexpic', imageUrl: '', code: '100', @@ -264,7 +264,7 @@ netWeight: 0, unit: "0", transportType: "0", - advance: "0", + advance: "", transportPrice: 0, originPlace: [], salesPrice: 0, @@ -341,6 +341,11 @@ message: '请选择业务员', trigger: 'change' }, ], + advance: [{ + required: true, + message: '请选择是否垫资', + trigger: 'change' + }, ], }, materialIdcolumnOptions: [{ "label": "物料编码", @@ -599,7 +604,7 @@ 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; + // this.dataForm.advance = this.dataForm.advance ? this.dataForm.advance : 0; if (grossWeight != this.jnpf.floatAdd(tareWeight, this.jnpf.floatAdd(buckleWeight, netWeight))) { this.$message({ message: '毛重必须等于皮重+扣重+净重', @@ -684,7 +689,7 @@ 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; + // this.dataForm.advance = this.dataForm.advance ? this.dataForm.advance : 0; if (grossWeight != this.jnpf.floatAdd(tareWeight, this.jnpf.floatAdd(buckleWeight, netWeight))) { this.$message({ message: '毛重必须等于皮重+扣重+净重', diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form3.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form3.vue index c6b2b47c..cf1ffedd 100644 --- a/SC-web/src/views/scm/basicInformation/tradeupload/Form3.vue +++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form3.vue @@ -253,7 +253,7 @@ fileSize: 5, unit: "0", transportType: "0", - advance: "0", + advance: '', action: this.define.APIURl + '/api/tradeupload/Tradeupload/UploaderPondList/annexpic', imageUrl: '', code: '100', @@ -275,6 +275,7 @@ vehiclePictures: [], poundDate: '', poundlistNo: '', + advance: '', tareWeight: 0, grossWeight: 0, buckleWeight: 0, @@ -282,7 +283,6 @@ netWeight: 0, unit: "0", transportType: "0", - advance: "0", transportPrice: 0, originPlace: [], salesPrice: 0, @@ -359,6 +359,11 @@ message: '请选择业务员', trigger: 'change' }, ], + advance: [{ + required: true, + message: '请选择是否垫资', + trigger: 'blur' + }, ], }, materialIdcolumnOptions: [{ "label": "物料编码", @@ -568,6 +573,7 @@ this.dataForm.vehicleId = res.data.vehicleId; this.dataForm.poundDate = res.data.poundDate; 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 .tareWeight; this.dataForm.grossWeight = res.data.grossWeight > 1000 ? (res.data.grossWeight / 1000).toFixed(6) : res @@ -636,7 +642,7 @@ 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; + // this.dataForm.advance = this.dataForm.advance ? this.dataForm.advance : 0; if (grossWeight != this.jnpf.floatAdd(tareWeight, this.jnpf.floatAdd(buckleWeight, netWeight))) { this.$message({ message: '毛重必须等于皮重+扣重+净重', @@ -721,7 +727,7 @@ 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; + // this.dataForm.advance = this.dataForm.advance ? this.dataForm.advance : 0; if(grossWeight < tareWeight + buckleWeight + netWeight){ this.$message({ message: '毛重不得小于皮重+扣重+净重', @@ -885,6 +891,7 @@ this.dataForm.buckleWeight = 0; //扣重 this.dataForm.netWeight = 0; //净重 this.dataForm.poundlistNo = ''; + this.dataForm.advance = ''; this.$refs.poundUpload.handleRemove(0); } }) @@ -909,6 +916,7 @@ this.dataForm.buckleWeight = 0; //扣重 this.dataForm.netWeight = 0; //净重 this.dataForm.poundlistNo = ''; + this.dataForm.advance = ''; this.$refs.poundUpload.handleRemove(0); } }) @@ -979,7 +987,8 @@ _dataAll.buckleWeight = 0; //扣重 _dataAll.netWeight = 0; //净重 _dataAll.poundlistNo = ''; - this.advance = dataAll.advance; + // this.advance = ''; + _dataAll.advance= ''; this.unit = dataAll.unit; this.transportType = dataAll.transportType; //this.$refs.poundUpload.handleRemove(0); @@ -1029,6 +1038,7 @@ this.dataForm.vehicleId = res.data.vehicleId; this.dataForm.poundDate = res.data.poundDate; this.dataForm.poundlistNo = res.data.poundlistNo; + this.dataForm.advance = res.data.advance; this.dataForm.tareWeight = res.data.tareWeight; this.dataForm.grossWeight = res.data.grossWeight; this.dataForm.buckleWeight = res.data.buckleWeight; diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form4.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form4.vue index 9cbaaa25..a8702083 100644 --- a/SC-web/src/views/scm/basicInformation/tradeupload/Form4.vue +++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form4.vue @@ -284,7 +284,7 @@ netWeight: 0, unit: "0", transportType: "0", - advance: "0", + advance: "", transportPrice: 0, originPlace: [], salesPrice: 0, @@ -361,6 +361,11 @@ message: '请选择业务员', trigger: 'change' }, ], + advance: [{ + required: true, + message: '请选择是否垫资', + trigger: 'change' + }, ], }, materialIdcolumnOptions: [{ "label": "物料编码", @@ -623,7 +628,7 @@ 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; + // this.dataForm.advance = this.dataForm.advance ? this.dataForm.advance : 0; if (grossWeight != this.jnpf.floatAdd(tareWeight, this.jnpf.floatAdd(buckleWeight, netWeight))) { this.$message({ message: '毛重必须等于皮重+扣重+净重', @@ -698,7 +703,7 @@ 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; + // this.dataForm.advance = this.dataForm.advance ? this.dataForm.advance : 0; if (grossWeight != this.jnpf.floatAdd(tareWeight, this.jnpf.floatAdd(buckleWeight, netWeight))) { this.$message({ message: '毛重必须等于皮重+扣重+净重',