Finish Hotfix-59

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

@@ -158,6 +158,10 @@
           <div class="label">备注</div>
           <div class="value">{{ detailList.applyNote }}</div>
         </el-col>
+        <el-col v-if="isCustomer" :xs="24" :sm="24" :lg="16" class="item">
+          <div class="label">格力内部备注</div>
+          <div class="value">{{  }}</div>
+        </el-col>
         <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">寄厂日期</div>
           <div class="value">
@@ -420,6 +424,7 @@ export default {
   },
   data() {
     return {
+      isCustomer: JSON.parse(localStorage.getItem("supply_user")).isCustomer,
       isDis: true,
       imageURL: this.$imageUrl,
       title: "审批",

src/views/finance/receipt_list.vue

@@ -72,7 +72,7 @@
       <!-- 列表 -->
       <div class="mymain-container">
         <div class="table">
-          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
+          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="getSummaries">
             <el-table-column align="left" label="单据类型" prop="billType" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
@@ -177,6 +177,7 @@ import {
   getK3ReceiptExport,
 } from "@/api/finance/receipt_list";
 import ReceiptListDetail from "./components/receipt_list-detail";
+import { numToFixed } from "@/filters";
 export default {
   components: {
     ReceiptListDetail,
@@ -212,6 +213,52 @@ export default {
     this.getDataList({ pageSize: this.pageSize, pageNum: this.currentPage });
   },
   methods: {
+    //合计
+    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) => {
+            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;
+            } 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;
+            }
+            return v.amount;
+          });
+          let a = map1.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] = numToFixed(a);
+        }
+      });
+      return sums;
+    },
     //弃审
     async NoExamineFn(id) {
       await getK3ReceiptAbandon({ id });
@@ -244,10 +291,10 @@ export default {
     async getDataList(data) {
       const res = await getK3ReceiptList(data);
       // console.log(res);
-      res.data.records.forEach((item) => {
-        item.sums1 = [];
-        item.sums2 = ["amount"];
-      });
+      // res.data.records.forEach((item) => {
+      //   item.sums1 = [];
+      //   item.sums2 = ["amount"];
+      // });
       this.dataList = res.data.records;
       this.listTotal = res.data.total;
     },

src/views/finance/standbook_list.vue

@@ -319,6 +319,7 @@ import {
   getCustomerList,
   getAmountCount,
 } from "@/api/finance/standbook_list";
+import { numToFixed } from "@/filters";
 
 export default {
   data() {
@@ -511,16 +512,15 @@ export default {
         }
       });
 
-      let sum = map1
-        .reduce((prev, curr) => {
-          const value = Number(curr);
-          if (!isNaN(value)) {
-            return prev + curr;
-          } else {
-            return prev;
-          }
-        }, 0)
-        .toFixed(2);
+      let sum1 = map1.reduce((prev, curr) => {
+        const value = Number(curr);
+        if (!isNaN(value)) {
+          return prev + curr;
+        } else {
+          return prev;
+        }
+      }, 0);
+      let sum = numToFixed(sum1);
       return sum;
     },
     //合计
@@ -538,16 +538,15 @@ export default {
               return v.amount;
             }
           });
-          sums[index] = map1
-            .reduce((prev, curr) => {
-              const value = Number(curr);
-              if (!isNaN(value)) {
-                return prev + curr;
-              } else {
-                return prev;
-              }
-            }, 0)
-            .toFixed(2);
+          let a = map1.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] = numToFixed(a);
         }
         if (index === 11) {
           let map1 = data.map((v) => {
@@ -555,61 +554,57 @@ export default {
               return v.amount;
             }
           });
-          sums[index] = map1
-            .reduce((prev, curr) => {
-              const value = Number(curr);
-              if (!isNaN(value)) {
-                return prev + curr;
-              } else {
-                return prev;
-              }
-            }, 0)
-            .toFixed(2);
+          let a = map1.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] = numToFixed(a);
         }
         if (index === 12) {
           let map1 = data.map((v) => {
             return v.allowanceAmount;
           });
-          sums[index] = map1
-            .reduce((prev, curr) => {
-              const value = Number(curr);
-              if (!isNaN(value)) {
-                return prev + curr;
-              } else {
-                return prev;
-              }
-            }, 0)
-            .toFixed(2);
+          let a = map1.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] = numToFixed(a);
         }
         if (index === 13) {
           let map1 = data.map((v) => {
             return v.withholdAmount;
           });
-          sums[index] = map1
-            .reduce((prev, curr) => {
-              const value = Number(curr);
-              if (!isNaN(value)) {
-                return prev + curr;
-              } else {
-                return prev;
-              }
-            }, 0)
-            .toFixed(2);
+          let a = map1.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] = numToFixed(a);
         }
         if (index === 14) {
           let map1 = data.map((v) => {
             return v.balanceAmount;
           });
-          sums[index] = map1
-            .reduce((prev, curr) => {
-              const value = Number(curr);
-              if (!isNaN(value)) {
-                return prev + curr;
-              } else {
-                return prev;
-              }
-            }, 0)
-            .toFixed(2);
+          let a = map1.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] = numToFixed(a);
         }
       });
       return sums;
@@ -644,16 +639,15 @@ export default {
           let map2 = data.map((v) => {
             return v.balanceAmount;
           });
-          sums[index] = map2
-            .reduce((prev, curr) => {
-              const value = Number(curr);
-              if (!isNaN(value)) {
-                return prev + curr;
-              } else {
-                return prev;
-              }
-            }, 0)
-            .toFixed(2);
+          let aa = map2.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] = numToFixed(aa);
         }
       });