From d5c52c0098f8d0aefbbc1d1a6610fd9ea5183311 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 22 Oct 2024 15:50:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4-7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/AppMultipleStoreBoard.vue       |  2 +-
 src/views/AppMultipleStoreBoardFilter.vue |  2 +-
 src/views/AppStoresTable.vue              | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/AppMultipleStoreBoard.vue b/src/views/AppMultipleStoreBoard.vue
index 6c4d21b..41ca0cc 100644
--- a/src/views/AppMultipleStoreBoard.vue
+++ b/src/views/AppMultipleStoreBoard.vue
@@ -12,7 +12,7 @@ export default {
 
 <template>
   <section class="AppMultipleStoreBoard">
-    <app-navbar/>
+    <app-navbar class="mb-10"/>
     <app-multiple-store-board-filter/>
     <app-stores-table class="fill"/>
   </section>
diff --git a/src/views/AppMultipleStoreBoardFilter.vue b/src/views/AppMultipleStoreBoardFilter.vue
index 7d2b9ce..7b5de11 100644
--- a/src/views/AppMultipleStoreBoardFilter.vue
+++ b/src/views/AppMultipleStoreBoardFilter.vue
@@ -41,7 +41,7 @@ export default {
       setTimeout(() => {
         const {dayjs} = window
         const hourNum = new Date().getHours(), groupCodeList = "", interval = 60000
-        const currentDate = dayjs().format("YYYYMMDD")
+        const currentDate = dayjs().subtract(7, 'day').format("YYYYMMDD")
         this.form = {hourNum, groupCodeList, type: "1", changeWay: "1", currentDate, interval}
         this.$set(this.$multipleStoreBoard, 'search', {hourNum, groupCodeList: [], type: "1", changeWay: "1", categoryId: "", currentDate, interval})
       }, 500)
diff --git a/src/views/AppStoresTable.vue b/src/views/AppStoresTable.vue
index 628d41a..cfa4680 100644
--- a/src/views/AppStoresTable.vue
+++ b/src/views/AppStoresTable.vue
@@ -14,11 +14,11 @@ export default {
       columns: {
         品类销售情况: [
           {label: "品类", prop: "secondCategoryName"},
-          {label: "销售额", prop: "currentSaleAmt", width: 70},
-          {label: "库存金额", prop: "currentStockAmt", width: 80},
-          {label: "同/环比销售额", prop: "compareSaleAmt", width: 70},
-          {label: "同/环比库存金额", prop: "compareStockAmt", width: 70},
-          {label: "前四周日均销售额", prop: "avg4WeekSaleAmt", width: 70},
+          {label: "销售额", prop: "currentSaleAmt"},
+          {label: "库存金额", prop: "currentStockAmt"},
+          // {label: "同/环比销售额", prop: "compareSaleAmt", width: 70},
+          // {label: "同/环比库存金额", prop: "compareStockAmt", width: 70},
+          // {label: "前四周日均销售额", prop: "avg4WeekSaleAmt", width: 70},
         ],
         重点单品情况: [
           {label: "重点单品", prop: "name"},
@@ -75,7 +75,7 @@ export default {
   methods: {
     getData() {
       const {$http, $waitFor} = window
-      const {groupCodeList, type, compareDate} = this.search
+      const { type, compareDate} = this.search
       console.log("筛选条件:", this.search)
       return $waitFor($http && (type != 3 || compareDate)).then(() => this.getStores())
           .then(codes => Promise.all([this.getCameras(), this.getStoreKeyGoods(), this.getCategorySales()]).then(() => codes))