From 622958a82bd4dabd61b483e029f7c13321725328 Mon Sep 17 00:00:00 2001
From: SelfRidicule <selfridicule@gmail.com>
Date: Thu, 28 Mar 2024 15:17:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E5=AE=A4=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/meeting/RoomContentList.vue   | 10 +++----
 .../meeting/modules/RoomContentModal.vue      | 28 +++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/views/admin/meeting/RoomContentList.vue b/src/views/admin/meeting/RoomContentList.vue
index 6b6affa..ce3d9df 100644
--- a/src/views/admin/meeting/RoomContentList.vue
+++ b/src/views/admin/meeting/RoomContentList.vue
@@ -9,8 +9,8 @@
             </a-form-item>
           </a-col>
           <a-col :md='5' :sm='15'>
-            <a-form-item label='类型'>
-              <a-select v-model='queryParam.typeName' placeholder='请选择类型'>
+            <a-form-item label='会议室类型'>
+              <a-select v-model='queryParam.typeName' placeholder='请选择会议室类型'>
                 <a-select-option :value="1">
                   会议室
                 </a-select-option>
@@ -262,11 +262,11 @@ export default {
       // 表头
       columns: [
         {
-          title: '名称',
+          title: '会议室名称',
           dataIndex: 'meetingName'
         },
         {
-          title: '类型',
+          title: '会议室类型',
           dataIndex: 'type',
           scopedSlots: { customRender: 'type' }
         },
@@ -279,7 +279,7 @@ export default {
           dataIndex: 'shape'
         },
         {
-          title: '会议设备',
+          title: '会议室设备',
           dataIndex: 'itemCount',
           scopedSlots: { customRender: 'item' }
         },
diff --git a/src/views/admin/meeting/modules/RoomContentModal.vue b/src/views/admin/meeting/modules/RoomContentModal.vue
index 298b56a..7dc4831 100644
--- a/src/views/admin/meeting/modules/RoomContentModal.vue
+++ b/src/views/admin/meeting/modules/RoomContentModal.vue
@@ -24,18 +24,18 @@
           </a-form-item>
         </a-col>
         <a-col :span='10'>
-          <a-form-item label='会议名称' :labelCol='labelCol' :wrapperCol='wrapperCol'>
-            <a-input placeholder='会议名称'
-                     v-decorator="['meetingName',{rules: [{ required: true, message: '输入会议名称' }]}]" />
+          <a-form-item label='会议室名称' :labelCol='labelCol' :wrapperCol='wrapperCol'>
+            <a-input placeholder='会议室名称'
+                     v-decorator="['meetingName',{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-select v-decorator="['type',{rules: [{ required: true, message: '输入会议类型' }]}]"
-                      placeholder='会议类型'>
+          <a-form-item label='会议室类型' :labelCol='labelCol' :wrapperCol='wrapperCol'>
+            <a-select v-decorator="['type',{rules: [{ required: true, message: '输入会议室类型' }]}]"
+                      placeholder='会议室类型'>
               <a-select-option :value='1'>
                 会议室
               </a-select-option>
@@ -83,9 +83,9 @@
           </a-form-item>
         </a-col>
         <a-col :span='10'>
-          <a-form-item label='会议面积' :labelCol='labelCol' :wrapperCol='wrapperCol'>
-            <a-input placeholder='会议面积'
-                     v-decorator="['area',{rules: [{ required: true, message: '请输入会议面积' }]}]"
+          <a-form-item label='会议室面积' :labelCol='labelCol' :wrapperCol='wrapperCol'>
+            <a-input placeholder='会议室面积'
+                     v-decorator="['area',{rules: [{ required: true, message: '请输入会议室面积' }]}]"
                      disabled='disabled' />
           </a-form-item>
         </a-col>
@@ -98,9 +98,9 @@
           </a-form-item>
         </a-col>
         <a-col :span='10'>
-          <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='会议地址 '>
-            <a-input placeholder='会议地址'
-                     v-decorator="['address',{rules: [{ required: true, message: '输入会议地址' }]}]" />
+          <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='会议室地址 '>
+            <a-input placeholder='会议室地址'
+                     v-decorator="['address',{rules: [{ required: true, message: '输入会议室地址' }]}]" />
           </a-form-item>
         </a-col>
       </a-row>
@@ -228,8 +228,8 @@
           </a-form-item>
         </a-col>
         <a-col :span='10'>
-          <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='会议描述 '>
-            <a-input placeholder='会议描述 ' v-decorator="['content']" />
+          <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='会议室描述 '>
+            <a-input placeholder='会议室描述 ' v-decorator="['content']" />
           </a-form-item>
         </a-col>
       </a-row>

From 7e71caf08df296e982a6ee0d09945952c1f44c07 Mon Sep 17 00:00:00 2001
From: SelfRidicule <selfridicule@gmail.com>
Date: Thu, 28 Mar 2024 15:37:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E5=AE=A4=E8=A1=A8=E5=8D=95=E9=A1=BA=E5=BA=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/modules/RoomContentModal.vue      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/admin/meeting/modules/RoomContentModal.vue b/src/views/admin/meeting/modules/RoomContentModal.vue
index 7dc4831..e16bb58 100644
--- a/src/views/admin/meeting/modules/RoomContentModal.vue
+++ b/src/views/admin/meeting/modules/RoomContentModal.vue
@@ -200,6 +200,12 @@
         </a-col>
       </a-row>
       <a-row>
+        <a-col :span='10'>
+          <a-form-item label='起租时长' :labelCol='labelCol' :wrapperCol='wrapperCol'>
+            <a-input placeholder='起租时长'
+                     v-decorator="['duration',{rules: [{ required: true, message: '请输入起租时长'}]}]" />
+          </a-form-item>
+        </a-col>
         <a-col :span='10'>
           <a-form-item label='是否启用' :labelCol='labelCol' :wrapperCol='wrapperCol'>
             <a-select v-decorator="['isShow',{rules: [{ required: true, message: '请选择是否启用'}]}]"
@@ -213,23 +219,17 @@
             </a-select>
           </a-form-item>
         </a-col>
-        <a-col :span='10'>
-          <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='金额备注 '>
-            <a-input placeholder='金额备注 ' v-decorator="['remake']" />
-          </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="['duration',{rules: [{ required: true, message: '请输入起租时长'}]}]" />
+          <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='金额备注 '>
+            <a-textarea placeholder='如：起租时长为x小时,超过x小时后,按照每小时x元计算 ' v-decorator="['remake']"
+                        style='height: 100px' />
           </a-form-item>
         </a-col>
         <a-col :span='10'>
           <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='会议室描述 '>
-            <a-input placeholder='会议室描述 ' v-decorator="['content']" />
+            <a-textarea placeholder='会议室描述 ' v-decorator="['content']" style='height: 100px' />
           </a-form-item>
         </a-col>
       </a-row>