diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue index 09821109..f118e522 100644 --- a/src/views/collect/DealOrder.vue +++ b/src/views/collect/DealOrder.vue @@ -385,6 +385,8 @@ import {isBlank} from "@/utils/strUtil"; import JsBarcode from 'jsbarcode'; import { getSet } from '@/api/collect/collectSet' + +import { MessageBox } from 'element-ui'; export default { /** * 处理处方 @@ -496,7 +498,7 @@ export default { }, labelName: 1, scanStatus: null, // 1:扫码剔除; null 处理单据 - collectSet: {} + collectSet: {}, } }, @@ -1200,14 +1202,14 @@ export default { type: 'warning' }).then(() => { this.formData = temp; - this.generateBarcode() + // this.generateBarcode() this.startDeal(); }).catch(() => { }); } else if (temp.tagStatus === 2 || temp.tagStatus === 1) { this.formData = temp; - this.generateBarcode() + // this.generateBarcode() this.panelALive = true this.startDeal(); // this.$confirm('检测到当前工位存在正在处理单据,是否继续上一次单据处理?', '提示', { @@ -1238,7 +1240,7 @@ export default { this.formData = row; this.formData.workPlaceCode = this.workplaceId; this.startDeal(); - this.generateBarcode() + // this.generateBarcode() }, startDeal() { @@ -1752,6 +1754,8 @@ export default { if (event.key === 'F9' || event.keyCode === 120) { event.preventDefault(); // 阻止默认行为 this.finishOrder() + MessageBox.close(); + } if (event.key === 'F10' || event.keyCode === 121) { event.preventDefault(); // 阻止默认行为(如果有的话) @@ -1771,16 +1775,6 @@ export default { } }, - handleKeyboardShortcut(event) { - if (event.key === 'F9' || event.keyCode === 120) { // keyCode 120 是 F9 的键码 - event.preventDefault(); // 阻止默认行为 - this.finishOrder() - } - if (event.key === 'F10' || event.keyCode === 121) { - event.preventDefault(); // 阻止默认行为(如果有的话) - // this.push(); - } - } }, mounted() { this.$refs.inputRef.focus();