Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

public/static/payprint.html

@@ -156,7 +156,7 @@
       }
 
       .center {
-        height: 145vh;
+        height: 140vh;
       }
 
       .part2 {
@@ -278,12 +278,11 @@
                   <td class="col">
                     {{ printData1[index].qualityInspectionManagement.impurity}}
                   </td>
-                  <td class="col">{{printData.qualityInspectionManagement.bulkDensity}}</td>
+                  <td class="col">  {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.bulkDensity:''}}</td>
                   <td class="col">{{ printData1[index].grossWeight}}</td>
                   <td class="col">{{ printData1[index].tare}}</td>
                   <td class="col">
-                    {{
-                    printData1[index].weighingManagement.buckleMiscellaneous}}
+                    {{printData1[index].weighingManagement?printData1[index].weighingManagement.buckleMiscellaneous:''}}
                   </td>
                   <td class="col">{{ printData1[index].netWeight}}</td>
                   <!-- <td class="col">{{ printData1[index].pureWeight}}</td> -->
@@ -1111,18 +1110,18 @@
           )
           for (let i = 0; i < this.printData1.length; i++) {
             if(!this.printData1[i].identityAuthenticationInfo.compAddress) this.printData1[i].identityAuthenticationInfo.compAddress=''
-            if (this.printData1[i].identityAuthenticationInfo.compAddress.length > 28) {
+            if (this.printData1[i].identityAuthenticationInfo.compAddress.length > 24) {
               this.printData1[i].identityAuthenticationInfo.compAddress = this.printData1[i]
                 .identityAuthenticationInfo
-                .compAddress.substring(0, 28)
+                .compAddress.substring(0, 24)
             }
           }
         } else {
           this.printData = JSON.parse(_data)
           //地址过长截取
-          if (this.printData.identityAuthenticationInfo.compAddress.length > 28) {
+          if (this.printData.identityAuthenticationInfo.compAddress.length > 24) {
             this.printData.identityAuthenticationInfo.compAddress = this.printData.identityAuthenticationInfo
-              .compAddress.substring(0, 28)
+              .compAddress.substring(0, 24)
           }
           this.selectPrint = false
         }

public/static/weightCheck.html

@@ -22,7 +22,7 @@
         width: 1000px;
         padding: 30px 20px 20px 20px;
         font-size: 18px;
-        height: 65vh;
+        height: 660px;
       }
 
       .a5-content {