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

pages/dataReport/Inventoryentrydetails.vue

@@ -102,9 +102,10 @@
 			// this.endDate=date.getFullYear()+'-'+((date.getMonth()+1)<10?('0'+(date.getMonth()+1)):(date.getMonth()+1))+'-'+date.getDate()
 			this.getList()
 		},
-		onReachBottom() { //上拉触底函数
+		onReachBottom() { 
+			//上拉触底函数
 			// if (this.statusFlag == 3) {
-			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+			if (!this.show2) { //此处判断，上锁，防止重复请求
 				this.currentPage += 1
 				this.getList()
 			}
@@ -131,6 +132,7 @@
 				return format;
 			},
 			confirm(e) {
+				this.show2=false
 				console.log(e)
 				this.warehouseList=[]
 				this.currentPage=1