diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue index 0e441c34..7ca78774 100644 --- a/src/pages/count/job/countJob.vue +++ b/src/pages/count/job/countJob.vue @@ -20,7 +20,7 @@ - + @@ -84,7 +84,8 @@ creationTime: "", status: "1,2", fromLocationCode: "" - } + }, + manageModel:import.meta.env.VITE_MANAGE_MODEL }; }, onLoad(option) { diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue index 7afeb8c0..5f2e24a1 100644 --- a/src/pages/issue/job/issueJob.vue +++ b/src/pages/issue/job/issueJob.vue @@ -25,7 +25,7 @@ - + @@ -114,7 +114,8 @@ businessTypeCode: "Issue", businessType: null, timer: null, - productionLineCode:"" + productionLineCode:"", + manageModel:import.meta.env.VITE_MANAGE_MODEL }; }, onLoad(option) { @@ -244,6 +245,9 @@ uni.hideLoading(); if (type === "refresh") { uni.stopPullDownRefresh(); + if(this.manageModel!='BY_BATCH'){ + this.openScanPopup() + } } var list = res.data.list; @@ -260,9 +264,7 @@ if (type === "refresh") { uni.stopPullDownRefresh(); } - if(this.jobList.length>0){ - this.openScanPopup() - } + }).catch(error => { if (type === "refresh") { uni.stopPullDownRefresh(); diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue index baf01cda..3a722ba8 100644 --- a/src/pages/productReceipt/job/productReceiptJob.vue +++ b/src/pages/productReceipt/job/productReceiptJob.vue @@ -20,7 +20,7 @@ - + @@ -84,7 +84,8 @@ detailOptions: [], detailGiveupOptions: [], scanMessage: "", - timer:null + timer:null, + manageModel:import.meta.env.VITE_MANAGE_MODEL }; }, // 装配收货:type = 'assemble' diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue index cb517066..b1a8c9b6 100644 --- a/src/pages/purchaseReceipt/job/receiptJob.vue +++ b/src/pages/purchaseReceipt/job/receiptJob.vue @@ -20,7 +20,7 @@ - + @@ -78,7 +78,9 @@ status: '1,2', //待处理 、进行中 detailOptions: [], detailGiveupOptions: [], - scanMessage: "" + scanMessage: "", + manageModel:import.meta.env.VITE_MANAGE_MODEL, + scanHintTitle:"" }; }, @@ -153,6 +155,12 @@ this.getList("more"); }, refresh() { + if(this.manageModel=='BY_BATCH'){ + this.scanHintTitle="ASN单号" + }else { + this.scanHintTitle="箱标签/ASN单号" + } + this.getList('refresh'); }, openFilter() { @@ -397,6 +405,10 @@ value: this.$store.state.user.id }] } else { + if(this.manageModel=="BY_BATCH"){ + this.showMessage("请扫描ASN单号") + return; + } filters = [{ column: "packingNumber", action: "in", diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue index a55c07e8..cd09fa03 100644 --- a/src/pages/putaway/job/putawayJob.vue +++ b/src/pages/putaway/job/putawayJob.vue @@ -21,7 +21,7 @@ - + @@ -84,7 +84,8 @@ detailOptions: [], detailGiveupOptions: [], title: '', - scanMessage: "" + scanMessage: "", + manageModel:import.meta.env.VITE_MANAGE_MODEL }; }, @@ -174,7 +175,9 @@ uni.hideLoading(); if (type === "refresh") { uni.stopPullDownRefresh(); - this.openScanPopup() + if(this.manageModel!='BY_BATCH'){ + this.openScanPopup() + } } var list = res.data.list;