Browse Source

前端小程序 sdy

zhongtianhaoyuan 3 years ago
parent
commit
b914a91bb5
2 changed files with 48 additions and 40 deletions
  1. 20 27
      pageD/warehousings/ex_warehouse.vue
  2. 28 13
      pageD/warehousings/warehousings.vue

+ 20 - 27
pageD/warehousings/ex_warehouse.vue

@@ -304,34 +304,27 @@
 			this.getList(this.WarehouseInOutInfo.id)
 		},
 		onShow() {	
-			this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {
-				compId: 'cb271576afa8418fb7a2f328adc1ecc2',
-				warehouseType: 1,
-			}).then(res => {
-				if (res.data.code == 200) {
-					var arr = []
-					for (var i = 0; i < res.data.data.length; i++) {
-						if (res.data.data[i].warehouseName == this.WarehouseInOutInfo.warehouseName) {
-							this.warehouseIndex = i
-							this.ids = res.data.data[i].id
+			this.$api.doRequest('get', '/warehouseInOutInfo/selectCompId', {contractNo:this.WarehouseInOutInfo.contractNo,warehouseType:1,}).then(res => {
+				 if(res.data.code==200){
+					this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {
+						compId: res.data.data,
+						warehouseType: 1,
+					}).then(res => {
+						if (res.data.code == 200) {
+							var arr = []
+							for (var i = 0; i < res.data.data.length; i++) {
+								if (res.data.data[i].warehouseName == this.WarehouseInOutInfo.warehouseName) {
+									this.warehouseIndex = i
+									this.ids = res.data.data[i].id
+								}
+								arr.push(res.data.data[i].warehouseName)
+							}
+							this.warehouselist = res.data.data
+							this.warehouse = arr
 						}
-						arr.push(res.data.data[i].warehouseName)
-					}
-					this.warehouselist = res.data.data
-					this.warehouse = arr
-				}
-			})
-			// 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
-			// })
+					})
+				 }
+			})	
 		},
 		
 		methods: {

+ 28 - 13
pageD/warehousings/warehousings.vue

@@ -237,7 +237,8 @@ import upload from '@/components/upload.vue';
 					month: true,
 					day: true,
 				},
-				show:false
+				show:false,
+				// compIds:"",
 			}
 		},
 		computed: {
@@ -264,19 +265,33 @@ import upload from '@/components/upload.vue';
 				}
 			},
 			onShow(){
-				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {compId:'cb271576afa8418fb7a2f328adc1ecc2',warehouseType:1,}).then(res => {
-				 if(res.data.code==200){
-					 var arr=[]
-					 for(var i=0;i<res.data.data.length;i++){
-						 if(res.data.data[i].warehouseName==this.WarehouseInOutInfo.warehouseName){
-							 this.warehouseIndex=i
-						 }
-						 arr.push(res.data.data[i].warehouseName)
+				this.$api.doRequest('get', '/warehouseInOutInfo/selectCompId', {contractNo:this.WarehouseInOutInfo.contractNo,warehouseType:1,}).then(res => {
+					 if(res.data.code==200){
+						 // this.compIds = res.data.data	
+						 
+						 
+						 
+						 this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {compId:res.data.data,warehouseType:1,}).then(res => {
+						 	 if(res.data.code==200){
+						 		 var arr=[]
+						 		 for(var i=0;i<res.data.data.length;i++){
+						 			 if(res.data.data[i].warehouseName==this.WarehouseInOutInfo.warehouseName){
+						 				 this.warehouseIndex=i
+						 			 }
+						 			 arr.push(res.data.data[i].warehouseName)
+						 		 }
+						 		 this.warehouselist=res.data.data
+						 		 this.warehouse=arr
+						 	 }
+						 })
 					 }
-					 this.warehouselist=res.data.data
-					 this.warehouse=arr
-				 }
-			})
+				})
+				
+				
+				
+				
+				
+				
 			},
 		onLoad(option) {
 			this.WarehouseInOutInfo.contractNo = option.contractNo