Merge remote-tracking branch 'origin/dev2.5_scan' into dev2.5_scan

src/views/collect/CollectOrderTabs.vue

@@ -821,11 +821,20 @@ export default {
       this.formData.busName = info.busName
       this.autoTag = info.autoTag
       this.editableTabs = []
+
+      if (this.inAndOutType == 1) {
         if (this.productType == 2) {
           this.clickMenuItem(10)
         } else {
           this.clickMenuItem(1000)
         }
+      }else {
+        if (this.productType == 2) {
+          this.clickMenuItem(0)
+        } else {
+          this.clickMenuItem(10000)
+        }
+      }
 
       this.showChild = false
       this.$nextTick(() => {
@@ -847,20 +856,12 @@ export default {
       this.formData.workplaceName = info.workplaceName
       this.editableTabs = []
 
-
-      if (this.workPlaceClass == 2 ){
       if (this.productType == 2) {
         this.clickMenuItem(1)
       } else {
         this.clickMenuItem(100)
       }
-      }else{
-        if (this.productType == 2) {
-          this.clickMenuItem(0)
-        } else {
-          this.clickMenuItem(10000)
-        }
-      }
+
       this.showChild = false
       this.$nextTick(() => {
         this.showChild = true

src/views/collect/DealOrder.vue

@@ -1732,11 +1732,13 @@ export default {
     document.removeEventListener('keydown', this.handleKeydown)
     window.removeEventListener('djcl', this.handleRecCodesEvent)
     document.removeEventListener('visibilitychange', this.handleVisibilityChange)
-
+    if (this.ws != null){
       this.ws.close()
       this.ws.onclose = function (evt) {
         console.log('处理单据 Connection closed.')
       }
+    }
+
 
   },
   created() {