Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

src/pages/productReceipt/job/productReceiptJob.vue

@@ -79,6 +79,7 @@
 				status: '1,2', //待处理 、进行中
 				detailOptions: [],
 				detailGiveupOptions: [],
+				scanMessage:""
 			};
 		},
 		// 装配收货：type = 'assemble'
@@ -208,20 +209,21 @@
 				})
 			},
 
-			openJobDetail(item, packingNumber = '') {
+			openJobDetail(item, scanMessage = '') {
 				if (this.type == 'predict') {
 					uni.navigateTo({
-						url: './productReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' + packingNumber +'&title='+this.title
+						url: './productReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scanMessage=' + scanMessage +'&title='+this.title
 					});
 				} else if (this.type == 'assemble') {
 					uni.navigateTo({
-						url: './fgProductReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' + packingNumber +'&title='+this.title
+						url: './fgProductReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scanMessage=' + scanMessage +'&title='+this.title
 					});
 				} else {
 					uni.navigateTo({
-						url: './scrapReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' + packingNumber +'&title='+this.title
+						url: './scrapReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scanMessage=' + scanMessage +'&title='+this.title
 					});
 				}
+				this.scanMessage =""
 			},
 
 			showItemList(itemList) {
@@ -295,6 +297,11 @@
 					action: "==",
 					value: code
 				})
+				filters.push({
+					column: "accept_user_id",
+					action: "==",
+					value: this.$store.state.user.id
+				})
 
 				var params = {
 					filters: filters,
@@ -338,10 +345,11 @@
 			},
 			selectItem(item) {
 				this.$refs.scanPopup.closeScanPopup();
-				this.openJobDetail(item, item.packingNumber);
+				this.openJobDetail(item, this.scanMessage);
 			},
 			getScanResult(result) {
 				try {
+					this.scanMessage =""
 					var filters = [{
 							column: "packingNumber",
 							action: "==",
@@ -371,18 +379,19 @@
 							column: "status",
 							action: "in",
 							value: '1,2',
+						},
+						{
+							column: "accept_user_id",
+							action: "==",
+							value: this.$store.state.user.id
 						}
-						// {
-						// 	column: "fromLocationCode",
-						// 	action: "==",
-						// 	value: result.label.fromLocationCode
-						// }
 					]
 					getProductReceiptJobList({
 						filters: filters,
 						pageNo: 1,
 						pageSize: 100,
 					}).then(res => {
+						this.scanMessage =result.scanMessage
 						let resultList = res.data.list;
 						if (resultList.length > 0) {
 							resultList.forEach(item => {