From 8c513de3adeeed2621764e518ed7f9b2cccb62a9 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 8 Oct 2024 15:31:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=87=E6=8D=A2=E9=87=87=E9=9B=86?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E3=80=81=E6=98=AF=E5=90=A6=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/CollectOrderTabs.vue | 9 +++++++++
 src/views/collect/DealOrder.vue        | 9 +++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue
index ae385435..2b1da47b 100644
--- a/src/views/collect/CollectOrderTabs.vue
+++ b/src/views/collect/CollectOrderTabs.vue
@@ -696,6 +696,15 @@ export default {
       this.formData.workplaceId = Number(this.$route.query.workplaceId);
       if(this.workPlaceClass == 1) {
         this.getWorkBindBusTypes(this.formData.workPlaceCode);
+      }else if(this.workPlaceClass == 2) {
+        this.busQuery.workplaceCode = this.formData.workPlaceCode
+        filterListByWorkplace(this.busQuery).then(res => {
+          if (res.code == 20000) {
+            this.busTypeList = res.data.list
+            this.busTypeTotal = res.data.total
+          }
+          return
+        })
       }
     }
   }
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index e711f89b..12433cc7 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -473,6 +473,7 @@ export default {
       },
       curRow: null,
       panelALive: false,
+      autoFinishOrderFlag: true,//是否对完成的单据提示立即提交
 
       //扫码相关
       scanCode: "",
@@ -1160,17 +1161,21 @@ export default {
 
 
     vailOrderFinish() {
+      if (!this.autoFinishOrderFlag){
+        return
+      }
       vailOrderFinish(this.formData).then(res => {
         this.loading = false
         if (res.code == 20000) {
           if (res.data) {
             this.$confirm("单据已赋码或可自动赋码，是否立即完成单据？", '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
+              confirmButtonText: '立即提交',
+              cancelButtonText: '手动扫码',
               type: 'warning'
             }).then(() => {
               this.finishOrder();
             }).catch(() => {
+              this.autoFinishOrderFlag = false
             });
           }
         } else {