修改bug

src/util/date.js

@@ -106,6 +106,27 @@ export function defaultDate3() {
     dateFormat(endDate, "yyyy-MM-dd")
   ];
 }
+/**
+ * 获取当年
+ * [yyyy-MM-dd,yyyy-MM-dd]
+ */
+ export function defaultDate4() {
+  const date = new Date();
+  return dateFormat(date, "yyyy");
+}
+/**
+ * 获取上月第一天和上月最后一天
+ * [yyyy-MM-dd,yyyy-MM-dd]
+ */
+ export function defaultDate5() {
+  const date = new Date();
+  const startDate = new Date(date.getFullYear(), date.getMonth()-1, 1);
+  const endDate = new Date(date.getFullYear(), date.getMonth(), 0);
+  return [
+    dateFormat(startDate, "yyyy-MM-dd") + " 00:00:00",
+    dateFormat(endDate, "yyyy-MM-dd") + " 23:59:59"
+  ];
+}
 // 获得当前日期
 export function getCurrentDate(type = 'dateTime') {
   const date = new Date();

src/views/statisticAnalysis/AmtAmount/index.vue

@@ -21,6 +21,7 @@
 <script>
 import { getToken } from "@/util/auth";
 import { getList } from "@/api/statisticAnalysis/AmtAmount"
+import { defaultDate4 } from "@/util/date";
 export default {
   name: "index",
   data() {
@@ -36,6 +37,7 @@ export default {
       },
       form: {},
       search: {
+        year:defaultDate4(),
         status: "1"
       },
       dataList: [],
@@ -68,99 +70,123 @@ export default {
         sumColumnList: [
           {
             name: "quantity1",
-            type: "sum"
+            type: "sum",
+            decimals:0
           },
           {
             name: "amount1",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "quantity2",
-            type: "sum"
+            type: "sum",
+            decimals:0
           },
           {
             name: "amount2",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "quantity3",
-            type: "sum"
+            type: "sum",
+            decimals:0
           },
           {
             name: "amount3",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "quantity4",
-            type: "sum"
+            type: "sum",
+            decimals:0
           },
           {
             name: "amount4",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "quantity5",
-            type: "sum"
+            type: "sum",
+            decimals:0
           },
           {
             name: "amount5",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "quantity6",
-            type: "sum"
+            type: "sum",
+            decimals:0
           },
           {
             name: "amount6",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "quantity7",
-            type: "sum"
+            type: "sum",
+            decimals:0
           },
           {
             name: "amount7",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "quantity8",
-            type: "sum"
+            type: "sum",
+            decimals:0
           },
           {
             name: "amount8",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "quantity9",
-            type: "sum"
+            type: "sum",
+            decimals:0
           },
           {
             name: "amount9",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "quantity10",
-            type: "sum"
+            type: "sum",
+            decimals:0
           },
           {
             name: "amount10",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "quantity11",
-            type: "sum"
+            type: "sum",
+            decimals:0
           },
           {
             name: "amount11",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "quantity12",
-            type: "sum"
+            type: "sum",
+            decimals:0
           },
           {
             name: "amount12",
-            type: "sum"
+            type: "sum",
+            decimals:2
           }
         ],
         column: [
@@ -205,121 +231,145 @@ export default {
                 label: "1月数量",
                 prop: "quantity1",
                 overHidden: true,
+                width:100
               },
               {
                 label: "1月金额",
                 prop: "amount1",
                 overHidden: true,
+                width:100
               },
               {
                 label: "2月数量",
                 prop: "quantity2",
                 overHidden: true,
+                width:100
               },
               {
                 label: "2月金额",
                 prop: "amount2",
                 overHidden: true,
+                width:100
               },
               {
                 label: "3月数量",
                 prop: "quantity3",
                 overHidden: true,
+                width:100
               },
               {
                 label: "3月金额",
                 prop: "amount3",
                 overHidden: true,
+                width:100
               },
               {
                 label: "4月数量",
                 prop: "quantity4",
                 overHidden: true,
+                width:100
               },
               {
                 label: "4月金额",
                 prop: "amount4",
                 overHidden: true,
+                width:100
               },
               {
                 label: "5月数量",
                 prop: "quantity5",
                 overHidden: true,
+                width:100
               },
               {
                 label: "5月金额",
                 prop: "amount5",
                 overHidden: true,
+                width:100
               },
               {
                 label: "6月数量",
                 prop: "quantity6",
                 overHidden: true,
+                width:100
               },
               {
                 label: "6月金额",
                 prop: "amount6",
                 overHidden: true,
+                width:100
               },
               {
                 label: "7月数量",
                 prop: "quantity7",
                 overHidden: true,
+                width:100
               },
               {
                 label: "7月金额",
                 prop: "amount7",
                 overHidden: true,
+                width:100
               },
               {
                 label: "8月数量",
                 prop: "quantity8",
                 overHidden: true,
+                width:100
               },
               {
                 label: "8月金额",
                 prop: "amount8",
                 overHidden: true,
+                width:100
               },
               {
                 label: "9月数量",
                 prop: "quantity9",
                 overHidden: true,
+                width:100
               },
               {
                 label: "9月金额",
                 prop: "amount9",
                 overHidden: true,
+                width:100
               },
               {
                 label: "10月数量",
                 prop: "quantity10",
                 overHidden: true,
+                width:100
               },
               {
                 label: "10月金额",
                 prop: "amount10",
                 overHidden: true,
+                width:100
               },
               {
                 label: "11月数量",
                 prop: "quantity11",
                 overHidden: true,
+                width:100
               },
               {
                 label: "11月金额",
                 prop: "amount11",
                 overHidden: true,
+                width:100
               },
               {
                 label: "12月数量",
                 prop: "quantity12",
                 overHidden: true,
+                width:100
               },
               {
                 label: "12月金额",
                 prop: "amount12",
                 overHidden: true,
+                width:100
               }
             ]
           },

src/views/statisticAnalysis/brandProfit/index.vue

@@ -23,6 +23,7 @@
 import { getToken } from "@/util/auth";
 import { getList } from "@/api/statisticAnalysis/brandProfit"
 import { gainUser } from "@/api/basicData/customerInquiry";
+import { defaultDate5 } from "@/util/date";
 export default {
   name: "index",
   data() {
@@ -37,7 +38,9 @@ export default {
         dicData: []
       },
       form: {},
-      search: {},
+      search: {
+        date:defaultDate5()
+      },
       dataList: [],
       loading: false,
       detailData: {},
@@ -67,39 +70,48 @@ export default {
         sumColumnList: [
           {
             name: "quantity",
-            type: "sum"
+            type: "sum",
+            decimals:0
           },
           {
             name: "grossProfit",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "amount",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "thisUsedProfit",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "grossProfit",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "predictOceanFreight",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "netGrossProfit",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "grossProfitRate",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "purchaseAmount",
-            type: "sum"
+            type: "sum",
+            decimals:2
           }
         ],
         column: [

src/views/statisticAnalysis/customerDelivery/index.vue

@@ -23,6 +23,7 @@
 import { getToken } from "@/util/auth";
 import { getList } from "@/api/statisticAnalysis/customerDelivery"
 import { gainUser } from "@/api/basicData/customerInquiry";
+import { defaultDate5 } from "@/util/date";
 export default {
   name: "index",
   data() {
@@ -37,7 +38,9 @@ export default {
         dicData: []
       },
       form: {},
-      search: {},
+      search: {
+        date:defaultDate5()
+      },
       dataList: [],
       loading: false,
       detailData: {},
@@ -67,11 +70,13 @@ export default {
         sumColumnList: [
           {
             name: "quantity",
-            type: "sum"
+            type: "sum",
+            decimals:0
           },
           {
             name: "amount",
-            type: "sum"
+            type: "sum",
+            decimals:2
           }
         ],
         column: [

src/views/statisticAnalysis/customerProfit/index.vue

@@ -22,6 +22,7 @@
 <script>
 import { getToken } from "@/util/auth";
 import { getList } from "@/api/statisticAnalysis/customerProfit"
+import { defaultDate5 } from "@/util/date";
 import { gainUser } from "@/api/basicData/customerInquiry";
 export default {
   name: "index",
@@ -37,7 +38,9 @@ export default {
         dicData: []
       },
       form: {},
-      search: {},
+      search: {
+        date:defaultDate5()
+      },
       dataList: [],
       loading: false,
       detailData: {},
@@ -67,39 +70,48 @@ export default {
         sumColumnList: [
           {
             name: "quantity",
-            type: "sum"
+            type: "sum",
+            decimals:0
           },
           {
             name: "grossProfit",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "amount",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "thisUsedProfit",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "grossProfit",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "predictOceanFreight",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "netGrossProfit",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "grossProfitRate",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "purchaseAmount",
-            type: "sum"
+            type: "sum",
+            decimals:2
           }
         ],
         column: [

src/views/statisticAnalysis/salesmanDelivery/index.vue

@@ -23,6 +23,7 @@
 import { getToken } from "@/util/auth";
 import { getList } from "@/api/statisticAnalysis/salesmanDelivery"
 import { gainUser } from "@/api/basicData/customerInquiry";
+import { defaultDate5 } from "@/util/date";
 export default {
   name: "index",
   data() {
@@ -37,7 +38,9 @@ export default {
         dicData: []
       },
       form: {},
-      search: {},
+      search: {
+        date:defaultDate5()
+      },
       dataList: [],
       loading: false,
       detailData: {},
@@ -67,15 +70,18 @@ export default {
         sumColumnList: [
           {
             name: "quantity",
-            type: "sum"
+            type: "sum",
+            decimals:0
           },
           {
             name: "grossProfit",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "amount",
-            type: "sum"
+            type: "sum",
+            decimals:2
           }
         ],
         column: [

src/views/statisticAnalysis/salesmanProfit/index.vue

@@ -22,6 +22,7 @@
 <script>
 import { getToken } from "@/util/auth";
 import { getList } from "@/api/statisticAnalysis/salesmanProfit"
+import { defaultDate5 } from "@/util/date";
 import { gainUser } from "@/api/basicData/customerInquiry";
 export default {
   name: "index",
@@ -37,7 +38,9 @@ export default {
         dicData: []
       },
       form: {},
-      search: {},
+      search: {
+        date:defaultDate5()
+      },
       dataList: [],
       loading: false,
       detailData: {},
@@ -67,39 +70,48 @@ export default {
         sumColumnList: [
           {
             name: "quantity",
-            type: "sum"
+            type: "sum",
+            decimals:0
           },
           {
             name: "grossProfit",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "amount",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "thisUsedProfit",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "grossProfit",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "predictOceanFreight",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "netGrossProfit",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "grossProfitRate",
-            type: "sum"
+            type: "sum",
+            decimals:2
           },
           {
             name: "purchaseAmount",
-            type: "sum"
+            type: "sum",
+            decimals:2
           }
         ],
         column: [

src/views/statisticAnalysis/specificationsDelivery/index.vue

@@ -23,6 +23,7 @@
 import { getToken } from "@/util/auth";
 import { getList } from "@/api/statisticAnalysis/specificationsDelivery"
 import { gainUser } from "@/api/basicData/customerInquiry";
+import { defaultDate5 } from "@/util/date";
 export default {
   name: "index",
   data() {
@@ -37,7 +38,9 @@ export default {
         dicData: []
       },
       form: {},
-      search: {},
+      search: {
+        date:defaultDate5()
+      },
       dataList: [],
       loading: false,
       detailData: {},
@@ -67,11 +70,13 @@ export default {
         sumColumnList: [
           {
             name: "quantity",
-            type: "sum"
+            type: "sum",
+            decimals:0
           },
           {
             name: "amount",
-            type: "sum"
+            type: "sum",
+            decimals:2
           }
         ],
         column: [