From ef9ea3f9c9294f5ada8e8d2c4e221c29e6e2a1f8 Mon Sep 17 00:00:00 2001
From: tengxi <971623072@qq.com>
Date: Fri, 25 Aug 2023 14:26:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9E=AB=E8=B5=84=E5=8E=BB=E6=8E=89=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/scm/basicInformation/poundlist/VechicleForm.vue  | 2 +-
 SC-web/src/views/scm/basicInformation/tradeupload/Form.vue | 5 ++---
 .../src/views/scm/basicInformation/tradeupload/Form3.vue   | 7 +++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue
index 05be7d02..d72bb224 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue
@@ -137,7 +137,7 @@
           </el-col>
           <el-col :span="6">
             <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"
                            :disabled="item.disabled"></el-option>
               </el-select>
diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
index 2203e5db..d80cfa90 100644
--- a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
@@ -83,7 +83,7 @@
 					</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>
@@ -235,7 +235,7 @@
 				sizeUnit: 'MB',
 				fileSize: 5,
 				unit: "0",
-        advance: "",
+        // advance: "",
 				transportType: "0",
 				action: this.define.APIURl + '/api/tradeupload/Tradeupload/UploaderPondList/annexpic',
 				imageUrl: '',
@@ -604,7 +604,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: '毛重必须等于皮重+扣重+净重',
diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form3.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form3.vue
index cf1ffedd..5bd19cb9 100644
--- a/SC-web/src/views/scm/basicInformation/tradeupload/Form3.vue
+++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form3.vue
@@ -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: '毛重不得小于皮重+扣重+净重',