From e1300f92341700cc81bfe0db7c17d8bc87583400 Mon Sep 17 00:00:00 2001
From: SelfRidicule <selfridicule@gmail.com>
Date: Tue, 2 Apr 2024 16:02:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4=E6=97=B6=EF=BC=8C=E5=B0=86=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E4=B8=AD=E2=80=9C=E4=B8=8A=E7=8F=AD=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8B=E7=8F=AD=E6=97=B6=E9=97=B4=E2=80=9D=EF=BC=8C?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E2=80=9C=E9=A2=84=E7=BA=A6=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=8C=E9=A2=84=E7=BA=A6=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/modules/RoomContentModal.vue      | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/views/admin/meeting/modules/RoomContentModal.vue b/src/views/admin/meeting/modules/RoomContentModal.vue
index 9812c0b..58e2356 100644
--- a/src/views/admin/meeting/modules/RoomContentModal.vue
+++ b/src/views/admin/meeting/modules/RoomContentModal.vue
@@ -153,25 +153,36 @@
             </a-select>
           </a-form-item>
         </a-col>
+      </a-row>
+      <a-row>
         <a-col :span='10'>
           <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='负责人'>
             <a-input placeholder='负责人'
                      v-decorator="['headName',{rules: [{ required: true, message: '输入负责人' }]}]" />
           </a-form-item>
         </a-col>
-      </a-row>
-      <a-row>
-
         <a-col :span='10'>
           <a-form-item label='负责人联系方式' :labelCol='labelCol' :wrapperCol='wrapperCol'>
             <a-input placeholder='负责人联系方式'
                      v-decorator="['headPhone',{rules: [{ required: true, message: '输入负责人联系方式'}]}]" />
           </a-form-item>
         </a-col>
+      </a-row>
+      <a-row>
         <a-col :span='10'>
-          <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='上班时间'>
-            <a-time-picker v-decorator="['startTime',{rules: [{ required: true, message: '输入启用时间'}]}]"
-                           format='HH:mm:ss'
+          <a-form-item label='预约开始时间' :labelCol='labelCol' :wrapperCol='wrapperCol'>
+            <a-time-picker v-decorator="['startTime',{rules: [{ required: true, message: '请选择预约开始时间'}]}]"
+                           format='HH:mm'
+                           valueFormat='YYYY-MM-DD HH:mm:ss'
+                           placeholder='选择时间'
+                           :show-time="{ defaultValue: moment('00:00:00', 'HH:mm:ss') }"
+                           style='width: 100%;' />
+          </a-form-item>
+        </a-col>
+        <a-col :span='10'>
+          <a-form-item label='预约结束时间' :labelCol='labelCol' :wrapperCol='wrapperCol'>
+            <a-time-picker v-decorator="['endDate',{rules: [{ required: true, message: '请选择预约结束时间'}]}]"
+                           format='HH:mm'
                            valueFormat='YYYY-MM-DD HH:mm:ss'
                            placeholder='选择时间'
                            :show-time="{ defaultValue: moment('00:00:00', 'HH:mm:ss') }"
@@ -179,17 +190,8 @@
           </a-form-item>
         </a-col>
       </a-row>
+
       <a-row>
-        <a-col :span='10'>
-          <a-form-item label='下班时间' :labelCol='labelCol' :wrapperCol='wrapperCol'>
-            <a-time-picker v-decorator="['endDate',{rules: [{ required: true, message: '输入启用时间'}]}]"
-                           format='HH:mm:ss'
-                           valueFormat='YYYY-MM-DD HH:mm:ss'
-                           placeholder='选择时间'
-                           :show-time="{ defaultValue: moment('00:00:00', 'HH:mm:ss') }"
-                           style='width: 100%;' />
-          </a-form-item>
-        </a-col>
         <a-col :span='10'>
           <a-form-item label='是否使用优惠劵' :labelCol='labelCol' :wrapperCol='wrapperCol'>
             <a-select v-decorator="['isTicket',{rules: [{ required: true, message: '请选择优惠券'}]}]"
@@ -204,6 +206,7 @@
           </a-form-item>
         </a-col>
       </a-row>
+
       <a-row>
         <a-col :span='10'>
           <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='是否收费'>