From dd04a64368a48e98a72dff107ab2a2710be391fc Mon Sep 17 00:00:00 2001
From: Kubbo <390378816@qq.com>
Date: Mon, 8 Jul 2024 23:03:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E5=BA=97=E7=9A=84?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/AppMultipleStoreBoardFilter.vue b/src/views/AppMultipleStoreBoardFilter.vue
index fbfd19e..1f079ec 100644
--- a/src/views/AppMultipleStoreBoardFilter.vue
+++ b/src/views/AppMultipleStoreBoardFilter.vue
@@ -50,6 +50,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($multipleStoreBoard.search, 'compareDate', v)" clearable type="date" value-format="yyyyMMdd"/>
+    </el-form-item>
     <div class="fill"/>
     <el-form-item label="课长">
       <el-select v-model="form.groupCodeList" @change="v=>$multipleStoreBoard.search.groupCodeList=[v]" clearable placeholder="全部">
@@ -57,7 +60,7 @@ export default {
       </el-select>
     </el-form-item>
     <el-form-item label="时段">
-      <el-select v-model="form.hourNum" size="small" format="HH:mm" value-format="H" @change="v=>$multipleStoreBoard.search.hourNum=v" clearable placeholder="全部">
+      <el-select v-model="form.hourNum" size="small" @change="v=>$multipleStoreBoard.search.hourNum=v" clearable placeholder="全部">
         <el-option v-for="item in dateOptions" :key="item.value" :label="item.label" :value="item.value"/>
       </el-select>
     </el-form-item>
@@ -84,7 +87,7 @@ export default {
 }
 
 .AppMultipleStoreBoardFilter .el-input {
-  width: 100%;
+  width: 100% !important;
 }
 
 .AppMultipleStoreBoardFilter .el-form-item__label {
diff --git a/src/views/AppStoresTable.vue b/src/views/AppStoresTable.vue
index 3beac3d..e350b31 100644
--- a/src/views/AppStoresTable.vue
+++ b/src/views/AppStoresTable.vue
@@ -102,8 +102,9 @@ export default {
   methods: {
     getData() {
       const {$http, $waitFor} = window
+      const {groupCodeList, type, compareDate} = this.search
       console.log("筛选条件:", this.search)
-      $waitFor($http && this.search.groupCodeList.length > 0).then(() => this.getStores())
+      $waitFor($http && groupCodeList.length > 0 && (type != 3 || compareDate)).then(() => this.getStores())
           .then(codes => Promise.all([this.getCameras(), this.getStoreKeyGoods(), this.getCategorySales()]).then(() => codes))
           .then((codes = []) => {
             this.stores = codes?.map(storeCode => {