Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pageD/warehousings/ex_warehouse.vue

@@ -219,6 +219,7 @@
 					pcFlag: 0,
 					contractNo: {},
 					carNo: {},
+					warehouseName:{},
 				},
 				WarehouseInOutInfo1: {
 					contractNo: {},
@@ -247,6 +248,7 @@
 				},
 				show: false,
 				license1: "",
+				ids:"",
 
 			}
 		},
@@ -289,6 +291,8 @@
 			}
 		},
 		onShow() {
+			this.getList(this.WarehouseInOutInfo.id)
+			console.log( this.WarehouseInOutInfo)
 			this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {
 				compId: '2710b21efc1e4393930c5dc800010dc4',
 				warehouseType: 1,
@@ -298,6 +302,8 @@
 					for (var i = 0; i < res.data.data.length; i++) {
 						if (res.data.data[i].warehouseName == this.WarehouseInOutInfo.warehouseName) {
 							this.warehouseIndex = i
+							console.log(res.data.data,"dsd")
+							this.ids = res.data.data[i].id
 						}
 						arr.push(res.data.data[i].warehouseName)
 					}
@@ -306,10 +312,17 @@
 				}
 
 			})
-			this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
-				compId: '2710b21efc1e4393930c5dc800010dc4',
-				warehouseType: 1,
-			}).then(res => {})
+			// this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
+			// 	id: this.ids,
+			// }).then(res => {
+			// 	var arr = []
+			// 	for (var i = 0; i < res.data.data.warehousePositionInfoList.length; i++) {
+			// 		console.log(res.data.data.warehousePositionInfoList[i])
+			// 		arr.push(res.data.data.warehousePositionInfoList[i].binNumber)
+			// 	}
+			// 	this.warehouse1 = arr
+			// 	this.warehouselist11 = res.data.data
+			// })
 		},
 		onLoad(option) {
 			this.WarehouseInOutInfo.contractNo = option.contractNo
@@ -320,6 +333,7 @@
 			this.WarehouseInOutInfo.titleNo = option.titleNo
 			this.WarehouseInOutInfo.id = option.id
 			this.WarehouseInOutInfo.carNo = option.carNo
+			this.WarehouseInOutInfo.warehouseName = option.warehouseName
 			// var date = new Date()
 			// var year = date.getFullYear()
 			// var month = date.getMonth()