From a8cd04d51941ec8293b2915a161b49a493060629 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Sat, 21 Sep 2024 15:15:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=A4=84=E7=90=86=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/CollectOrderAllotCardComponents.vue | 6 +++++-
 src/views/collect/DealOrder.vue                       | 8 +++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue
index 42a8fd63..30f2743b 100644
--- a/src/views/collect/CollectOrderAllotCardComponents.vue
+++ b/src/views/collect/CollectOrderAllotCardComponents.vue
@@ -718,7 +718,10 @@ export default {
 
     getList() {
       this.loading = true;
-      orderPage(this.filterQuery).then(res => {
+      let query = JSON.parse(JSON.stringify(this.filterQuery));
+      query.workPlaceCode = null
+      query.busType =
+      orderPage(query).then(res => {
         this.loading = false
         this.list = res.data.list || []
         this.total = res.data.total || 0
@@ -817,6 +820,7 @@ export default {
     if (this.$route.query.workplaceId != null) {
       this.isLinkDisabled = true
       this.filterQuery.workPlaceCode = this.$route.query.workplaceId
+      this.filterQuery.busType = this.$route.query.busType
       this.showType = 2
     }
     this.findWorkPlace(this, "");
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 1af5aaf3..63b56192 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -193,9 +193,9 @@
               </el-button-group>
             </el-col>
           </el-row>
-          <el-row :gutter="0" >
-          <el-col :span="20" style="margin-top: 0px;margin-bottom: 10px;margin-left: 80px">
-            <el-checkbox v-model="checked" v-if="!this.formData.billNo">定向查询</el-checkbox>
+          <el-row :gutter="0">
+            <el-col :span="20" style="margin-top: 0px;margin-bottom: 10px;margin-left: 80px">
+              <el-checkbox v-model="checked" v-if="!this.formData.billNo">定向查询</el-checkbox>
             </el-col>
           </el-row>
           <el-alert
@@ -1257,6 +1257,8 @@ export default {
               this.valiCodes.push(item.code);
             }
           });
+          this.$refs.inputRef.focus();
+          this.$refs.inputRef.select();
           this.printMutiCodeResult(list)
           if (this.valiCodes != null && this.valiCodes.length > 0) {
             //批量添加