修改任务提示和任务筛选添加承接人

src/pages/count/job/countJob.vue

@@ -167,6 +167,11 @@
 				// 	action: "==",
 				// 	value: this.$store.state.user.id
 				// })
+				filters.push({
+					column: "accept_user_id",
+					action: "==",
+					value: this.$store.state.user.id
+				})
 				var params = {
 					filters: filters,
 					pageNo: this.pageNo,
@@ -310,6 +315,11 @@
 					action: "==",
 					value: "locationCode"
 				})
+				filters.push({
+					column: "accept_user_id",
+					action: "==",
+					value: this.$store.state.user.id
+				})
 			
 				var params = {
 					filters: filters,
@@ -364,6 +374,12 @@
 					value: result.label.code
 				})
 				
+				filters.push({
+					column: "accept_user_id",
+					action: "==",
+					value: this.$store.state.user.id
+				})
+							
 				var params = {
 					filters: filters,
 					pageNo: 1,

src/pages/issue/job/issueJob.vue

@@ -422,10 +422,10 @@
 							}
 						} else {
 							this.showMessage("物料号[" + result.label.itemCode + "]批次[" + result.label.batch +
-								']未查找到任务')
+								']'+"未查找到任务<br>"+"扫描["+result.scanMessage+"]")
 						}
 					}).catch(error => {
-						this.showMessage(error)
+						this.showMessage(error+"<br>扫描["+result.scanMessage+"]")
 					})
 
 				} catch (e) {

src/pages/productPutaway/job/productPutawayJob.vue

@@ -296,6 +296,11 @@
 					action: "==",
 					value: code
 				})
+				filters.push({
+					column: "accept_user_id",
+					action: "==",
+					value: this.$store.state.user.id
+				})
 
 				var params = {
 					filters: filters,
@@ -360,7 +365,12 @@
 							column: "status",
 							action: "in",
 							value: '1,2',
-						}
+						},
+						filters.push({
+							column: "accept_user_id",
+							action: "==",
+							value: this.$store.state.user.id
+						})
 						// {
 						// 	column: "fromLocationCode",
 						// 	action: "==",
@@ -391,10 +401,10 @@
 								this.selectItem(list[0])
 							}
 						} else {
-							this.showMessage('未查找到任务')
+							this.showMessage("未查找到任务<br>"+"扫描["+result.scanMessage+"]")
 						}
 					}).catch(error => {
-						this.showMessage(error)
+						this.showMessage(error+"<br>扫描["+result.scanMessage+"]")
 					})
 
 				} catch (e) {

src/pages/productReceipt/job/productReceiptJob.vue

@@ -401,10 +401,10 @@
 								this.selectItem(list[0])
 							}
 						} else {
-							this.showMessage('未查找到任务')
+							this.showMessage("未查找到任务<br>"+"扫描["+result.scanMessage+"]")
 						}
 					}).catch(error => {
-						this.showMessage(error)
+						this.showMessage(error+"<br>扫描["+result.scanMessage+"]")
 					})
 
 				} catch (e) {

src/pages/productionReceipt/job/productionReceiptJob.vue

@@ -346,10 +346,10 @@
 								this.selectItem(list[0])
 							}
 						} else {
-							this.showMessage('未查找到任务')
+							this.showMessage("未查找到任务<br>"+"扫描["+result.scanMessage+"]")
 						}
 					}).catch(error => {
-						this.showMessage(error)
+						this.showMessage(error+"<br>扫描["+result.scanMessage+"]")
 					})
 			
 				} catch (e) {

src/pages/purchaseReceipt/job/receiptJob.vue

@@ -258,6 +258,11 @@
 						value: code
 					})
 				}
+				filters.push({
+					column: "accept_user_id",
+					action: "==",
+					value: this.$store.state.user.id
+				})
 
 				var params = {
 					filters: filters,
@@ -415,6 +420,11 @@
 							// }
 						]
 					}
+					filters.push({
+						column: "accept_user_id",
+						action: "==",
+						value: this.$store.state.user.id
+					})
 
 
 					getPurchaseReceiptJobList({
@@ -442,10 +452,10 @@
 								this.selectItem(list[0],result.scanMessage.indexOf('ASN')>-1)
 							}
 						} else {
-							this.showMessage('未查找到任务')
+							this.showMessage("未查找到任务<br>"+"扫描["+result.scanMessage+"]")
 						}
 					}).catch(error => {
-						this.showMessage(error)
+						this.showMessage(error+"<br>扫描["+result.scanMessage+"]")
 					})
 
 				} catch (e) {

src/pages/purchaseReturn/job/returnJob.vue

@@ -277,6 +277,12 @@
 					})
 				}
 				
+				filters.push({
+					column: "accept_user_id",
+					action: "==",
+					value: this.$store.state.user.id
+				})
+
 				var params = {
 					filters: filters,
 					pageNo: 1,

src/pages/putaway/job/putawayJob.vue

@@ -56,6 +56,7 @@
 	import putawayJobListPopup from '@/pages/putaway/coms/putawayJobListPopup.vue'
 	import putawayInfoPopup from '@/pages/putaway/coms/putawayInfoPopup.vue'
 	import winScanPackJob from "@/mycomponents/scan/winScanPackJob.vue"
+import { Exception } from 'sass';
 
 	export default {
 		name: 'Putaway',
@@ -277,6 +278,12 @@
 					value: code
 				})
 				
+				filters.push({
+					column: "accept_user_id",
+					action: "==",
+					value: this.$store.state.user.id
+				})
+
 				var params = {
 					filters: filters,
 					pageNo: 1,
@@ -338,7 +345,12 @@
 							column: "status",
 							action: "in",
 							value: '1,2',
-						}
+						},
+						filters.push({
+							column: "accept_user_id",
+							action: "==",
+							value: this.$store.state.user.id
+						})
 						// {
 						// 	column: "fromLocationCode",
 						// 	action: "==",
@@ -369,14 +381,14 @@
 								this.selectItem(list[0])
 							}
 						} else {
-							this.showMessage('未查找到任务')
+							this.showMessage("未查找到任务<br>"+"扫描["+result.scanMessage+"]")
 						}
 					}).catch(error => {
-						this.showMessage(error)
+						this.showMessage(error+"<br>扫描["+result.scanMessage+"]")
 					})
 
 				} catch (e) {
-					this.showMessage(e.message)
+					this.showMessage(e+"<br>扫描["+result.scanMessage+"]")
 				}
 			},
 		}

src/pages/repleinsh/job/repleinshJob.vue

@@ -368,10 +368,10 @@
 								this.selectItem(list[0])
 							}
 						} else {
-							this.showMessage("物料号["+result.label.itemCode+"]批次["+result.label.batch+']未查找到任务')
+							this.showMessage("物料号["+result.label.itemCode+"]批次["+result.label.batch+']未查找到任务<br>'+"扫描["+result.scanMessage+"]")
 						}
 					}).catch(error => {
-						this.showMessage(error)
+						this.showMessage(error+"<br>扫描["+result.scanMessage+"]")
 					})
 			
 				} catch (e) {

src/pages/unPlanned/coms/comReceiptRecord.vue

@@ -16,7 +16,7 @@
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="swipeClick($event,item,index)"
 							:right-options="item.scaned?scanOptions:detailOptions">
-							<balance :dataContent="item" :isShowStdPack="false" :isShowStatus="true" :isShowPack="true"
+							<balance :dataContent="item" :isShowStdPack="false" :isShowStatus="false" :isShowPack="true"
 								:isShowFromLocation="false" :isShowToLocation="false"></balance>
 						</uni-swipe-action-item>
 					</uni-swipe-action>