From 0b1837e9b6d1ac8825e9c1acf6f0cd5b2b14a897 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 04 一月 2023 10:41:00 +0800
Subject: [PATCH] 1.列展示设置   静态框架初步搭建完成

---
 src/components/DatePicker/index.vue |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/components/DatePicker/index.vue b/src/components/DatePicker/index.vue
index 716a199..19764ec 100644
--- a/src/components/DatePicker/index.vue
+++ b/src/components/DatePicker/index.vue
@@ -49,6 +49,7 @@
                   slot="reference"
                   :class="[{select:isSelect(visibleDays[(i-1)*7+(j-1)])},
                            {dblDateStyle:isDblDate(visibleDays[(i-1)*7+(j-1)])}]"
+                  :style="{background: isSelect(visibleDays[(i-1)*7+(j-1)])?$store.state.settings.theme:''}"
                 >{{ visibleDays[(i - 1) * 7 + (j - 1)].getDate() }}</span>
               </el-popover>
 
@@ -129,6 +130,7 @@
   CapacityPlanningOnclickSelect,
   CapacityPlanningSetupSearch
 } from '@/api/scgl'
+import { handleDatetime } from '@/utils/global'
 
 var time = null
 export default {
@@ -401,13 +403,13 @@
               this.getCapacityPlanningOnclickSelect(DATA)
               this.getDblTime()
 
-            //   const indexV = this.value.indexOf(this.handleDatetime(date))
-            //   this.value.splice(indexV, 1)
-            //   for (const i in this.defArr) {
-            //     if (this.defArr[i].name === this.handleDatetime(date)) {
-            //       this.defArr.splice(i, 1)
-            //     }
-            //   }
+              //   const indexV = this.value.indexOf(this.handleDatetime(date))
+              //   this.value.splice(indexV, 1)
+              //   for (const i in this.defArr) {
+              //     if (this.defArr[i].name === this.handleDatetime(date)) {
+              //       this.defArr.splice(i, 1)
+              //     }
+              //   }
             }
           }
           this.$emit('input', this.value)
@@ -514,7 +516,8 @@
     },
     getCapacityPlanningCalendar() {
       CapacityPlanningCalendar({ captplanid: this.rowData.CaptPlanId }).then((res) => {
-        this.defArr = res.data
+        const currentDate = handleDatetime(new Date())
+        this.defArr = res.data.filter(i => i.name >= currentDate)
       })
     },
     closeCapacityPlanningCalendar() {

--
Gitblit v1.9.3