111

src/components/PopupDistribution.vue

@@ -121,7 +121,7 @@
 					driverPhone: '',
 					sumWeight: '',
 					sumCount: '',
-					suttle: '',
+					suttle: 0,
 					deliveryCompany:'',
 					listDetail: []
 				},
@@ -209,7 +209,7 @@
 					driverPhone: '',
 					sumWeight: this.sumWeight,
 					sumCount: this.sumCount,
-					suttle: '',
+					suttle: 0,
 					listDetail: []
 				}
 				this.tableData = []
@@ -287,7 +287,7 @@
 					driverPhone: '',
 					sumWeight: 0,
 					sumCount: 0,
-					suttle: '',
+					suttle: 0,
 					listDetail: []
 				}
 				this.tableData = []

src/components/PopupOut.vue

@@ -212,7 +212,7 @@
 					driverPhone: '',
 					sumWeight: this.sumWeight,
 					sumCount: this.sumCount,
-					suttle: '',
+					suttle: 0,
 					listDetail: []
 				}
 				this.tableData = []
@@ -261,7 +261,7 @@
 					driverPhone: '',
 					sumWeight: 0,
 					sumCount: 0,
-					suttle: '',
+					suttle: 0,
 					listDetail: []
 				}
 				this.tableData = []

src/view/ware/storechange.vue

@@ -148,12 +148,18 @@
 		<popup-in ref="PopupIn" @receviceFromChild="receviceFromIn" :wares="options" :wareId="query.wareId" :stack="moveFromStack"></popup-in>
 		<el-dialog title="货权转移" :visible.sync="customerDialogVisible" width="500px">
 			<el-form>
-				<el-form-item label="旧货主">
+				<!-- <el-form-item label="旧货主">
 					<el-input v-model="oldCustomer">
 					</el-input>
+				</el-form-item> -->
+				<el-form-item label="新客户">
+					<el-select v-model="newCustomer.name" filterable placeholder="请选择客户名称" clearable>
+						<el-option v-for="item in optionsCust" :key="item.id" :label="item.name" :value="item.id" >
+						</el-option>
+					</el-select>
 				</el-form-item>
 				<el-form-item label="新货主">
-					<el-select v-model="newCustomer.name" filterable placeholder="请选择订单客户" clearable>
+					<el-select v-model="newfkCustomer.name" filterable placeholder="请选择货权单位" clearable>
 						<el-option v-for="item in optionsCust" :key="item.id" :label="item.name" :value="item.id" >
 						</el-option>
 					</el-select>
@@ -338,6 +344,10 @@
 					id: '',
 					name: ''
 				},
+				newfkCustomer: {
+					id: '',
+					name: ''
+				},
 				newAddress: '',
 
 				currentPage: 1,
@@ -640,6 +650,8 @@
 					//this.newAddress = this.multipleSelection[0].receiveAddress
 					this.newCustomer.name = "",
 					this.newCustomer.id = "",
+					this.newfkCustomer.name="",
+					this.newfkCustomer.id = "",
 					this.customerDialogVisible = true
 					
 				} else {
@@ -652,11 +664,13 @@
 
 			handleCustomerSave() {
 				this.newCustomer.id = this.newCustomer.name;
+				this.newfkCustomer.id = this.newfkCustomer.name;
 				var url = 'WareChange/changeCustomer.do'
 				var param = {
 
 					json: JSON.stringify(this.multipleSelection),
 					customer: JSON.stringify(this.newCustomer),
+					fkcustomer: JSON.stringify(this.newfkCustomer),
 					address: this.newAddress
 				}
 				axios.post(url, param).then(response => {