交接人BUG修复

components/smallScreen/smallScreen.vue

@@ -27,12 +27,12 @@
         },
       }
     },
-    props:{
-      sData:{
-        type:Object
+    props: {
+      sData: {
+        type: Object
       },
-      sType:{
-        type:Number
+      sType: {
+        type: Number
       }
     },
     methods: {
@@ -249,7 +249,11 @@
                   });
                 }
               } else {
-                this.nextDeptOrder_ss(this.currentData);
+                if (type == 1) {
+                  this.nextDeptOrder_ss(this.currentData);
+                } else if (type == 2) {
+                  this.nextDeptOrder_s(this.currentData);
+                }
               }
             } else if (result.state == '0000') {
               uni.hideLoading();
@@ -341,12 +345,13 @@
 </script>
 
 <style lang="less">
-.smallScreen{
-  width: 100%;
-  height: 100%;
-  .smallScreen_scan{
+  .smallScreen {
     width: 100%;
     height: 100%;
+
+    .smallScreen_scan {
+      width: 100%;
+      height: 100%;
+    }
   }
-}
 </style>

http/http.js

@@ -86,7 +86,8 @@ export function SM() {
     uni.scanCode({
       onlyFromCamera: true,
       success: function(res) {
-        let str = res.result.replace(/[\s\/]/g, '') || 'none'
+        let str = res.result.replace(/[\s\/]/g, '') || 'none';
+        str.replace(/CODABAR,/i, '');
         resolve(str);
       },
       fail(err) {