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

src/layout/index/top/index.vue

@@ -21,10 +21,10 @@
       <!-- 使用租户 -->
       
       <div class="hidden-content">
-        <el-input ref="hiddenFocus" type="password" class="input-Style" v-model="barCode" size="small" @focus="focus" @blur="blur"
+        <el-input ref="hiddenFocus" style ="ime-mode:disabled"  type="text" class="input-Style" v-model="barCode" size="small" @focus="focus" @blur="blur"
           @keyup.enter.native="payCode" placeholder="扫码枪内容"></el-input>
-        <div v-show="isOpenCodeGun">扫码枪已连接</div>
-        <div v-show="!isOpenCodeGun" @click="setCodeGun">点我扫码</div>
+        <div v-show="isOpenCodeGun" class="code-scan-text">扫码枪已连接</div>
+        <div v-show="!isOpenCodeGun" @click="setCodeGun" class="code-scan-text">点我扫码</div>
         <!--  -->
         <el-dialog title="扫描二维码" :visible.sync="smAlert" width="200px374a8a02ecfe40dc9abdcd902dd564f5
         ">
@@ -50,8 +50,8 @@
           </div>
         </el-dialog>
       </div>
-      <div >
-        <span style="padding: 0 4px;font-size:15px;position:relative;top:-5px;">{{compName}}</span>
+      <div class="compName-row">
+        <span class="compName">{{compName}}</span>
       </div>
       <div v-if="getDay" class="right-menu-item hover-effect dayClass">
         {{ $t('common.trialDays') }}
@@ -734,6 +734,8 @@
   .hidden-content {
     display: flex;
     font-size: 16px;
+    margin-right: 20px;
+    align-items: center;
   }
 
   .input-Style {
@@ -759,4 +761,21 @@
     padding: 20px!important;
     font-size: 40px;
   }
+  .compName{
+    font-size: 16px;
+  }
+  .compName-row{
+    // background: red;
+    display: flex;
+    height: 100%;
+  }
+  .code-scan-text{
+    height: 30px;
+    line-height: 30px;
+    background: #EFF7FD;
+    border-radius: 20px;
+    color:#5473E8 ;
+    border: 1px solid #5473E8;
+    padding: 0 15px;
+  }
 </style>

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -1004,8 +1004,10 @@ export default {
           index === 13 ||
           index === 9
         ) {
-          const values = data.map((item) => Number(item[column.property]))
-          if (!values.every((value) => isNaN(value))) {
+          const values = data.map((item) => Number(item[column.property])) 
+          console.log(values)
+          // console.log(values)
+          if (values.length>0) {
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr)
               if (!isNaN(value)) {
@@ -1015,7 +1017,7 @@ export default {
               }
             }, 0)
           } else {
-            sums[index] = '元'
+            sums[index] = 0
           }
         } else {
           sums[index] = '--'
@@ -1028,7 +1030,7 @@ export default {
         sums[sums.length-4]=sums[sums.length-4].toFixed(2)
       }
       if(typeof sums[sums.length-5]=='number'){
-        sums[sums.length-5]=sums[sums.length-3].toFixed(2)
+        sums[sums.length-5]=sums[sums.length-5].toFixed(2)
       }
       if(typeof sums[sums.length-7]=='number'){
         sums[sums.length-7]=sums[sums.length-7].toFixed(2)