From c0b8ea896dcefaadb96c026232c28962b507548d Mon Sep 17 00:00:00 2001
From: luoyu <mingyuxuezhang@qq.com>
Date: Fri, 23 May 2025 14:22:55 +0800
Subject: [PATCH] =?UTF-8?q?20250523-=E9=A2=84=E7=BA=A6=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A21.=E7=AD=9B=E9=80=89=E5=8A=A0=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E9=80=89=E6=8B=A9=E8=8C=83=E5=9B=B4,2.=E5=89=8D?=
 =?UTF-8?q?=E9=9D=A2=E5=88=97=E8=A1=A8=E5=8A=A0=E5=BA=8F=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/meeting/MeetingReservationList.vue  | 83 +++++++++++++++----
 1 file changed, 67 insertions(+), 16 deletions(-)

diff --git a/src/views/admin/meeting/MeetingReservationList.vue b/src/views/admin/meeting/MeetingReservationList.vue
index a12a78c..a304ea6 100644
--- a/src/views/admin/meeting/MeetingReservationList.vue
+++ b/src/views/admin/meeting/MeetingReservationList.vue
@@ -237,7 +237,9 @@ export default {
       queryParam: {
         status: '',
         sort: '',
-        name: ''
+        name: '',
+        startDate: '',
+        endDate: ''
       },
       // 表头
       columns: [
@@ -289,11 +291,18 @@ export default {
       loadData: parameter => {
         // this.queryParam.name = this.$route.params.roomId
         let chooseDate = this.queryParam.chooseDate
-        if (chooseDate) {
-          // 暂时只取第一个，等后台接口调整
+        if (chooseDate && chooseDate.length === 2) {
+          this.queryParam.startDate = chooseDate[0].format('YYYY-MM-DD')
+          this.queryParam.endDate = chooseDate[1].format('YYYY-MM-DD')
+          this.queryParam.filterDate = ''
+        } else if (chooseDate && chooseDate.length === 1) {
           this.queryParam.filterDate = chooseDate[0].format('YYYY-MM-DD')
+          this.queryParam.startDate = ''
+          this.queryParam.endDate = ''
         } else {
           this.queryParam.filterDate = ''
+          this.queryParam.startDate = ''
+          this.queryParam.endDate = ''
         }
         if (this.isAdmin) {
           this.queryParam.role = 5
@@ -423,9 +432,30 @@ export default {
   methods: {
     onChangeTime(date, dateString) {
       this.queryParam.chooseDate = date
+      if (date && date.length === 2) {
+        this.queryParam.startDate = date[0].format('YYYY-MM-DD')
+        this.queryParam.endDate = date[1].format('YYYY-MM-DD')
+        this.queryParam.filterDate = ''
+      } else if (date && date.length === 1) {
+        this.queryParam.filterDate = date[0].format('YYYY-MM-DD')
+        this.queryParam.startDate = ''
+        this.queryParam.endDate = ''
+      } else {
+        this.queryParam.filterDate = ''
+        this.queryParam.startDate = ''
+        this.queryParam.endDate = ''
+      }
     },
     reset() {
-      this.queryParam = { status: '' }
+      this.queryParam = { 
+        status: '', 
+        sort: '', 
+        name: '',
+        startDate: '', 
+        endDate: '', 
+        filterDate: '' 
+      }
+      this.queryParam.chooseDate = null
       this.$refs.table.refresh(true)
     },
     // 编辑
@@ -577,40 +607,61 @@ export default {
     exportOrderList() {
       let chooseDate = this.queryParam.chooseDate
       let filterDate = ''
-      if (chooseDate) {
-        filterDate = chooseDate.format('YYYY-MM-DD')
+      let startDate = ''
+      let endDate = ''
+      
+      if (chooseDate && chooseDate.length === 2) {
+        startDate = chooseDate[0].format('YYYY-MM-DD')
+        endDate = chooseDate[1].format('YYYY-MM-DD')
+      } else if (chooseDate && chooseDate.length === 1) {
+        filterDate = chooseDate[0].format('YYYY-MM-DD')
       } else {
-        filterDate = ''
-      }
-      if (filterDate == '') {
         this.$message.error('请选择会议预约时间')
         return
       }
+      
       expMRByDate({
         'filterDate': filterDate,
+        'startDate': startDate,
+        'endDate': endDate,
         'userOrg': this.queryParam.userOrg,
         'title': this.queryParam.title,
         'status': this.queryParam.status
       }).then(res => {
-        this.exportExcel(chooseDate.format('YYYYMMDD') + '会议室预约记录', res)
+        let fileName = ''
+        if (startDate && endDate) {
+          fileName = startDate + '至' + endDate + '会议室预约记录'
+        } else {
+          fileName = filterDate + '会议室预约记录'
+        }
+        this.exportExcel(fileName, res)
       })
     },
     exportMonthOrder() {
       let chooseDate = this.queryParam.chooseDate
       let filterDate = ''
-      if (chooseDate) {
-        filterDate = chooseDate.format('YYYY-MM')
+      let startMonth = ''
+      let endMonth = ''
+      
+      if (chooseDate && chooseDate.length === 2) {
+        startMonth = chooseDate[0].format('YYYY-MM')
+        endMonth = chooseDate[1].format('YYYY-MM')
+        if (startMonth !== endMonth) {
+          this.$message.error('月度汇总请选择同一个月的日期范围')
+          return
+        }
+        filterDate = startMonth
+      } else if (chooseDate && chooseDate.length === 1) {
+        filterDate = chooseDate[0].format('YYYY-MM')
       } else {
-        filterDate = ''
-      }
-      if (filterDate == '') {
         this.$message.error('请选择会议预约时间')
         return
       }
+      
       expMRByMonth({
         'month': filterDate
       }).then(res => {
-        this.exportExcel(chooseDate.format('YYYYMM') + '月度会议汇总', res)
+        this.exportExcel(filterDate + '月度会议汇总', res)
       })
     },
     exportExcel(filename, res) {