From 88b22acf20e16ea96ac5a9a679dcffaa2fdb29ca Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 23 Oct 2024 09:48:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E5=BA=97=E9=9D=A2=E6=9D=BF=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E7=89=B9=E5=AE=9A=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/AppCarouselList.vue     | 3 ++-
 src/views/AppRealtimePanel.vue    | 3 ++-
 src/views/AppStoreBoardFilter.vue | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/AppCarouselList.vue b/src/views/AppCarouselList.vue
index ebb3793..a71d4a1 100644
--- a/src/views/AppCarouselList.vue
+++ b/src/views/AppCarouselList.vue
@@ -44,8 +44,9 @@ export default {
   methods: {
     getData() {
       const {$waitFor, $http} = window
+      const {type, compareDate} = this.search
       console.log("筛选条件:", this.search)
-      $waitFor($http).then(() => Promise.all([this.getCameras(), this.getStoreKeyGoods(), this.getCategorySales()]))
+      $waitFor($http && (type != 3 || compareDate)).then(() => Promise.all([this.getCameras(), this.getStoreKeyGoods(), this.getCategorySales()]))
           .then(() => {
             this.list = [
               {label: "西点柜", value: "104"},
diff --git a/src/views/AppRealtimePanel.vue b/src/views/AppRealtimePanel.vue
index cba9257..7f9d01e 100644
--- a/src/views/AppRealtimePanel.vue
+++ b/src/views/AppRealtimePanel.vue
@@ -31,7 +31,8 @@ export default {
   methods: {
     getData() {
       const {$http, $waitFor} = window
-      $waitFor($http).then(() => $http.post('/data-boot/la/screen/singleStoreBoard/overview', {...this.search}).then(res => {
+      const {type, compareDate} = this.search
+      $waitFor($http&& (type != 3 || compareDate)).then(() => $http.post('/data-boot/la/screen/singleStoreBoard/overview', {...this.search}).then(res => {
         if (res?.data) {
           this.info = res.data
         }
diff --git a/src/views/AppStoreBoardFilter.vue b/src/views/AppStoreBoardFilter.vue
index d2bd929..c6c8aff 100644
--- a/src/views/AppStoreBoardFilter.vue
+++ b/src/views/AppStoreBoardFilter.vue
@@ -49,6 +49,9 @@ export default {
         <el-option v-for="item in dicts.类型" :key="item.value" :label="item.label" :value="item.value"/>
       </el-select>
     </el-form-item>
+    <el-form-item label="特定日期" v-if="form.type==3">
+      <el-date-picker v-model="form.compareDate" @change="v=>$set($storeBoard.search, 'compareDate', v)" clearable type="date" value-format="yyyyMMdd"/>
+    </el-form-item>
     <div class="fill" v-text="storeName"/>
     <el-form-item label="门店">
       <el-select v-model="form.storeCode" @change="v=>$storeBoard.search.storeCode=v" clearable placeholder="全部" class="storeSelect" filterable>