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

src/views/houseSelfCollect/inspectionManagement.vue

@@ -71,6 +71,7 @@
       <el-table-column
         prop="tidalGrainPrice"
         label="单价（元/公斤）"
+        width="120px"
       ></el-table-column>
       <el-table-column prop="binNumber" label="仓位号"></el-table-column>
       <el-table-column prop="storageTagNo" label="囤位号"></el-table-column>

src/views/houseSelfCollect/paymentManagement.vue

@@ -223,7 +223,7 @@ export default {
   activated() {
     this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
     this.getWarehouse()
-    this.getList()
+    // this.getList()
   },
   methods: {
     handlepass() {
@@ -241,7 +241,7 @@ export default {
       }
       
     },
-    getWarehouse() {
+    getWarehouse() {debugger
       selectWarehouseSelf({
         compId: sessionStorage.getItem('ws-pf_compId')
       })
@@ -254,9 +254,9 @@ export default {
             this.warehouseNameKey = this.WAREHOUSE[3].payname
           } else {
             this.WAREHOUSE[3].payname = this.warehouseList[0].id
+            this.warehouseName =  this.warehouseList[0].warehouseName
           }
-
-          // this.getList()
+          this.getList()
         })
     },
     //上传付款截图