diff --git a/src/mycomponents/qty/recommendQtyEdit.vue b/src/mycomponents/qty/recommendQtyEdit.vue index db2ad1e1..9510cb05 100644 --- a/src/mycomponents/qty/recommendQtyEdit.vue +++ b/src/mycomponents/qty/recommendQtyEdit.vue @@ -108,6 +108,10 @@ import { nextTick } from 'vue'; type: Object, default: null }, + isNumTips: { + type: Boolean, + default: true + }, }, methods: { getPackUnitName(packUnit) { @@ -170,7 +174,7 @@ import { nextTick } from 'vue'; setValue() { // var recommendQty = Number(this.dataContent.qty); // var labelQty = Number(this.dataContent.record.label.qty); - if (this.allQty > this.labelQty) { + if (this.allQty > this.labelQty && this.isNumTips) { this.$refs.comMessage.showErrorMessage('数量[' + this.allQty + ']不允许大于标签数量[' + this.labelQty + ']', diff --git a/src/pages/productReceipt/coms/comProductDetailCardBatch.vue b/src/pages/productReceipt/coms/comProductDetailCardBatch.vue index 2fc2be38..900c0057 100644 --- a/src/pages/productReceipt/coms/comProductDetailCardBatch.vue +++ b/src/pages/productReceipt/coms/comProductDetailCardBatch.vue @@ -25,7 +25,7 @@ - + diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index cca90c6a..0ba7c527 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -792,7 +792,7 @@ pack.handleQty = 0 } }) - detail.toLocationCode = this.toLocationCode + detail.toLocationCode = this.toLocationCode ? this.toLocationCode :this.jobToLocationCode var info = getPackingNumberAndBatch(this.managementList, detail.itemCode, detail.packingNumber, detail.batch); detail.toPackingNumber = info.packingNumber;