From a11bc1bed7953b88213330582c2085f60b5a73b1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 六月 2024 15:01:56 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
 admin/src/views/meeting/bookings.vue |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index a149596..706d8fc 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -46,7 +46,7 @@
           <el-option v-for="item in status" :key="item.id" :value="item.id" :label="item.name" />
         </el-select>
       </el-form-item>
-      <el-form-item label="浼氳鏃堕棿" prop="startTime">
+      <el-form-item label="璧锋鏃堕棿" prop="startTime">
         <el-date-picker
           v-model="date"
           type="datetimerange"
@@ -229,15 +229,15 @@
       if (e === '0') {
         this.searchForm.startTime = timeForMat(0)[0]
         this.searchForm.endTime = timeForMat(0)[1]
-        this.time = timeForMat(0)
+        this.date = timeForMat(0)
       } else if (e === '1') {
         this.searchForm.startTime = timeForMat(6)[0]
         this.searchForm.endTime = timeForMat(6)[1]
-        this.time = timeForMat(6)
+        this.date = timeForMat(6)
       } else if (e === '2') {
         this.searchForm.startTime = timeForMat(29)[0]
         this.searchForm.endTime = timeForMat(29)[1]
-        this.time = timeForMat(29)
+        this.date = timeForMat(29)
       }
       this.search()
     },
@@ -269,7 +269,7 @@
       this.searchForm.radio = '0'
       this.searchForm.startTime = ''
       this.searchForm.endTime = ''
-      this.search()
+      this.changeRadio('0')
     },
     copy (row) {
       const text = `${row.realName} 閭�璇锋偍鍔犲叆浼氳\n浼氳涓婚锛�${row.name}\n浼氳瀹わ細${row.roomName}\n浼氳鏃堕棿锛�${row.meetingTime}\n鐐瑰嚮閾炬帴鐩存帴鍔犲叆浼氳锛歕n${this.link}?id=${row.id}`
--
Gitblit v1.9.3