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

pageD/warehousings/ex_warehouse.vue

@@ -430,11 +430,11 @@
 				this.warehouseIndex1 = e.detail.value
 				this.WarehouseInOutInfo.binNumberKey = this.warehouseIndex1
 				this.WarehouseInOutInfo.binNumber = this.warehouse1[this.warehouseIndex1]
-				// for (var i = 0; i < this.binNumber.length; i++) {
-				// 	if(this.binNumber[i].binNumber==this.warehouse1[this.warehouseIndex1]){
-				// 		this.WarehouseInOutInfo.baseId=this.binNumber[i].baseId
-				// 	}
-				// }
+				for (var i = 0; i < this.binNumber.length; i++) {
+					if(this.binNumber[i].binNumber==this.warehouse1[this.warehouseIndex1]){
+						this.WarehouseInOutInfo.baseId=this.binNumber[i].baseId
+					}
+				}
 			},
 
 			DateChange(e) {
@@ -722,7 +722,7 @@
 				this.WarehouseInOutInfo.warehouseInOutDetail = this.list
 				this.WarehouseInOutInfo.statusFlag = 3
 				this.WarehouseInOutInfo.pcFlag = 0
-				// this.WarehouseInOutInfo.warehouseType=0
+				// this.WarehouseInOutInfo.baseId=0
 				this.WarehouseInOutInfo.taskType = "出库任务"
 				uni.showLoading({
 					title: "正在提交"

pageD/warehousings/warehousings.vue

@@ -340,7 +340,13 @@ import upload from '@/components/upload.vue';
 			warehouseChange1(e){
 				var id=''
 				this.warehouseIndex1=e.detail.value
-				this.WarehouseInOutInfo.binNumber=this.warehouse1[this.warehouseIndex1]
+				this.WarehouseInOutInfo.binNumberKey = this.warehouseIndex1
+				this.WarehouseInOutInfo.binNumber = this.warehouse1[this.warehouseIndex1]
+				for (var i = 0; i < this.binNumber.length; i++) {
+					if(this.binNumber[i].binNumber==this.warehouse1[this.warehouseIndex1]){
+						this.WarehouseInOutInfo.baseId=this.binNumber[i].baseId
+					}
+				}
 			},
 			DateChange(e) {
 				this.WarehouseInOutInfo.inOutDate=e.year+'-'+e.month+'-'+e.day