From 1df7fb0f153237ca3884575eb647e1ade97838f6 Mon Sep 17 00:00:00 2001
From: "471615499@qq.com" <sy996996@>
Date: Sun, 15 Dec 2024 21:07:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/meeting/MeetingCount.vue      |  2 +-
 src/views/admin/meeting/MeetingMangerList.vue |  2 +-
 .../admin/meeting/MeetingReservationList.vue  | 26 +++++++++++--------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/views/admin/meeting/MeetingCount.vue b/src/views/admin/meeting/MeetingCount.vue
index 1c1e07c..36f9d20 100644
--- a/src/views/admin/meeting/MeetingCount.vue
+++ b/src/views/admin/meeting/MeetingCount.vue
@@ -136,7 +136,7 @@
             </a-col>
           </a-row>
         </a-card>
-        <a-card title='任务代办' bodyStyle='height: 554px'>
+        <a-card title='任务代办（会议审核）' bodyStyle='height: 554px'>
           <a-list item-layout='horizontal' :data-source='waitList'>
             <a-list-item @click='goRes({status: "5"})' slot='renderItem' slot-scope='item, index'>
               <!--              <a slot='actions'>审核</a>-->
diff --git a/src/views/admin/meeting/MeetingMangerList.vue b/src/views/admin/meeting/MeetingMangerList.vue
index f14be31..9a3e37f 100644
--- a/src/views/admin/meeting/MeetingMangerList.vue
+++ b/src/views/admin/meeting/MeetingMangerList.vue
@@ -514,7 +514,7 @@ export default {
 }
 
 .roomItem .disabled {
-  background-color: #F2F2F2 !important;
+  background-color: #e4e4e4 !important;
 }
 
 .roomItem .desc-item {
diff --git a/src/views/admin/meeting/MeetingReservationList.vue b/src/views/admin/meeting/MeetingReservationList.vue
index c707ee1..1a48cb0 100644
--- a/src/views/admin/meeting/MeetingReservationList.vue
+++ b/src/views/admin/meeting/MeetingReservationList.vue
@@ -39,9 +39,9 @@
                 <a-select-option value=''>
                   所有会议室
                 </a-select-option>
-                <a-select-opt-group v-for='item in roomList' :label="item.name">
+                <a-select-opt-group v-for='item in roomList' :label='item.name'>
                   <a-select-option v-for='room in item.list' :value='room.name'>
-                    {{room.name}}
+                    {{ room.name }}
                   </a-select-option>
                 </a-select-opt-group>
               </a-select>
@@ -135,12 +135,12 @@
         </a-tag>
       </span>
       <span slot='action' slot-scope='text, record'>
-        <a @click='handleShow(record.id)'>查看</a>
-        <a v-if='record.canCancel' @click='cancelConfirm(record.id, record.status)' style='margin-left: 5px'>取消预约</a>
+        <a-config-provider :auto-insert-space-in-button='false'>
+          <a-button type='default' @click='handleShow(record.id)' style='margin-left: 5px' size='small'>查看</a-button>
+        </a-config-provider>
+        <a-button type='default' v-if='record.canCancel' @click='cancelConfirm(record.id, record.status)' style='margin-left: 5px' size='small'>取消预约</a-button>
         <a-dropdown :trigger="['click']" v-if='record.canEdit'>
-          <a class='ant-dropdown-link' @click='e => e.preventDefault()'>
-            修改信息
-          </a>
+          <a-button type='default' class='ant-dropdown-link' @click='e => e.preventDefault()' style='margin-left: 5px' size='small'>修改信息</a-button>
           <a-menu slot='overlay'>
             <a-menu-item key='0' @click='handleEdit(record.id, 1)'>
               重新选择时间、会议室
@@ -150,9 +150,13 @@
             </a-menu-item>
           </a-menu>
         </a-dropdown>
-        <a v-if='record.canApprove' @click='approve(record.id, 1)' style='margin-left: 5px'>通过</a>
-        <a v-if='record.canApprove' @click='approve(record.id, 2)' style='margin-left: 5px'>驳回</a>
-        <a v-if='record.canStaff' @click='staff(record.id)' style='margin-left: 5px'>分配会务</a>
+        <a-config-provider :auto-insert-space-in-button='false'>
+          <a-button type='primary' v-if='record.canApprove' @click='approve(record.id, 1)' style='margin-left: 5px' size='small'>通过</a-button>
+        </a-config-provider>
+        <a-config-provider :auto-insert-space-in-button='false'>
+          <a-button type='danger' v-if='record.canApprove' @click='approve(record.id, 2)' style='margin-left: 5px' size='small'>驳回</a-button>
+        </a-config-provider>
+        <a-button type='default' v-if='record.canStaff' @click='staff(record.id)' style='margin-left: 5px' size='small'>分配会务</a-button>
       </span>
     </s-table>
     <RoomOrder-modal ref='modal' @ok='handleOk' />
@@ -633,7 +637,7 @@ export default {
         this.roomList = roomArr
         console.log(this.roomList)
       })
-    },
+    }
   },
   watch: {
     /*