Merge branch 'dev' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc into dev

src/lang/zh.js

@@ -538,6 +538,7 @@ export default {
     warehouseManagementPutOut: '任务',
     warehouseManagementPutOutLook: '查看',
     transformation: '折转',
+    warehouseManagement:'全部仓库',
     //客户管理
     customerList: '客户管理',
     //客户管理
@@ -4874,6 +4875,7 @@ export default {
     warehouseManagementPutOut: '任务',
     warehouseManagementPutOutLook: '查看',
     transformation: '折转',
+    warehouseManagement:'全部仓库'
   },
   //贸易服务
   tradeServicesManagement: {

src/layout/index/top/index.vue

@@ -47,7 +47,7 @@
               <el-button v-hasPermission="`acquisitionManagement.acquisitionPay.add`" v-if="btnStatus.status6"
                 @click="goToPage(5)" class="btn_css">去结算</el-button>
               
-              </el-button>
+              <!-- </el-button> -->
                 <!-- v-if="btnStatus.status2||btnStatus.status3||btnStatus.status4||btnStatus.status5" @click="goToPage(6)" class="btn_css">去称皮重 -->
               <!-- v-show="toPageData.qualityInspectionManagement.confirm != '1'"  -->
               <el-button @click="cancel" class="btn" >关闭</el-button>
@@ -557,7 +557,7 @@
           })
           .toPromise()
           .then((response) => {
-              if (response.otherPersonCharge.indexOf(userName) != -1 || response.personCharge == userName) {
+              if ( response.personCharge == userName || (response.otherPersonCharge && response.otherPersonCharge.indexOf(userName) != -1)) {
                   //扫码枪扫码后显示弹框
                    this.getQRCodeData(this.tmp)
               }else{

src/views/warehousenew/warehouseManagement.vue

@@ -50,7 +50,7 @@
       show-summary
       :summary-method="getSummaries"
       style="width: 100%; margin-top: 20px"
-      height="calc(100% - 45px)"
+      height="calc(100% - 120px)"
     >
       <el-table-column prop="warehouseName" label="仓库名"> </el-table-column>
       <el-table-column prop="binNumber" label="仓位编号"> </el-table-column>