This commit is contained in:
parent
eb163089a1
commit
80aea7044d
|
|
@ -13,7 +13,7 @@
|
||||||
v-for="room in rooms"
|
v-for="room in rooms"
|
||||||
:key="room.id"
|
:key="room.id"
|
||||||
:label="`${getApartmentName(room.apartmentId)} - ${room.roomNumber}`"
|
:label="`${getApartmentName(room.apartmentId)} - ${room.roomNumber}`"
|
||||||
:value="room.id.toString()"
|
:value="room.id"
|
||||||
></el-option>
|
></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
@ -104,12 +104,9 @@ export default {
|
||||||
rules: {
|
rules: {
|
||||||
roomId: [{ required: true, message: '请选择房间', trigger: 'blur' }],
|
roomId: [{ required: true, message: '请选择房间', trigger: 'blur' }],
|
||||||
tenantName: [{ required: true, message: '请输入租客姓名', trigger: 'blur' }],
|
tenantName: [{ required: true, message: '请输入租客姓名', trigger: 'blur' }],
|
||||||
tenantPhone: [{ message: '请输入租客电话', trigger: 'blur' }],
|
|
||||||
tenantIdCard: [{ message: '请输入身份证号', trigger: 'blur' }],
|
|
||||||
startDate: [{ required: true, message: '请选择开始日期', trigger: 'blur' }],
|
startDate: [{ required: true, message: '请选择开始日期', trigger: 'blur' }],
|
||||||
endDate: [{ required: true, message: '请选择结束日期', trigger: 'blur' }],
|
endDate: [{ required: true, message: '请选择结束日期', trigger: 'blur' }],
|
||||||
rent: [{ required: true, message: '请输入租金', trigger: 'blur' }],
|
rent: [{ required: true, message: '请输入租金', trigger: 'blur' }],
|
||||||
deposit: [{ message: '请输入押金', trigger: 'blur' }],
|
|
||||||
status: [{ required: true, message: '请选择状态', trigger: 'blur' }]
|
status: [{ required: true, message: '请选择状态', trigger: 'blur' }]
|
||||||
},
|
},
|
||||||
rooms: [],
|
rooms: [],
|
||||||
|
|
@ -153,13 +150,13 @@ export default {
|
||||||
this.apartments = apartmentsResponse.data || apartmentsResponse
|
this.apartments = apartmentsResponse.data || apartmentsResponse
|
||||||
|
|
||||||
// 检查URL参数中是否有roomId
|
// 检查URL参数中是否有roomId
|
||||||
const roomId = this.$route.query.roomId
|
const roomId = this.$route.query.roomId ? Number(this.$route.query.roomId) : null
|
||||||
if (roomId) {
|
if (roomId) {
|
||||||
// 确保roomId是字符串类型,与option的value类型一致
|
// 确保roomId是字符串类型,与option的value类型一致
|
||||||
this.rentalForm.roomId = roomId.toString()
|
this.rentalForm.roomId = roomId
|
||||||
|
|
||||||
// 查找对应的房间信息
|
// 查找对应的房间信息
|
||||||
const room = this.rooms.find(r => r.id.toString() == roomId.toString())
|
const room = this.rooms.find(r => r.id == roomId)
|
||||||
if (room) {
|
if (room) {
|
||||||
// 自动填充租金
|
// 自动填充租金
|
||||||
this.rentalForm.rent = room.monthlyPrice
|
this.rentalForm.rent = room.monthlyPrice
|
||||||
|
|
|
||||||
|
|
@ -230,7 +230,6 @@ export default {
|
||||||
startDate: [{ required: true, message: '请选择开始日期', trigger: 'blur' }],
|
startDate: [{ required: true, message: '请选择开始日期', trigger: 'blur' }],
|
||||||
endDate: [{ required: true, message: '请选择结束日期', trigger: 'blur' }],
|
endDate: [{ required: true, message: '请选择结束日期', trigger: 'blur' }],
|
||||||
rent: [{ required: true, message: '请输入租金', trigger: 'blur' }],
|
rent: [{ required: true, message: '请输入租金', trigger: 'blur' }],
|
||||||
deposit: [{ message: '请输入押金', trigger: 'blur' }],
|
|
||||||
status: [{ required: true, message: '请选择状态', trigger: 'blur' }]
|
status: [{ required: true, message: '请选择状态', trigger: 'blur' }]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -90,12 +90,9 @@ export default {
|
||||||
rules: {
|
rules: {
|
||||||
roomId: [{ required: true, message: '请选择房间', trigger: 'blur' }],
|
roomId: [{ required: true, message: '请选择房间', trigger: 'blur' }],
|
||||||
tenantName: [{ required: true, message: '请输入租客姓名', trigger: 'blur' }],
|
tenantName: [{ required: true, message: '请输入租客姓名', trigger: 'blur' }],
|
||||||
tenantPhone: [{ message: '请输入租客电话', trigger: 'blur' }],
|
|
||||||
tenantIdCard: [{ message: '请输入身份证号', trigger: 'blur' }],
|
|
||||||
startDate: [{ required: true, message: '请选择开始日期', trigger: 'blur' }],
|
startDate: [{ required: true, message: '请选择开始日期', trigger: 'blur' }],
|
||||||
endDate: [{ required: true, message: '请选择结束日期', trigger: 'blur' }],
|
endDate: [{ required: true, message: '请选择结束日期', trigger: 'blur' }],
|
||||||
rent: [{ required: true, message: '请输入租金', trigger: 'blur' }],
|
rent: [{ required: true, message: '请输入租金', trigger: 'blur' }],
|
||||||
deposit: [{ message: '请输入押金', trigger: 'blur' }],
|
|
||||||
status: [{ required: true, message: '请选择状态', trigger: 'blur' }]
|
status: [{ required: true, message: '请选择状态', trigger: 'blur' }]
|
||||||
},
|
},
|
||||||
rooms: [],
|
rooms: [],
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue