更新

src/components/balanceAlert.vue

@@ -1,9 +1,9 @@
 
 <template>
   <div class="content">
-    <div class="title" v-if="information=='毛重检斤'">毛重</div>
+    <div class="title" v-if="information.indexOf('毛重') > -1">毛重</div>
     <div class="title" v-else>皮重</div>
-    <div class="number" v-if="information=='毛重检斤'">{{grossWeightVal}} kg</div>
+    <div class="number" v-if="information.indexOf('毛重') > -1">{{grossWeightVal}} kg</div>
     <div class="number" v-else>{{tareVal}} KG</div>
     
     <div class="btn" @click="sendVal">确定</div>
@@ -40,7 +40,7 @@ export default {
     sendVal(){
       console.log(this.grossWeightVal)
        console.log(this.tareVal)
-      if(this.information=='毛重检斤'){
+      if(this.information.indexOf('毛重') > -1){
         this.$emit('balanceListen',this.grossWeightVal)
       }else{
         this.$emit('balanceListen',this.tareVal)
@@ -121,7 +121,7 @@ export default {
                 result += tmp
               }
             }
-            if (this.information == '毛重检斤') {
+            if (this.information.indexOf('毛重') > -1) {
               if (parseInt(result) || parseInt(result) == 0) {
                 this.grossWeightVal = parseInt(result)
               }
@@ -145,7 +145,7 @@ export default {
                 result += tmp
               }
             }
-            if (this.information == '毛重检斤') {
+            if (this.information.indexOf('毛重') > -1) {
               if (parseInt(result) || parseInt(result) == 0) {
                 this.grossWeightVal = parseInt(result)
               }
@@ -192,7 +192,7 @@ export default {
                 }
               }
             }
-            if (this.information == '毛重检斤') {
+            if (this.information.indexOf('毛重') > -1) {
               if (parseInt(result) || parseInt(result) == 0) {
                 this.grossWeightVal = parseInt(
                   result + this.result1

src/views/houseSelfCollect/weightCheck.vue

@@ -271,6 +271,7 @@
       this.getList()
       this.tpyeNo = this.$route.query.tpyeNo
       this.warehouseName = this.$route.query.warehouseName
+      this.weighingList.warehouseName = this.$route.query.warehouseName
       this.weighingList.number = this.$route.query.number
       this.weighingList.binNumber = this.$route.query.binNumber
       this.weighingList.customerNumberCard = this.$route.query.customerNumberCard
@@ -299,16 +300,16 @@
         this.disabled = false
       }
       if (this.tpyeNo == 1) {
-        this.information = '毛重检斤'
+        this.information = '毛重'
         this.weighingList.tare = 0
       } else if (this.tpyeNo == 2) {
-        this.information = '皮重检斤'
+        this.information = '皮重'
       }
       this.$route.query.automaticWeightAcquisition = 0
-      if(this.$route.query.automaticWeightAcquisition == '0'){
+      // if(this.$route.query.automaticWeightAcquisition == '1'){
         // this.openPort()
         this.isShowBalance = true
-      }
+      // }
       console.log(this.weighingList)
     },
     deactivated() {
@@ -317,7 +318,7 @@
     },
     methods: {
       setVal(data) {
-        if (this.information == '毛重检斤') {
+        if (this.information == '毛重') {
           this.weighingList.grossWeight = data
         } else {
           this.weighingList.tare = data