diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue index 4440cb04..5551cce8 100644 --- a/src/pages/count/job/countJob.vue +++ b/src/pages/count/job/countJob.vue @@ -40,6 +40,9 @@ import comCountJobCard from '@/pages/count/coms/comCountJobCard.vue' import jobListPopup from '@/pages/count/coms/jobListPopup.vue' import jobInfoPopup from '@/pages/count/coms/jobInfoPopup.vue' +import { useCountStore } from '@/store' +// 获取自定义的store +const store = useCountStore() const { proxy } = getCurrentInstance() const jobList = ref([]) const pageNo = ref(1) @@ -115,6 +118,11 @@ const getList = (type) => { action: 'in', value: status.value }) + filters.push({ + column: 'accept_user_id', + action: '==', + value: store.id + }) const params = { filters, pageNo: pageNo.value, diff --git a/src/pages/customerReturn/job/returnJob.vue b/src/pages/customerReturn/job/returnJob.vue index 2800a136..6f2f9781 100644 --- a/src/pages/customerReturn/job/returnJob.vue +++ b/src/pages/customerReturn/job/returnJob.vue @@ -39,6 +39,9 @@ import jobFilter from '@/mycomponents/job/jobFilter.vue' import comReturnJobCard from '@/pages/customerReturn/coms/comReturnJobCard.vue' import jobListPopup from '@/pages/customerReturn/coms/jobListPopup.vue' import jobInfoPopup from '@/pages/customerReturn/coms/jobInfoPopup.vue' +import { useCountStore } from '@/store' +// 获取自定义的store +const store = useCountStore() const { proxy } = getCurrentInstance() const jobList = ref([]) @@ -114,7 +117,11 @@ const getList = (type) => { action: 'in', value: status.value }) - + filters.push({ + column: 'accept_user_id', + action: '==', + value: store.id + }) const params = { filters, pageNo: pageNo.value, diff --git a/src/pages/deliver/job/deliverJob.vue b/src/pages/deliver/job/deliverJob.vue index d2b6d201..4f0647b9 100644 --- a/src/pages/deliver/job/deliverJob.vue +++ b/src/pages/deliver/job/deliverJob.vue @@ -29,6 +29,9 @@ import jobFilter from '@/mycomponents/job/jobFilter.vue' import comDeliverJobCard from '@/pages/deliver/coms/comDeliverJobCard.vue' import jobListPopup from '@/pages/deliver/coms/jobListPopup.vue' import jobInfoPopup from '@/pages/deliver/coms/jobInfoPopup.vue' +import { useCountStore } from '@/store' +// 获取自定义的store +const store = useCountStore() const { proxy } = getCurrentInstance() const jobList = ref([]) @@ -108,6 +111,11 @@ const getList = (type) => { action: 'in', value: status.value }) + filters.push({ + column: 'accept_user_id', + action: '==', + value: store.id + }) if (businessType.value && businessType.value.length > 0) { // 成品发货任务:businessType=Deliver 自制备件发货任务:businessType=ZZBJDeliver filters.push({ diff --git a/src/pages/inspect/job/inspectJob.vue b/src/pages/inspect/job/inspectJob.vue index 0b984828..7d81701d 100644 --- a/src/pages/inspect/job/inspectJob.vue +++ b/src/pages/inspect/job/inspectJob.vue @@ -122,7 +122,11 @@ export default { action: 'in', value: this.status }) - + filters.push({ + column: 'accept_user_id', + action: '==', + value: this.$store.state.user.id + }) const params = { filters, pageNo: this.pageNo, diff --git a/src/pages/inventoryMove/coms/comMoveJob.vue b/src/pages/inventoryMove/coms/comMoveJob.vue index 8615f84d..e786a482 100644 --- a/src/pages/inventoryMove/coms/comMoveJob.vue +++ b/src/pages/inventoryMove/coms/comMoveJob.vue @@ -28,6 +28,9 @@ import jobFilter from '@/mycomponents/job/jobFilter.vue' import comInventoryJobCard from '@/pages/inventoryMove/coms/comInventoryJobCard.vue' import jobListPopup from '@/pages/inventoryMove/coms/jobListPopup.vue' import jobInfoPopup from '@/pages/inventoryMove/coms/jobInfoPopup.vue' +import { useCountStore } from '@/store' +// 获取自定义的store +const store = useCountStore() const { proxy } = getCurrentInstance() const props = defineProps({ @@ -108,7 +111,11 @@ const getList = (type) => { action: 'in', value: status.value }) - + filters.push({ + column: 'accept_user_id', + action: '==', + value: store.id + }) filters.push({ column: 'business_type', action: '==', diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue index a3c7bc94..d1ab1e28 100644 --- a/src/pages/issue/job/issueJob.vue +++ b/src/pages/issue/job/issueJob.vue @@ -37,6 +37,10 @@ import winScanButton from '@/mycomponents/scan/winScanButton.vue' import winScanPackJob from '@/mycomponents/scan/winScanPackJob.vue' import jobListView from '@/mycomponents/jobList/jobList.vue' +import { useCountStore } from '@/store' +// 获取自定义的store +const store = useCountStore() + const { proxy } = getCurrentInstance() const jobList = ref([]) const pageNo = ref(1) @@ -131,7 +135,11 @@ const getList = (type, fromLocationCode = '', productionLineCode = '') => { action: 'in', value: status.value }) - + filters.push({ + column: 'accept_user_id', + action: '==', + value: store.id + }) if (fromLocationCode != '') { // 来源库位 filters.push({ diff --git a/src/pages/package/job/overPackageJob.vue b/src/pages/package/job/overPackageJob.vue index 66f477db..ed1eb607 100644 --- a/src/pages/package/job/overPackageJob.vue +++ b/src/pages/package/job/overPackageJob.vue @@ -99,6 +99,11 @@ const getList = (type) => { action: 'in', value: status.value }) + filters.push({ + column: 'accept_user_id', + action: '==', + value: store.id + }) const params = { filters, pageNo: pageNo.value, diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue index 5730d4d9..6da8c16e 100644 --- a/src/pages/productPutaway/job/productPutawayJob.vue +++ b/src/pages/productPutaway/job/productPutawayJob.vue @@ -36,6 +36,10 @@ import jobListCom from '@/mycomponents/jobList/jobList.vue' import winScanButton from '@/mycomponents/scan/winScanButton.vue' import winScanPackJob from '@/mycomponents/scan/winScanPackJob.vue' +import { useCountStore } from '@/store' +// 获取自定义的store +const store = useCountStore() + const { proxy } = getCurrentInstance() const props = defineProps({ type: { @@ -102,7 +106,11 @@ const getList = (type) => { action: 'in', value: status.value }) - + filters.push({ + column: 'accept_user_id', + action: '==', + value: store.id + }) filters.push({ column: 'type', action: '==', diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue index 672e0595..52de6d7c 100644 --- a/src/pages/productReceipt/job/productReceiptJob.vue +++ b/src/pages/productReceipt/job/productReceiptJob.vue @@ -38,6 +38,10 @@ import jobListCom from '@/mycomponents/jobList/jobList.vue' import winScanButton from '@/mycomponents/scan/winScanButton.vue' import winScanPackJob from '@/mycomponents/scan/winScanPackJob.vue' +import { useCountStore } from '@/store' +// 获取自定义的store +const store = useCountStore() + const { proxy } = getCurrentInstance() const props = defineProps({ type: { @@ -92,7 +96,11 @@ const getList = (type) => { action: 'in', value: status.value }) - + filters.push({ + column: 'accept_user_id', + action: '==', + value: store.id + }) filters.push({ column: 'type', action: '==', diff --git a/src/pages/productRecycle/job/productRecycleJob.vue b/src/pages/productRecycle/job/productRecycleJob.vue index 63cba02a..039ca754 100644 --- a/src/pages/productRecycle/job/productRecycleJob.vue +++ b/src/pages/productRecycle/job/productRecycleJob.vue @@ -30,6 +30,10 @@ import comRecycleJobCard from '@/pages/productRecycle/coms/comRecycleJobCard.vue import returnJobListPopup from '@/pages/productRecycle/coms/returnJobListPopup.vue' import returnInfoPopup from '@/pages/productRecycle/coms/returnInfoPopup.vue' +import { useCountStore } from '@/store' +// 获取自定义的store +const store = useCountStore() + const { proxy } = getCurrentInstance() const jobList = ref([]) const pageNo = ref(1) @@ -103,6 +107,11 @@ const getList = (type) => { action: 'in', value: status.value }) + filters.push({ + column: 'accept_user_id', + action: '==', + value: store.id + }) const params = { filters, pageNo: pageNo.value, diff --git a/src/pages/productionReceipt/job/productionReceiptJob.vue b/src/pages/productionReceipt/job/productionReceiptJob.vue index 4ee391bf..7c598da1 100644 --- a/src/pages/productionReceipt/job/productionReceiptJob.vue +++ b/src/pages/productionReceipt/job/productionReceiptJob.vue @@ -38,6 +38,10 @@ import winScanButton from '@/mycomponents/scan/winScanButton.vue' import winScanPackJob from '@/mycomponents/scan/winScanPackJob.vue' import jobList from '@/mycomponents/jobList/jobList.vue' +import { useCountStore } from '@/store' +// 获取自定义的store +const store = useCountStore() + const { proxy } = getCurrentInstance() const jobList = ref([]) const pageNo = ref(1) @@ -113,6 +117,11 @@ const getList = (type) => { action: 'in', value: status.value }) + filters.push({ + column: 'accept_user_id', + action: '==', + value: store.id + }) const params = { filters, pageNo: pageNo.value, diff --git a/src/pages/productionReturn/job/returnJob.vue b/src/pages/productionReturn/job/returnJob.vue index a277866f..5cfe8015 100644 --- a/src/pages/productionReturn/job/returnJob.vue +++ b/src/pages/productionReturn/job/returnJob.vue @@ -37,6 +37,10 @@ import comReturnJobCard from '@/pages/productionReturn/coms/comReturnJobCard.vue import jobListPopup from '@/pages/productionReturn/coms/jobListPopup.vue' import jobInfoPopup from '@/pages/productionReturn/coms/jobInfoPopup.vue' +import { useCountStore } from '@/store' +// 获取自定义的store +const store = useCountStore() + const { proxy } = getCurrentInstance() const jobList = ref([]) const pageNo = ref(1) @@ -111,6 +115,11 @@ const getList = (type) => { action: 'in', value: status.value }) + filters.push({ + column: 'accept_user_id', + action: '==', + value: store.id + }) const params = { filters, pageNo: pageNo.value, diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue index eaed5b8c..2674208d 100644 --- a/src/pages/purchaseReceipt/job/receiptJob.vue +++ b/src/pages/purchaseReceipt/job/receiptJob.vue @@ -35,6 +35,10 @@ import jobListCom from '@/mycomponents/jobList/jobList.vue' import winScanButton from '@/mycomponents/scan/winScanButton.vue' import winScanPackJob from '@/mycomponents/scan/winScanPackJob.vue' +import { useCountStore } from '@/store' +// 获取自定义的store +const store = useCountStore() + const { proxy } = getCurrentInstance() const jobList = ref([]) const pageNo = ref(1) @@ -113,7 +117,11 @@ const getList = (type) => { action: 'in', value: status.value }) - + filters.push({ + column: 'accept_user_id', + action: '==', + value: store.id + }) const params = { filters, pageNo: pageNo.value, diff --git a/src/pages/purchaseReturn/job/returnJob.vue b/src/pages/purchaseReturn/job/returnJob.vue index ce7738f3..43088e78 100644 --- a/src/pages/purchaseReturn/job/returnJob.vue +++ b/src/pages/purchaseReturn/job/returnJob.vue @@ -30,6 +30,9 @@ import comReturnJobCard from '@/pages/purchaseReturn/coms/comReturnJobCard.vue' import returnJobListPopup from '@/pages/purchaseReturn/coms/returnJobListPopup.vue' import returnInfoPopup from '@/pages/purchaseReturn/coms/returnInfoPopup.vue' +import { useCountStore } from '@/store' +// 获取自定义的store +const store = useCountStore() const { proxy } = getCurrentInstance() const jobList = ref([]) const pageNo = ref(1) @@ -104,7 +107,11 @@ const getList = (type) => { action: 'in', value: status.value }) - + filters.push({ + column: 'accept_user_id', + action: '==', + value: store.id + }) const params = { filters, pageNo: pageNo.value, diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue index 1a5be3d4..004d7ddc 100644 --- a/src/pages/putaway/job/putawayJob.vue +++ b/src/pages/putaway/job/putawayJob.vue @@ -35,6 +35,9 @@ import putawayInfoPopup from '@/pages/putaway/coms/putawayInfoPopup.vue' import jobListCom from '@/mycomponents/jobList/jobList.vue' import winScanButton from '@/mycomponents/scan/winScanButton.vue' import winScanPackJob from '@/mycomponents/scan/winScanPackJob.vue' +import { useCountStore } from '@/store' +// 获取自定义的store +const store = useCountStore() const { proxy } = getCurrentInstance() const jobList = ref([]) @@ -114,6 +117,12 @@ const getList = (type) => { value: status.value }) + filters.push({ + column: 'accept_user_id', + action: '==', + value: store.id + }) + const params = { filters, pageNo: pageNo.value, diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue index 9245d667..f10dfa26 100644 --- a/src/pages/repleinsh/job/repleinshJob.vue +++ b/src/pages/repleinsh/job/repleinshJob.vue @@ -31,6 +31,10 @@ import comRepleinshJobCard from '@/pages/repleinsh/coms/comRepleinshJobCard.vue' import repleinshJobListPopup from '@/pages/repleinsh/coms/repleinshJobListPopup.vue' import repleinshInfoPopup from '@/pages/repleinsh/coms/repleinshInfoPopup.vue' +import { useCountStore } from '@/store' +// 获取自定义的store +const store = useCountStore() + const { proxy } = getCurrentInstance() const jobList = ref([]) const pageNo = ref(1) @@ -106,6 +110,11 @@ const getList = (type, fromLocationCode = '') => { action: 'in', value: status.value }) + filters.push({ + column: 'accept_user_id', + action: '==', + value: store.id + }) if (fromLocationCode != '') { // 来源库位 filters.push({ diff --git a/src/pages/scrap/job/scrapJob.vue b/src/pages/scrap/job/scrapJob.vue index 8fb604d7..5628c65b 100644 --- a/src/pages/scrap/job/scrapJob.vue +++ b/src/pages/scrap/job/scrapJob.vue @@ -28,6 +28,9 @@ import jobFilter from '@/mycomponents/job/jobFilter.vue' import comScrapJobCard from '@/pages/scrap/coms/comScrapJobCard.vue' import scrapJobListPopup from '@/pages/scrap/coms/scrapJobListPopup.vue' import scrapInfoPopup from '@/pages/scrap/coms/scrapInfoPopup.vue' +import { useCountStore } from '@/store' +// 获取自定义的store +const store = useCountStore() const { proxy } = getCurrentInstance() const jobList = ref([]) @@ -105,7 +108,11 @@ const getList = (type) => { action: 'in', value: status.value }) - + filters.push({ + column: 'accept_user_id', + action: '==', + value: store.id + }) const params = { filters, pageNo: pageNo.value, diff --git a/src/pages/transfer/job/issueJob.vue b/src/pages/transfer/job/issueJob.vue index ea536b7f..e65d02d3 100644 --- a/src/pages/transfer/job/issueJob.vue +++ b/src/pages/transfer/job/issueJob.vue @@ -40,6 +40,9 @@ import jobFilter from '@/mycomponents/job/jobFilter.vue' import comTransferJobCard from '@/pages/transfer/coms/comTransferJobCard.vue' import jobListPopup from '@/pages/transfer/coms/jobListPopup.vue' import jobInfoPopup from '@/pages/transfer/coms/jobInfoPopup.vue' +import { useCountStore } from '@/store' +// 获取自定义的store +const store = useCountStore() const { proxy } = getCurrentInstance() const jobList = ref([]) @@ -115,7 +118,11 @@ const getList = (type) => { action: 'in', value: status.value }) - + filters.push({ + column: 'accept_user_id', + action: '==', + value: store.id + }) const params = { filters, pageNo: pageNo.value, diff --git a/src/pages/transfer/job/receiptJob.vue b/src/pages/transfer/job/receiptJob.vue index fcdf0241..d01dfa46 100644 --- a/src/pages/transfer/job/receiptJob.vue +++ b/src/pages/transfer/job/receiptJob.vue @@ -30,6 +30,9 @@ import jobFilter from '@/mycomponents/job/jobFilter.vue' import comTransferJobCard from '@/pages/transfer/coms/comTransferJobCard.vue' import jobListPopup from '@/pages/transfer/coms/jobListPopup.vue' import jobInfoPopup from '@/pages/transfer/coms/jobInfoPopup.vue' +import { useCountStore } from '@/store' +// 获取自定义的store +const store = useCountStore() const { proxy } = getCurrentInstance() const jobList = ref([]) @@ -105,7 +108,11 @@ const getList = (type) => { action: 'in', value: status.value }) - + filters.push({ + column: 'accept_user_id', + action: '==', + value: store.id + }) const params = { filters, pageNo: pageNo.value, diff --git a/src/pages/unPlanned/job/issueJob.vue b/src/pages/unPlanned/job/issueJob.vue index ff1cbb2d..5141edd6 100644 --- a/src/pages/unPlanned/job/issueJob.vue +++ b/src/pages/unPlanned/job/issueJob.vue @@ -32,6 +32,10 @@ import comIssueJobCard from '@/pages/unPlanned/coms/comIssueJobCard.vue' import jobListPopup from '@/pages/unPlanned/coms/jobListPopup.vue' import jobInfoPopup from '@/pages/unPlanned/coms/jobInfoPopup.vue' +import { useCountStore } from '@/store' +// 获取自定义的store +const store = useCountStore() + const { proxy } = getCurrentInstance() const jobList = ref([]) @@ -107,7 +111,11 @@ const getList = (type) => { action: 'in', value: status.value }) - + filters.push({ + column: 'accept_user_id', + action: '==', + value: store.id + }) const params = { filters, pageNo: pageNo.value, diff --git a/src/pages/unPlanned/job/receiptJob.vue b/src/pages/unPlanned/job/receiptJob.vue index 6d96b1b1..794afbb7 100644 --- a/src/pages/unPlanned/job/receiptJob.vue +++ b/src/pages/unPlanned/job/receiptJob.vue @@ -39,6 +39,9 @@ import jobFilter from '@/mycomponents/job/jobFilter.vue' import comReceiptJobCard from '@/pages/unPlanned/coms/comReceiptJobCard.vue' import jobListPopup from '@/pages/unPlanned/coms/jobListPopup.vue' import jobInfoPopup from '@/pages/unPlanned/coms/jobInfoPopup.vue' +import { useCountStore } from '@/store' +// 获取自定义的store +const store = useCountStore() const { proxy } = getCurrentInstance() @@ -115,7 +118,11 @@ const getList = (type) => { action: 'in', value: status.value }) - + filters.push({ + column: 'accept_user_id', + action: '==', + value: store.id + }) const params = { filters, pageNo: pageNo.value,