装配收货任务

src/pages/inventoryMove/coms/comMoveRecord.vue

@@ -337,18 +337,18 @@
 							this.managementList = res.list;
 							var params = this.setParams()
 							console.log("提交" + JSON.stringify(params))
-							inventoryMoveRecordSubmit(params).then(res => {
+							// inventoryMoveRecordSubmit(params).then(res => {
-								uni.hideLoading()
+							// 	uni.hideLoading()
-								if (res.data) {
+							// 	if (res.data) {
-									this.showCommitSuccessMessage("提交成功<br>生成" + this.title + "<br>" +
+							// 		this.showCommitSuccessMessage("提交成功<br>生成" + this.title + "<br>" +
-										res.data)
+							// 			res.data)
-								} else {
+							// 	} else {
-									this.showErrorMessage("提交失败[" + res.msg + "]")
+							// 		this.showErrorMessage("提交失败[" + res.msg + "]")
-								}
+							// 	}
-							}).catch(error => {
+							// }).catch(error => {
-								uni.hideLoading()
+							// 	uni.hideLoading()
-								this.showErrorMessage(error)
+							// 	this.showErrorMessage(error)
-							})
+							// })
 
 						} else {
 							uni.hideLoading();

src/pages/productReceipt/job/fgProductReceiptDetail.vue

@@ -211,6 +211,7 @@
 					result.uom = item.uom;
 					if (item.subList.length > 0) {
 						let subItem = item.subList[0];
+							subItem.scaned=true;
 						if (subItem.fgList == undefined) {
 							subItem.fgList = [];
 						}
@@ -365,7 +366,6 @@
 			setParams() {
 				var subList = []
 				var creator = this.$store.state.user.id
-
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
@@ -376,6 +376,13 @@
 							detail.toContainerNumber = '';
 							detail.toInventoryStatus = detail.inventoryStatus
 							detail.toLocationCode = this.toLocationCode
+							if(detail.fgList){
+								detail.fgList.forEach(res=>{
+									res.outsideItemCode =res.itemCode
+									res.outsideProduceDate = res.productDate
+									res.outsideSerialNumber =res.order
+								})
+							}
 							subList.push(detail)
 						}
 					})
@@ -429,7 +436,7 @@
 			showQuestionMessage(hint,callback){
 				this.$refs.comMessage.showQuestionMessage(hint, res => {
 					if (res) {
-						callback()
+						callback(true)
 					}
 				});
 			}

src/pages/productReceipt/job/fgProductReceiptJob.vue

@@ -17,11 +17,27 @@
 
 			};
 		},
+		onShow() {
+			if(this.$refs.productreceiptjob!=undefined){
+				this.$refs.productreceiptjob.refresh();
+			}
 			
-		mounted() {
-			this.$refs.productreceiptjob.getList("refresh");
 		},
 
+		onPullDownRefresh() {
+			this.$refs.productreceiptjob.refresh();
+		},
+		
+		onReachBottom() {
+			this.$refs.productreceiptjob.onReach();
+		},
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				this.$refs.productreceiptjob.toHome();
+			} else if (e.index == 1) {
+				this.$refs.productreceiptjob.openFilter();
+			}
+		},
 		methods: {
 
 		}

src/pages/productReceipt/job/productReceiptJob.vue

@@ -83,6 +83,11 @@
 			this.detailGiveupOptions = getDetailGiveupOption();
 		},
 		
+		
+		mounted() {
+			this.getList('refresh');
+		},
+
 		onReachBottom() {
 			//避免多次触发
 			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
@@ -116,6 +121,9 @@
 		},
 
 		methods: {
+			refresh(){
+				this.getList('refresh');
+			},
 			getList(type) {
 				let that = this;
 				uni.showLoading({
@@ -308,6 +316,18 @@
 					}
 				});
 			},
+			openFilter() {
+				this.$refs.filter.openFilter();
+			},
+			toHome() {
+				goHome()
+			},
+			onReach(){
+				if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+					return;
+				}
+				this.getList("more");
+			}
 		}
 	}
 </script>

src/pages/productReceipt/job/scrapReceiptJob.vue

@@ -18,8 +18,15 @@
 			};
 		},
 
-		mounted() {
+		onPullDownRefresh() {
-			this.$refs.productreceiptjob.getList("refresh");
+			this.$refs.productreceiptjob.refresh();
+		},
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				this.$refs.productreceiptjob.toHome();
+			} else if (e.index == 1) {
+				this.$refs.productreceiptjob.openFilter();
+			}
 		},
 
 		methods: {

src/pages/productReceipt/job/semiProductReceiptJob.vue

@@ -18,8 +18,21 @@
 			};
 		},
 		
-		mounted() {
+		onShow() {
-			this.$refs.productreceiptjob.getList("refresh");
+			if(this.$refs.productreceiptjob!=undefined){
+				this.$refs.productreceiptjob.refresh();
+			}
+		},
+
+		onPullDownRefresh() {
+			this.$refs.productreceiptjob.refresh();
+		},
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				this.$refs.productreceiptjob.toHome();
+			} else if (e.index == 1) {
+				this.$refs.productreceiptjob.openFilter();
+			}
 		},
 
 		methods: {