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

src/App.vue

@@ -75,7 +75,7 @@ export default {
   overflow: scroll !important;
 }
 ::-webkit-scrollbar {
-  width: 0 !important;
+  width: 10px !important;
   height: 10px !important;
 }
 ::-webkit-scrollbar-thumb {

src/common.js

@@ -1,8 +1,10 @@
 
    const houseName= [{ payname: "" },{ payname: "" },{ payname: "" },{ payname: "" }]
    let commonWeighingList = []
+   const name = ''
 
 export default {
     houseName,
-    commonWeighingList
+    commonWeighingList,
+    name
 }

src/views/houseSelfCollect/settlement.vue

@@ -388,6 +388,7 @@
       :visible.sync="isShowPrint"
       title="中天昊元粮食贸易有限公司结算凭证"
        @close="closeDialog"
+       :modal-append-to-body = "false"
     >
       <paymentPrint :printData="printData" ref="saveImg"></paymentPrint>
       <div style="text-align:center">

src/views/houseSelfCollect/weighingManagement.vue

@@ -199,6 +199,7 @@ export default {
          this.purchasePriceList = this.warehouseList[i].warehouseList
           this.allowEdit = this.warehouseList[i].allowEdit
             this.WAREHOUSE[2].payname = this.warehouseList[i].value
+             this.common.name  =  this.warehouseList[0].value
         }
       }
       this.getList()
@@ -262,6 +263,7 @@ export default {
           this.allowEdit = this.warehouseList[0].allowEdit
           this.warehouseId = this.warehouseList[0].warehouseId
           this.purchasePriceList = this.warehouseList[0].warehouseList
+           this.common.name  =  this.warehouseList[0].value
          this.getList()
         })
     },
@@ -286,7 +288,7 @@ export default {
             }else{
               response.records[i].allow = 1
             }  
-          }debugger
+          }
           this.weighingList = response.records
           this.common.commonWeighingList  = response.records
           this.deptBudgetTotal = response.total