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

pages/erp/deliveryfeedback/list.vue

@@ -56,6 +56,7 @@
 				binNumber: "",
 				status: '执行中',
 				positionName: '',
+				flag:'',
 				statusList: [
 					{name:'执行中',value:1},
 					{name:'已完货',value:2},
@@ -82,6 +83,7 @@
 		},
 		onReachBottom() {
 			 this.currentPage+=1
+			 this.flag='1'
 		    this.getList(false)
 			// this.getMoreNews()
 		},
@@ -93,8 +95,13 @@
 					pageSize: this.pageSize
 				}).then(res => {
 					if (res.data.code == 200) {
-						var data=res.data.data.records
-						this.dataList = this.dataList.concat(data)
+						if(this.flag=='1'){
+							var data=res.data.data.records
+							this.dataList = this.dataList.concat(data)
+						}
+						else{
+							this.dataList =res.data.data.records
+						}
 						if(res.data.data.records.length==0){
 							this.isContent=true
 						}
@@ -103,6 +110,9 @@
 			},
 			statuschange(e) {
 				this.status = this.statusList[e[0]].name
+				this.feedbackFlag=this.statusList[e[0]].value
+				this.currentPage = 1,
+				this.flag='0'
 				this.getList()
 			},
 			goDetail(val) {

pages/erp/receivingfeedback/list.vue

@@ -55,11 +55,12 @@
 				positionId: "",
 				binNumber: "",
 				status: '执行中',
+				flag:'',
 				positionName: '',
 				statusList: [
-					{name:'执行中',value:1},
-					{name:'已完货',value:2},
-					{name:'全部任务',value:3},
+					{name:'执行中',value:4},
+					{name:'已完货',value:5},
+					{name:'全部任务',value:6},
 				],
 				feedbackFlag:4,
 				dataList: [],
@@ -81,7 +82,8 @@
 			this.getList()
 		},
 		onReachBottom() {
-			 this.currentPage+=1
+			this.currentPage+=1
+			this.flag='1'
 		    this.getList(false)
 			// this.getMoreNews()
 		},
@@ -93,8 +95,14 @@
 					pageSize: this.pageSize
 				}).then(res => {
 					if (res.data.code == 200) {
-						var data=res.data.data.records
-						this.dataList = this.dataList.concat(data)
+						console.log(this.flag)
+						if(this.flag=='1'){
+							var data=res.data.data.records
+							this.dataList = this.dataList.concat(data)
+						}
+						else{
+							this.dataList =res.data.data.records
+						}
 						if(res.data.data.records.length==0){
 							this.isContent=true
 						}
@@ -103,6 +111,9 @@
 			},
 			statuschange(e) {
 				this.status = this.statusList[e[0]].name
+				this.feedbackFlag=this.statusList[e[0]].value
+				this.currentPage = 1,
+				this.flag='0'
 				this.getList()
 			},
 			goDetail(val) {