diff --git a/src/api/request2.js b/src/api/request2.js index 7fe6ba1b..f523922c 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -1571,7 +1571,7 @@ export function inventoryMoveRecordSubmit(params) { */ export function getCountJobList(params) { return request({ - url: baseApi + "/wms/count-job-detail/senior", + url: baseApi + "/wms/count-job-main/senior", method: "post", data: params, }); diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue index c90694ae..1467e6d1 100644 --- a/src/pages/count/job/countJob.vue +++ b/src/pages/count/job/countJob.vue @@ -143,6 +143,11 @@ value: this.status }) + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id + }) var params = { filters: filters, pageNo: this.pageNo, diff --git a/src/pages/customerReturn/job/returnJob.vue b/src/pages/customerReturn/job/returnJob.vue index b68544ea..11a76e11 100644 --- a/src/pages/customerReturn/job/returnJob.vue +++ b/src/pages/customerReturn/job/returnJob.vue @@ -140,6 +140,11 @@ value: this.status }) + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id + }) var params = { filters: filters, pageNo: this.pageNo, diff --git a/src/pages/deliver/job/deliverJob.vue b/src/pages/deliver/job/deliverJob.vue index 47bbb31f..861519da 100644 --- a/src/pages/deliver/job/deliverJob.vue +++ b/src/pages/deliver/job/deliverJob.vue @@ -138,6 +138,11 @@ }) } + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id + }) filters.push({ column: "status", action: "in", diff --git a/src/pages/inspect/job/inspectJob.vue b/src/pages/inspect/job/inspectJob.vue index 9a834514..4ac64d4c 100644 --- a/src/pages/inspect/job/inspectJob.vue +++ b/src/pages/inspect/job/inspectJob.vue @@ -136,7 +136,11 @@ action: "in", value: this.status }) - + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id + }) var params = { filters: filters, pageNo: this.pageNo, diff --git a/src/pages/inventoryMove/coms/comMoveJob.vue b/src/pages/inventoryMove/coms/comMoveJob.vue index 9f70ce4b..affeb0a5 100644 --- a/src/pages/inventoryMove/coms/comMoveJob.vue +++ b/src/pages/inventoryMove/coms/comMoveJob.vue @@ -161,6 +161,11 @@ value: this.status }) + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id + }) filters.push({ column: "business_type", action: "==", diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue index 2962ec2f..d3f944d9 100644 --- a/src/pages/issue/job/issueJob.vue +++ b/src/pages/issue/job/issueJob.vue @@ -162,6 +162,12 @@ column: "status", action: "in", value: this.status + }) + + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id }) if (fromLocationCode != '') { diff --git a/src/pages/package/job/overPackageJob.vue b/src/pages/package/job/overPackageJob.vue index 77c38a5c..ad52c55b 100644 --- a/src/pages/package/job/overPackageJob.vue +++ b/src/pages/package/job/overPackageJob.vue @@ -134,6 +134,11 @@ value: this.status }) + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id + }) var params = { filters: filters, pageNo: this.pageNo, diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue index ab1d4046..9f0a3317 100644 --- a/src/pages/productPutaway/job/productPutawayJob.vue +++ b/src/pages/productPutaway/job/productPutawayJob.vue @@ -168,7 +168,12 @@ action: "in", value: this.status }) - + + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id + }) filters.push({ column: "type", action: "==", diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue index 55a535ea..db3874ff 100644 --- a/src/pages/productReceipt/job/productReceiptJob.vue +++ b/src/pages/productReceipt/job/productReceiptJob.vue @@ -156,8 +156,12 @@ column: "status", action: "in", value: this.status + }) + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id }) - filters.push({ column: "type", action: "==", diff --git a/src/pages/productRecycle/job/productRecycleJob.vue b/src/pages/productRecycle/job/productRecycleJob.vue index e0935a2a..2330df4c 100644 --- a/src/pages/productRecycle/job/productRecycleJob.vue +++ b/src/pages/productRecycle/job/productRecycleJob.vue @@ -140,6 +140,12 @@ action: "in", value: this.status }) + + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id + }) var params = { filters: filters, pageNo: this.pageNo, diff --git a/src/pages/productionReceipt/job/productionReceiptJob.vue b/src/pages/productionReceipt/job/productionReceiptJob.vue index 7c06df09..c87ebf2e 100644 --- a/src/pages/productionReceipt/job/productionReceiptJob.vue +++ b/src/pages/productionReceipt/job/productionReceiptJob.vue @@ -151,6 +151,11 @@ value: this.status }) + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id + }) var params = { filters: filters, pageNo: this.pageNo, diff --git a/src/pages/productionReturn/job/returnJob.vue b/src/pages/productionReturn/job/returnJob.vue index 34a6108e..8b938bc7 100644 --- a/src/pages/productionReturn/job/returnJob.vue +++ b/src/pages/productionReturn/job/returnJob.vue @@ -142,6 +142,11 @@ value: this.status }) + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id + }) var params = { filters: filters, pageNo: this.pageNo, diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue index 010164d7..8fbb2fd6 100644 --- a/src/pages/purchaseReceipt/job/receiptJob.vue +++ b/src/pages/purchaseReceipt/job/receiptJob.vue @@ -180,6 +180,11 @@ column: "status", action: "in", value: this.status + }) + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id }) var params = { diff --git a/src/pages/purchaseReturn/job/returnJob.vue b/src/pages/purchaseReturn/job/returnJob.vue index 5bbdf31e..b95031b9 100644 --- a/src/pages/purchaseReturn/job/returnJob.vue +++ b/src/pages/purchaseReturn/job/returnJob.vue @@ -140,6 +140,11 @@ action: "in", value: this.status }) + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id + }) var params = { filters: filters, pageNo: this.pageNo, diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue index 1a1db2ec..22ea2112 100644 --- a/src/pages/putaway/job/putawayJob.vue +++ b/src/pages/putaway/job/putawayJob.vue @@ -151,7 +151,11 @@ action: "in", value: this.status }) - + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id + }) var params = { filters: filters, pageNo: this.pageNo, diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue index 675dbdad..b43b683f 100644 --- a/src/pages/repleinsh/job/repleinshJob.vue +++ b/src/pages/repleinsh/job/repleinshJob.vue @@ -141,6 +141,12 @@ action: "in", value: this.status }) + + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id + }) if (fromLocationCode != '') { // 来源库位 filters.push({ diff --git a/src/pages/scrap/job/scrapJob.vue b/src/pages/scrap/job/scrapJob.vue index e080f28b..06faaf7c 100644 --- a/src/pages/scrap/job/scrapJob.vue +++ b/src/pages/scrap/job/scrapJob.vue @@ -137,6 +137,11 @@ value: this.status }) + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id + }) var params = { filters: filters, pageNo: this.pageNo, diff --git a/src/pages/transfer/job/issueJob.vue b/src/pages/transfer/job/issueJob.vue index 18a689b9..7be40409 100644 --- a/src/pages/transfer/job/issueJob.vue +++ b/src/pages/transfer/job/issueJob.vue @@ -143,6 +143,11 @@ value: this.status }) + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id + }) var params = { filters: filters, pageNo: this.pageNo, diff --git a/src/pages/transfer/job/receiptJob.vue b/src/pages/transfer/job/receiptJob.vue index f3ffe0bb..43f3f1e3 100644 --- a/src/pages/transfer/job/receiptJob.vue +++ b/src/pages/transfer/job/receiptJob.vue @@ -142,6 +142,11 @@ value: this.status }) + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id + }) var params = { filters: filters, pageNo: this.pageNo, diff --git a/src/pages/unPlanned/job/issueJob.vue b/src/pages/unPlanned/job/issueJob.vue index cf5aea7f..745eae92 100644 --- a/src/pages/unPlanned/job/issueJob.vue +++ b/src/pages/unPlanned/job/issueJob.vue @@ -144,6 +144,11 @@ value: this.status }) + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id + }) var params = { filters: filters, pageNo: this.pageNo, diff --git a/src/pages/unPlanned/job/receiptJob.vue b/src/pages/unPlanned/job/receiptJob.vue index 07bcacfa..fdc4c594 100644 --- a/src/pages/unPlanned/job/receiptJob.vue +++ b/src/pages/unPlanned/job/receiptJob.vue @@ -133,6 +133,11 @@ value: this.status }) + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id + }) var params = { filters: filters, pageNo: this.pageNo,