snow 1 年之前
父节点
当前提交
6c1d4695e0

文件差异内容过多而无法显示
+ 0 - 0
dist/index.html


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.d7e54df0.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.27c4acc7.js


二进制
dist/static/js/app.d85b7f6b.js.gz → dist/static/js/app.27c4acc7.js.gz


+ 12 - 7
src/components/newReport/src/sendExp.vue

@@ -22,7 +22,7 @@
         <el-table-column label="C3-7天内" prop="3" />
         <el-table-column label="D14天内" prop="4" />
         <el-table-column label="E30天内" prop="5" />
-        <el-table-column label="F超30天" prop="5" />
+        <el-table-column label="F超30天" prop="6" />
       </el-table-column>
 
       <el-table-column label="总计">
@@ -150,12 +150,13 @@ export default {
         const list = []
         Object.keys(res.data).forEach(key => {
           const { name , result = {}} = res.data[key]
+          console.log(result)
           if(result.length === 0){
             list.push({name, 0: '--',  1:0, 2:0, 3:0,  4:0, 5:0, 6:0 })
           }else{
             Object.keys(result).forEach(key => {
-            list.push({ name, ...result[key] })
-          })
+              list.push({ name, ...result[key] })
+            })
           }
         })
 
@@ -164,10 +165,12 @@ export default {
           ...list.reduce((prev,current) => {
             const {name,...rest} = current;
             const keys = Object.keys(rest)
-            return keys.reduce((pObj,key) => ({
-              ...pObj,
-              [key]:addition(current[key] || 0,prev[key] || 0)
-            }),{})
+            return keys.reduce((pObj,key) => {
+              return {
+                ...pObj,
+                [key]:addition(current[key] || 0,prev[key] || 0)
+              }
+            },{})
           }, {})
         }
 
@@ -177,6 +180,8 @@ export default {
         list.push(totalItem)  
 
         this.tableData = list
+
+        console.log(list)
       } else {
         this.tableData = [];
       }

+ 0 - 1
src/pages/stock.vue

@@ -43,7 +43,6 @@ import SendExp from "../components/newReport/src/sendExp.vue";
 import Order from '../components/newReport/src/order.vue';
 import Stock from "../components/newReport/src/Stock.vue";
 
-
 import dayjs from "dayjs"
 import UnusualState from "@/components/unusual/index.vue";
 import { getOpenid, getParameterByName, removeOpenid, setOpenid } from "../utils/auth";

部分文件因为文件数量过多而无法显示