diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue index fe9457f9..a65dea8e 100644 --- a/src/pages/count/job/countJob.vue +++ b/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, @@ -363,6 +373,12 @@ action: "==", value: result.label.code }) + + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id + }) var params = { filters: filters, diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue index 17053213..b4c20dfb 100644 --- a/src/pages/issue/job/issueJob.vue +++ b/src/pages/issue/job/issueJob.vue @@ -422,10 +422,10 @@ } } else { this.showMessage("物料号[" + result.label.itemCode + "]批次[" + result.label.batch + - ']未查找到任务') + ']'+"未查找到任务
"+"扫描["+result.scanMessage+"]") } }).catch(error => { - this.showMessage(error) + this.showMessage(error+"
扫描["+result.scanMessage+"]") }) } catch (e) { diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue index fcd9cb9c..72d572fb 100644 --- a/src/pages/productPutaway/job/productPutawayJob.vue +++ b/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("未查找到任务
"+"扫描["+result.scanMessage+"]") } }).catch(error => { - this.showMessage(error) + this.showMessage(error+"
扫描["+result.scanMessage+"]") }) } catch (e) { diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue index f176a7b9..0701b66b 100644 --- a/src/pages/productReceipt/job/productReceiptJob.vue +++ b/src/pages/productReceipt/job/productReceiptJob.vue @@ -401,10 +401,10 @@ this.selectItem(list[0]) } } else { - this.showMessage('未查找到任务') + this.showMessage("未查找到任务
"+"扫描["+result.scanMessage+"]") } }).catch(error => { - this.showMessage(error) + this.showMessage(error+"
扫描["+result.scanMessage+"]") }) } catch (e) { diff --git a/src/pages/productionReceipt/job/productionReceiptJob.vue b/src/pages/productionReceipt/job/productionReceiptJob.vue index a35a0bfe..e4055f6b 100644 --- a/src/pages/productionReceipt/job/productionReceiptJob.vue +++ b/src/pages/productionReceipt/job/productionReceiptJob.vue @@ -346,10 +346,10 @@ this.selectItem(list[0]) } } else { - this.showMessage('未查找到任务') + this.showMessage("未查找到任务
"+"扫描["+result.scanMessage+"]") } }).catch(error => { - this.showMessage(error) + this.showMessage(error+"
扫描["+result.scanMessage+"]") }) } catch (e) { diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue index 20b600f3..1d2e34d4 100644 --- a/src/pages/purchaseReceipt/job/receiptJob.vue +++ b/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("未查找到任务
"+"扫描["+result.scanMessage+"]") } }).catch(error => { - this.showMessage(error) + this.showMessage(error+"
扫描["+result.scanMessage+"]") }) } catch (e) { diff --git a/src/pages/purchaseReturn/job/returnJob.vue b/src/pages/purchaseReturn/job/returnJob.vue index a8e88f2a..97f80e7c 100644 --- a/src/pages/purchaseReturn/job/returnJob.vue +++ b/src/pages/purchaseReturn/job/returnJob.vue @@ -276,6 +276,12 @@ value: code }) } + + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id + }) var params = { filters: filters, diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue index 23e32740..37d199e7 100644 --- a/src/pages/putaway/job/putawayJob.vue +++ b/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', @@ -276,6 +277,12 @@ action: "==", value: code }) + + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id + }) var params = { filters: filters, @@ -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("未查找到任务
"+"扫描["+result.scanMessage+"]") } }).catch(error => { - this.showMessage(error) + this.showMessage(error+"
扫描["+result.scanMessage+"]") }) } catch (e) { - this.showMessage(e.message) + this.showMessage(e+"
扫描["+result.scanMessage+"]") } }, } diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue index 64b0dea8..dd85e54b 100644 --- a/src/pages/repleinsh/job/repleinshJob.vue +++ b/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+']未查找到任务
'+"扫描["+result.scanMessage+"]") } }).catch(error => { - this.showMessage(error) + this.showMessage(error+"
扫描["+result.scanMessage+"]") }) } catch (e) { diff --git a/src/pages/unPlanned/coms/comReceiptRecord.vue b/src/pages/unPlanned/coms/comReceiptRecord.vue index 1307391d..52640d40 100644 --- a/src/pages/unPlanned/coms/comReceiptRecord.vue +++ b/src/pages/unPlanned/coms/comReceiptRecord.vue @@ -16,7 +16,7 @@ -