From 4dcd203c10b00653e850ba1d79819d0baa3650aa Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Tue, 18 Feb 2025 15:16:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E6=8B=A9=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E4=BC=A0?=
 =?UTF-8?q?=E9=80=92=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/IocCollectOrderCheckCode.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/collect/IocCollectOrderCheckCode.vue b/src/views/collect/IocCollectOrderCheckCode.vue
index fa27c20e..eccd61c4 100644
--- a/src/views/collect/IocCollectOrderCheckCode.vue
+++ b/src/views/collect/IocCollectOrderCheckCode.vue
@@ -204,7 +204,7 @@
       <selectPrescribeDialog
         ref="childRef"
         :workPlaceCode="null"
-        :busType="this.orderData.busType"
+        :busType="this.$route.query.busType"
         :fromCorp="this.orderData.fromCorp"
         :confirmSelect="this.confirmSelect"
         :closeDialog="this.closeDialog"
@@ -229,7 +229,7 @@ import {
 } from '@/api/collect/collectOrder'
 import {checkCollectOrderManCode, draftOrder, finishCheckOrder, updateOrder} from '@/api/collect/splitCreateOrder'
 import selectPrescribeDialog from "@/views/collect/selectCollectOrderDialog";
-import { getSet } from '@/api/collect/collectSet'
+import {getSet} from '@/api/collect/collectSet'
 
 export default {
   name: 'IocCollectOrderCheckCode',
@@ -337,7 +337,7 @@ export default {
       if (this.filterQuery.udiCode.includes(';')) {
         const codeArray = this.filterQuery.udiCode.split(';')
         const verify = this.verifyScanCount(codeArray)
-        if (verify){
+        if (verify) {
           this.filterQuery.udiCodeList = codeArray
           this.filterQuery.udiCode = ''
           this.filterQuery.orderIdFk = this.orderData.billNo
@@ -875,7 +875,9 @@ export default {
       this.scanTitle = '扫码结果:'
       this.scanResultType = 'success'
       this.curRow = null
-      this.orderData = {}
+      this.orderData = {
+        busType: this.$route.query.busType
+      }
       this.codeCount = 0
       this.workplaceId = Number(this.$route.query.workplaceId)
       this.codeList = []
@@ -889,7 +891,7 @@ export default {
       this.getInputFocus()
       this.selectSysParam()
     },
-    verifyScanCount(codeArray){
+    verifyScanCount(codeArray) {
       //判断扫码数量是否超出或少于设置扫码数量
       if (this.collectSet.scanMaxCount != null && this.collectSet.scanMaxCount != 0) {
         if (this.collectSet.scanMaxCount > codeArray.length) {