Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

src/layout/index/top/index.vue

@@ -21,7 +21,7 @@
       <!-- 使用租户 -->
       
       <div class="hidden-content">
-        <el-input ref="hiddenFocus" type="password" class="input-Style" v-model="barCode" size="small" @focus="focus" @blur="blur" autocomplete="new-password"
+        <el-input ref="hiddenFocus" type="password" class="input-Style" v-model="barCode" size="small" @focus="focus" @blur="blur" autocomplete="new-password" 
           @keyup.enter.native="payCode" placeholder="扫码枪内容"></el-input>
         <div v-show="isOpenCodeGun" class="code-scan-text">扫码枪已连接</div>
         <div v-show="!isOpenCodeGun" @click="setCodeGun" class="code-scan-text">点我扫码</div>
@@ -488,7 +488,7 @@
         console.log("当前已失去焦点状态")
         this.isOpenCodeGun = false
       },
-      goToPage(type) {
+      goToPage(type) {debugger
          this.barCode = ''
         let _url = ''
         if (type === 1) {
@@ -782,7 +782,7 @@
   .input-Style {
     opacity: 1;
     margin-right: 20px;
-    // visibility: hidden;P
+    // visibility: hidden;
   }
 
   .btn {

src/views/houseSelfCollect/weightCheck.vue

@@ -271,10 +271,11 @@
       console.log(this.common.name)
       this.cangid = this.$route.query.cangid
       this.paramType = this.$route.query.paramType
-      this.getList()
       this.tpyeNo = this.$route.query.tpyeNo
       this.warehouseName = this.$route.query.warehouseName
-      this.deptBudgetList.warehouseName = this.$route.query.warehouseName
+      localStorage.setItem('ck', this.warehouseName)
+      this.weighingList.warehouseName = this.$route.query.warehouseName
+      // this.deptBudgetList.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
@@ -314,6 +315,8 @@
         this.isShowBalance = true
       // }
       console.log(this.weighingList)
+      
+      this.getList()
     },
     deactivated() {
       // this.closePort()

src/views/taskManagement/moveWarehouseTask.vue

@@ -69,8 +69,12 @@
         <el-table-column prop="goodsName" label="货名"> </el-table-column>
         <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
         <el-table-column prop="deliveryVolume" label="出库量（吨）">
+          <template slot-scope="scope">
+            {{scope.row.deliveryVolume> 0 ? Number(scope.row.deliveryVolume).toFixed(3):""}}
+          </template>
         </el-table-column>
         <el-table-column prop="storageVolume" label="入库量（吨）">
+          <template slot-scope="scope">{{scope.row.storageVolume > 0 ? Number(scope.row.storageVolume).toFixed(3):""}}</template>
         </el-table-column>
         <el-table-column prop="stockReturnCount" label="退库量（吨）">
            <template slot-scope="scope">