From ab9596aa7902b43712688678c8fee19d0af5874a Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Mon, 28 Oct 2024 18:16:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/finance/scheduleList.vue | 55 ++++++++++++++++++------------
 1 file changed, 34 insertions(+), 21 deletions(-)

diff --git a/src/views/finance/scheduleList.vue b/src/views/finance/scheduleList.vue
index c2176ce..e3ced10 100644
--- a/src/views/finance/scheduleList.vue
+++ b/src/views/finance/scheduleList.vue
@@ -43,9 +43,11 @@
                 :key="item.id"
               ></el-option>
             </el-select>
-            <el-date-picker v-model="pickedYear" placeholder="选择年份" type="year" size="small" style="width: 160px;margin-right: 10px;" @change="pickYear" />
-            <el-date-picker v-model="pickedMonth" placeholder="选择月份" type="month" size="small" style="width: 160px;margin-right: 10px;" @change="pickMonth">
-            </el-date-picker>
+            <el-date-picker v-model="pickedYear" placeholder="选择年份" type="year" value-format="yyyy" size="small" style="width: 160px;margin-right: 10px;" @change="pickYear" />
+            <el-select v-model="pickedMonth" clearable multiple collapse-tags size="small" style="width: 180px;margin-right: 10px;" placeholder="选择月份" @change="pickYear">
+              <el-option v-for="i in 12" :label="i + '月'" :value="i"></el-option>
+            </el-select>
+<!--            <el-date-picker v-model="pickedMonth" placeholder="选择月份" type="month" size="small" style="width: 160px;margin-right: 10px;" />-->
             <el-select
               size="small"
               v-model="select.status"
@@ -275,8 +277,9 @@ export default {
         }
       ],
 
-      pickedYear: new Date(),
-      pickedMonth:new Date(),
+      pickedYear: new Date().getFullYear().toString(),
+      pickedMonth: [],
+      // pickedMonth:new Date(),
       selectedRow:{},
       nurses:[],
       select: {
@@ -287,8 +290,9 @@ export default {
         address_name:"",
         start_sign_in:"",
         end_sign_in:"",
-        start_start_time:"",
-        end_start_time:"",
+        // start_start_time:"",
+        start_start_range: Array.from({ length: 12 },(_, index) => `${new Date().getFullYear().toString()}-${(index+1).toString().padStart(2, '0')}`),
+        // end_start_time:"",
         status:"",
         product_type_id: "",
         village_name: "",
@@ -625,24 +629,33 @@ export default {
       }
     },
     pickYear(e) {
-      if (e) {
-        this.pickedMonth = ''
-        this.select.start_start_time = this.$moment(e).startOf('year').format('YYYY-MM-DD HH:mm:ss')
-        this.select.end_start_time = this.$moment(e).endOf('year').format('YYYY-MM-DD HH:mm:ss')
+      if (this.pickedYear) {
+        if (!this.pickedMonth || this.pickedMonth.length === 0) {
+          this.select.start_start_range = Array.from({ length: 12 },(_, index) => `${this.pickedYear}-${(index+1).toString().padStart(2, '0')}`)
+        } else {
+          this.select.start_start_range = this.pickedMonth.map(month => `${this.pickedYear}-${month.toString().padStart(2, '0')}`)
+        }
       } else {
-        this.select.start_start_time = ''
-        this.select.end_start_time = ''
+        this.select.start_start_range = []
       }
+      // if (e) {
+      //   this.pickedMonth = ''
+      //   this.select.start_start_time = this.$moment(e).startOf('year').format('YYYY-MM-DD HH:mm:ss')
+      //   this.select.end_start_time = this.$moment(e).endOf('year').format('YYYY-MM-DD HH:mm:ss')
+      // } else {
+      //   this.select.start_start_time = ''
+      //   this.select.end_start_time = ''
+      // }
     },
     pickMonth(e){
-      if(e){
-        this.pickedYear = ''
-        this.select.start_start_time = this.$moment(`${this.$moment(e).format('YYYY-MM-DD')}`).startOf('month').format('YYYY-MM-DD HH:mm:ss')
-        this.select.end_start_time = this.$moment(`${this.$moment(e).format('YYYY-MM-DD')}`).endOf('month').format('YYYY-MM-DD HH:mm:ss')
-      }else{
-        this.select.start_start_time = ''
-        this.select.end_start_time = ''
-      }
+      // if(e){
+      //   this.pickedYear = ''
+      //   this.select.start_start_time = this.$moment(`${this.$moment(e).format('YYYY-MM-DD')}`).startOf('month').format('YYYY-MM-DD HH:mm:ss')
+      //   this.select.end_start_time = this.$moment(`${this.$moment(e).format('YYYY-MM-DD')}`).endOf('month').format('YYYY-MM-DD HH:mm:ss')
+      // }else{
+      //   this.select.start_start_time = ''
+      //   this.select.end_start_time = ''
+      // }
     },
 
     destroy(row){