diff --git a/src/router/index.js b/src/router/index.js index afda622..13750f9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -12,6 +12,6 @@ Router.prototype.push = function push (location, onResolve, onReject) { Vue.use(Router) export default new Router({ - mode: 'history', + mode: 'hash', routes: constantRouterMap }) diff --git a/src/views/admin/meeting/RoomContentList.vue b/src/views/admin/meeting/RoomContentList.vue index ce3d9df..10c9869 100644 --- a/src/views/admin/meeting/RoomContentList.vue +++ b/src/views/admin/meeting/RoomContentList.vue @@ -32,6 +32,9 @@ 多功能厅 + + 数据要素 + @@ -53,6 +56,12 @@ 鱼骨形 + + 开放形 + + + 会议形 + diff --git a/src/views/admin/meeting/modules/RoomContentModal.vue b/src/views/admin/meeting/modules/RoomContentModal.vue index d546ef1..cfe2831 100644 --- a/src/views/admin/meeting/modules/RoomContentModal.vue +++ b/src/views/admin/meeting/modules/RoomContentModal.vue @@ -112,6 +112,9 @@ 多功能厅 + + 数据要素 + @@ -150,6 +153,12 @@ 鱼骨形 + + 开放形 + + + 会议形 + diff --git a/src/views/admin/meeting/modules/ShowroomModal.vue b/src/views/admin/meeting/modules/ShowroomModal.vue index cfca14d..886d7b8 100644 --- a/src/views/admin/meeting/modules/ShowroomModal.vue +++ b/src/views/admin/meeting/modules/ShowroomModal.vue @@ -72,9 +72,9 @@ - - + @@ -84,7 +84,7 @@ + v-decorator="['meetingName',{rules: [{ required: true, message: '输入展厅名称' }]}]" /> @@ -97,9 +97,9 @@ - - + + @@ -292,14 +292,14 @@ export default { this.mdl.buildingId = null // 楼宇 this.mdl.buildId = null // 楼层 this.mdl.roomId = null // 所属房间 - this.mdl.area = null // 会议室面积 + this.mdl.area = null // 展厅面积 this.form.setFieldsValue({ parkId: null, // 园区 buildingId: null, // 楼宇 buildId: null, // 楼层 roomId: null, // 所属房间 - area: null // 会议室面积 + area: null // 展厅面积 }) // 查询园区 getParkList({ @@ -314,13 +314,13 @@ export default { this.mdl.buildingId = null // 楼宇 this.mdl.buildId = null // 楼层 this.mdl.roomId = null // 所属房间 - this.mdl.area = null // 会议室面积 + this.mdl.area = null // 展厅面积 this.form.setFieldsValue({ buildingId: null, // 楼宇 buildId: null, // 楼层 roomId: null, // 所属房间 - area: null // 会议室面积 + area: null // 展厅面积 }) // 查询楼宇 getBuildingList({ @@ -334,12 +334,12 @@ export default { // 清空数据 this.mdl.buildId = null // 楼层 this.mdl.roomId = null // 所属房间 - this.mdl.area = null // 会议室面积 + this.mdl.area = null // 展厅面积 this.form.setFieldsValue({ buildId: null, // 楼层 roomId: null, // 所属房间 - area: null // 会议室面积 + area: null // 展厅面积 }) // 查询楼层 getBuildingDetailList({ @@ -357,11 +357,11 @@ export default { getRoomListByFloorIdMethod(buildingDetailId, id) { // 清空数据 this.mdl.roomId = null // 所属房间 - this.mdl.area = null // 会议室面积 + this.mdl.area = null // 展厅面积 this.form.setFieldsValue({ roomId: null, // 所属房间 - area: null // 会议室面积 + area: null // 展厅面积 }) // 查询房间 getRoomListByFloorId({ @@ -375,10 +375,10 @@ export default { // 选择房间 -> 查询面积 selectRoom(id) { // 清空数据 - this.mdl.area = null // 会议室面积 + this.mdl.area = null // 展厅面积 this.form.setFieldsValue({ - area: null // 会议室面积 + area: null // 展厅面积 }) // 查询面积 selectRoomById({ diff --git a/src/views/admin/meeting/modules/TicketModal.vue b/src/views/admin/meeting/modules/TicketModal.vue index dfc41d0..dfadcda 100644 --- a/src/views/admin/meeting/modules/TicketModal.vue +++ b/src/views/admin/meeting/modules/TicketModal.vue @@ -486,12 +486,13 @@ export default { this.notSelectEnterpriseDataList = res.notSelectCustomerList // this.notSelectEnterpriseIdList = res.notSelectCustomerList.map(item => item.id) + //获取发送数量限制字段 + this.value = res.isVerification + if (res.num) { // 有限制 - this.value = 2 this.publicSendNum = res.num this.notSelectEnterpriseDataList.map(item => item.sumNum = res.num) } else { // 无限制 - this.value = 1 } }) @@ -508,6 +509,7 @@ export default { // 选择企业 values.ticketCustomerVo = this.selectEnterpriseDataList values.num = this.publicSendNum + values.isVerification =this.value this.confirmLoading = true saveTicket(values).then(res => { if (res.code === 0) {