Merge tag 'Hotfix-60' into develop

Finish Hotfix-60

src/views/deposit_commerce/refund_list.vue

@@ -86,7 +86,7 @@
       <div class="btn-group clearfix">
         <div class="fl">
           <el-radio-group @change="changeEnginOrderTypeFn" v-model="enginOrderType" size="mini">
-            <el-radio-button label="HOME">家用工程</el-radio-button>
+            <!-- <el-radio-button label="HOME">家用工程</el-radio-button> -->
             <el-radio-button label="TRADE">商用工程</el-radio-button>
           </el-radio-group>
         </div>

src/views/deposit_home/refund_list.vue

@@ -87,7 +87,7 @@
         <div class="fl">
           <el-radio-group @change="changeEnginOrderTypeFn" v-model="enginOrderType" size="mini">
             <el-radio-button label="HOME">家用工程</el-radio-button>
-            <el-radio-button label="TRADE">商用工程</el-radio-button>
+            <!-- <el-radio-button label="TRADE">商用工程</el-radio-button> -->
           </el-radio-group>
         </div>
         <div class="fr">

src/views/engin_deposit/components/refund_list-detail.vue

@@ -160,7 +160,7 @@
         </el-col>
         <el-col v-if="isCustomer" :xs="24" :sm="24" :lg="16" class="item">
           <div class="label">格力内部备注</div>
-          <div class="value">{{  }}</div>
+          <div class="value">{{  detailList.geLiInerNote}}</div>
         </el-col>
         <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">寄厂日期</div>

src/views/finance/receipt_list.vue

@@ -174,7 +174,6 @@
 import {
   getK3ReceiptList,
   getK3ReceiptAbandon,
-  getK3ReceiptExport,
 } from "@/api/finance/receipt_list";
 import ReceiptListDetail from "./components/receipt_list-detail";
 import { numToFixed } from "@/filters";
@@ -217,36 +216,23 @@ export default {
     getSummaries(param) {
       const { columns, data } = param;
       const sums = [];
+
       columns.forEach((column, index) => {
         if (index === 0) {
           sums[index] = "合计";
         }
+
         if (index === 7) {
-          let map1 = data.map((v) => {
+          let arr = [];
+          data.forEach((v) => {
             if (v.billType == 2 || v.billType == 3) {
-              v.amount * -1;
-            }
-            return v.amount;
-          });
-          console.log(map1);
-          let aa = map1.reduce((prev, curr) => {
-            const value = Number(curr);
-            if (!isNaN(value)) {
-              return prev + curr;
+              arr.push(-v.amount);
             } else {
-              return prev;
-            }
-          }, 0);
-          sums[index] = numToFixed(aa);
-        }
-        if (index === 10) {
-          let map1 = data.map((v) => {
-            if (v.billType == 2 || v.billType == 3) {
-              v.amount * -1;
+              arr.push(v.amount);
             }
-            return v.amount;
           });
-          let a = map1.reduce((prev, curr) => {
+
+          let a = arr.reduce((prev, curr) => {
             const value = Number(curr);
             if (!isNaN(value)) {
               return prev + curr;
@@ -255,6 +241,7 @@ export default {
             }
           }, 0);
           sums[index] = numToFixed(a);
+          sums[10] = numToFixed(a);
         }
       });
       return sums;