diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue
index 30f2743b..59f176f8 100644
--- a/src/views/collect/CollectOrderAllotCardComponents.vue
+++ b/src/views/collect/CollectOrderAllotCardComponents.vue
@@ -720,7 +720,6 @@ export default {
       this.loading = true;
       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 || []
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 63b56192..39358502 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -661,6 +661,8 @@ export default {
       _this.$nextTick(() => {
         _this.panelALive = true;
       });
+
+      _this.vailOrderFinish();
     },
     refreshCodesPanelP() {
       let _this = this
@@ -668,6 +670,7 @@ export default {
       _this.$nextTick(() => {
         _this.panelALive = true;
       });
+      _this.vailOrderFinish();
     },
 
     getInputFocus(event) {
@@ -995,7 +998,7 @@ export default {
     //获取下一单据
     nextCollectOrder() {
       let nextQuery = {
-        workPlaceCode: this.formData.workPlaceCode
+        busType: this.formData.busType
       }
       getNextOrder(nextQuery).then(res => {
         this.loading = false
@@ -1012,7 +1015,7 @@ export default {
 
     findCurOrder() {
       let nextQuery = {
-        workPlaceCode: this.formData.workPlaceCode,
+        // workPlaceCode: this.formData.workPlaceCode,
         busType: this.formData.busType
       }
       getCurOrder(nextQuery).then(res => {
@@ -1029,7 +1032,7 @@ export default {
               this.startDeal();
             }).catch(() => {
             });
-          } else if (temp.tagStatus === 2) {
+          } else if (temp.tagStatus === 2 || temp.tagStatus === 1) {
 
             this.formData = temp;
             this.startDeal();
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index bed6d7c0..645a830e 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -1925,6 +1925,12 @@ export default {
     },
 
     batchVailCode(params) {
+      if (this.$isBlank(this.orderFormData.corpOrderId)) {
+        let date = new Date();
+        this.orderFormData.corpOrderId =
+          parseTime(date, "{y}{m}{d}{h}{i}{s}") +
+          Math.ceil(Math.random() * 89 + 10);
+      }
       batchVailCode(params).then((response) => {
         if (response.code === 20000) {
           console.log("==滴码接收==", response.data);
@@ -1939,18 +1945,16 @@ export default {
           this.$refs.inputRef.focus();
           this.$refs.inputRef.select();
           if (this.valiCodes != null && this.valiCodes.length > 0) {
-
-            if (this.$isBlank(this.orderFormData.corpOrderId)) {
-              let date = new Date();
-              this.orderFormData.corpOrderId =
-                parseTime(date, "{y}{m}{d}{h}{i}{s}") +
-                Math.ceil(Math.random() * 89 + 10);
-            }
-
             this.orderFormData.codeList = this.valiCodes
+            if (this.splitType == "out")
+              this.orderFormData.inoutType = 1
+            else
+              this.orderFormData.inoutType = 2
+            // this.orderFormData.inoutType = this.splitType;
             batchAddCode(this.orderFormData).then((res) => {
               if (res.code === 20000) {
-                this.orderFormData.billNo = res.data.orderId;
+                if (res.data.orderId != null)
+                  this.orderFormData.billNo = res.data.orderId;
                 this.refreshCodesPanel(this);
                 this.printMutiCodeResult(res.data.vailCodeResultResponses)
               } else {
diff --git a/src/views/collect/selectCollectOrderDialog.vue b/src/views/collect/selectCollectOrderDialog.vue
index 2566af1f..f757e2c0 100644
--- a/src/views/collect/selectCollectOrderDialog.vue
+++ b/src/views/collect/selectCollectOrderDialog.vue
@@ -645,7 +645,10 @@ export default {
       // this.filterQuery.fromCorp = this.fromCorp
       this.filterQuery.excludeWorkCode = null
       this.filterQuery.tagStatus = 1
-      orderPage(this.filterQuery).then(res => {
+
+      let query = JSON.parse(JSON.stringify(this.filterQuery));
+      query.workPlaceCode = null
+      orderPage(query).then(res => {
         this.loading = false
         this.list = res.data.list || []
         this.total = res.data.total || 0