boyue2025/dbd-meeting-html
3
0
Fork 0
mirror of https://gitee.com/elegant_wings/dbd-meeting-html.git synced 2025-06-21 05:39:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master

Browse Source
This commit is contained in:
chendaze 2024-03-28 15:38:28 +08:00
commit ccfae8a848
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/admin/meeting/RoomContentList.vue
View File

@ -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' }
},

46
src/views/admin/meeting/modules/RoomContentModal.vue
View File

@ -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>
@ -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-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='会议室描述 '>
<a-textarea placeholder='会议室描述 ' v-decorator="['content']" style='height: 100px' />
</a-form-item>
</a-col>
</a-row>