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 {