diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue index dfcad073..a360b898 100644 --- a/src/mycomponents/scan/winScanPackAndLocation.vue +++ b/src/mycomponents/scan/winScanPackAndLocation.vue @@ -40,7 +40,7 @@ + :clearResult="true" :headerType="headerType" :locationCode='fromLocationCode'> @@ -282,7 +282,7 @@ // this.packGetFocus(); // 如果只回显 if(this.isJustReplay){ - this.$emit("getResult",scanResult); + this.$emit("getResult",scanResult, this.managementPrecision); uni.hideLoading() }else{ this.checkPackage(scanResult); diff --git a/src/pages/unPlanned/job/issueJobDetail.vue b/src/pages/unPlanned/job/issueJobDetail.vue index 7ce5a9ec..bba58a3a 100644 --- a/src/pages/unPlanned/job/issueJobDetail.vue +++ b/src/pages/unPlanned/job/issueJobDetail.vue @@ -243,8 +243,12 @@ this.$refs.detailInfoPopup.openPopup(item) }, - getScanResult(result) { - if(import.meta.env.VITE_MANAGE_MODEL == 'BY_BATCH'){ + getScanResult(result,managementPrecision) { + console.log(33,result,managementPrecision) + if(managementPrecision == 'BY_QUANTITY'){ + result.label.batch = '' + this.setDataBatch(result) + }else if(managementPrecision == 'BY_BATCH' ){ this.setDataBatch(result) }else{ this.setData(result)