wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

会议室全部修改为会客厅

This commit is contained in:
unknown 2022-11-11 10:33:16 +08:00
parent 872227b425
commit 79357c6e9a
8 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
back/src/views/main-sidebar.vue
View File

@ -73,7 +73,7 @@ export default {
// 西海岸 v2 市局v3
children.total = returnLocationStr() == 'qingdao' ? Number(this.numObject.abilityprocess_v3) : Number(this.numObject.abilityprocess_v2)
daibanNum = Number(daibanNum) + Number(children.total)
} if (children.id == '1559376285703081986') { // 会议室审核
} if (children.id == '1559376285703081986') { // 会客厅审核
children.total = Number(this.numObject.meetingroom_book)
daibanNum = Number(daibanNum) + Number(children.total)
} if (children.id == '1545292602084827138') { // 能力资源上架
@ -88,7 +88,7 @@ export default {
} if (children.id == '1545313754106699777') { // 评论审核
children.total = Number(this.numObject.comment_review)
daibanNum = Number(daibanNum) + Number(children.total)
} if (children.id == '1554294862931562498') { // 会议室 暂无
} if (children.id == '1554294862931562498') { // 会客厅 暂无
children.total = 0
daibanNum = Number(daibanNum) + Number(children.total)
}

4
back/src/views/modules/activiti/RoomExamineAdmin.vue
View File

@ -4,7 +4,7 @@
<el-input
v-model="roomNameA"
style="width: 160px"
placeholder="请输入会议室名称"
placeholder="请输入会客厅名称"
></el-input>
<el-select
v-model="value"
@ -39,7 +39,7 @@
>
</el-table-column>
<el-table-column
label="申请会议室"
label="申请会客厅"
prop="roomName"
header-align="center"
align="center"

22
back/src/views/modules/myAgent/ConferenceRoom.vue
View File

@ -2,7 +2,7 @@
<el-card shadow="never" class="roomBox">
<div>
<div slot="header" class="roomHeadSpan">
<span>会议室管理</span>
<span>会客厅管理</span>
<el-button
style="float: right; padding: 5px 5px"
type="primary"
@ -13,7 +13,7 @@
</div>
<el-table border style="width: 100%" :data="tableData">
<el-table-column
label="会议室名称"
label="会客厅名称"
prop="name"
header-align="center"
align="center"
@ -70,10 +70,10 @@
@close="outDialog"
:title="
flge === 'add'
? '会议室新增'
? '会客厅新增'
: flge === 'look'
? '会议室详情'
: '会议室修改'
? '会客厅详情'
: '会客厅修改'
"
:visible.sync="dialogFormVisible"
>
@ -88,7 +88,7 @@
<el-row>
<el-col :span="12">
<el-form-item
label="会议室名称"
label="会客厅名称"
prop="name"
:label-width="formLabelWidth"
>
@ -106,7 +106,7 @@
</el-col>
<el-col :span="12">
<el-form-item
label="会议室面积(m²)"
label="会客厅面积(m²)"
prop="area"
:label-width="formLabelWidth"
>
@ -143,7 +143,7 @@
</el-col>
<el-col>
<el-form-item
label="会议室图片"
label="会客厅图片"
prop="pic"
:label-width="formLabelWidth"
>
@ -241,11 +241,11 @@ export default {
fileList: [],
rules: {
name: [
{ required: true, message: '请输入会议室名称', trigger: 'blur' },
{ required: true, message: '请输入会客厅名称', trigger: 'blur' },
{ min: 1, trigger: 'blur' }
],
area: [
{ required: true, message: '请输入会议室面积', trigger: 'blur' }
{ required: true, message: '请输入会客厅面积', trigger: 'blur' }
// { min: 1, message: '请输入数字', type: 'number', trigger: 'blur' }
],
description: [
@ -381,7 +381,7 @@ export default {
},
// 删除图片
taskDelete (row) {
this.$confirm('此操作将永久删除该会议室, 是否继续?', '提示', {
this.$confirm('此操作将永久删除该会客厅, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'

4
back/src/views/modules/sys/user.vue
View File

@ -11,12 +11,12 @@
<el-form-item>
<ren-select v-model="dataForm.gender" dict-type="gender" :placeholder="$t('user.gender')"></ren-select>
</el-form-item>
<el-form-item>
<!-- <el-form-item>
<el-select v-model="dataForm.postId" :placeholder="$t('user.postIdList')" clearable>
<el-option :label="data.postName" v-for="data in postList" :key="data.id" :value="data.id">{{ data.postName
}}</el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item>
<ren-dept-tree v-model="dataForm.deptId" :placeholder="$t('dept.title')" :query="true" ref="renDeptTree">
</ren-dept-tree>

2
front/src/api/home.js
View File

@ -454,7 +454,7 @@ export function getDevelopDocTree(params) {
})
}
//会议室查询接口
//会客厅查询接口
export function getRoomSearch(params) {
return request({
url: '/bookMeeting/list',

2
front/src/views/home/DetailsPageconetent.vue
View File

@ -763,7 +763,7 @@
next()
},
setup() {
//会议室传的标识6
//会客厅传的标识6
const flag = ref('')
let componentTypeArray = ['组件类型', '应用领域']
const handleAdd = (value) => {

24
front/src/views/home/infrastructurePage.vue
View File

@ -35,7 +35,7 @@
@click="roomResults"
:class="roomYuyue ? 'roomBackground' : 'nullBackground'"
>
会议室预约
会客厅预约
</div>
<div
class="leftBottom"
@ -46,7 +46,7 @@
</div>
</div>
<div class="roomSearch">
<span>会议室搜索</span>
<span>会客厅搜索</span>
<div class="searchInput">
<a-input-search
v-model:value="roomInput"
@ -65,7 +65,7 @@
</div>
<div v-if="roomYuyue">
<div class="roomTableList">
<span>会议室列表</span>
<span>会客厅列表</span>
<div class="roomTime">
<span>可用时间查询</span>
<a-space direction="vertical" class="roomSpace">
@ -251,7 +251,7 @@
</a-modal>
<a-modal
v-model:visible="appointmentRoom"
title="会议室预约"
title="会客厅预约"
width="10rem"
@ok="handleOk"
:body-style="bodystyle"
@ -289,7 +289,7 @@
>
<div class="imgJinggao"></div>
<span style="color: #da2a13; font-size: 0.12rem">
当日会议室可用时段：{{ roomDateList[0] }}
当日会客厅可用时段：{{ roomDateList[0] }}
</span>
</div>
</a-col>
@ -922,7 +922,7 @@
showSizeChanger: true,
pageSizeOptions: ['10', '30', '50', '100', '1000'], //每页中显示的数据
})
//会议室变量区域=======
//会客厅变量区域=======
const paginationRoom = ref({
total: 0,
current: 1,
@ -1217,7 +1217,7 @@
}
init()
//点击会议室左侧切换
//点击会客厅左侧切换
const result = () => {
roomYuyue.value = false
roomResult.value = true
@ -1348,7 +1348,7 @@
return seconds
}
}
// 时间选择器限制----会议室预约时段
// 时间选择器限制----会客厅预约时段
//获取不可选择的小时
const disabledTimeHours = () => {
if (formState.endTime) {
@ -1457,7 +1457,7 @@
const handleChange = (i) => {
let query = {
date: i, //查询的riqi
roomId: dateId.value, //会议室主键
roomId: dateId.value, //会客厅主键
}
getDate(query).then(({ data: res }) => {
roomDateList.value = res.data
@ -1466,7 +1466,7 @@
const columnsRomm = [
{
title: '会议室名称',
title: '会客厅名称',
dataIndex: 'roomName',
align: 'center',
},
@ -1530,13 +1530,13 @@
console.log('error', err)
})
}
//会议室查询接口
//会客厅查询接口
const searchData = () => {
let query = {
bookDate: roomCerateDate.value, // 预约开始时间 年月日
startTime: roomCreateTime.value, //预约开始时 间时分秒
endTime: roomEndTime.value, // 预约结束时间
name: roomInput.value, //会议室名称
name: roomInput.value, //会客厅名称
page: roomPage.value, //页码
limit: roomLimit.value, //每页条数
}

12
front/src/views/mynoticeView/components/NoticeList.vue
View File

@ -187,8 +187,8 @@ let typeObj = {
7: '需求后台',
8: '评论前台',
9: '评论后台',
10: '会议室前台',
11: '会议室后台',
10: '会客厅前台',
11: '会客厅后台',
12: '其他'
}
@ -214,7 +214,7 @@ let pageObj = {
0: 'myAgent-CommentModeration',
1: 'hasToDoTasks-CommentModeration',
},
'会议室后台': {
'会客厅后台': {
0: 'activiti-RoomExamineAdmin',
1: 'activiti-RoomExamineAdmin',
},
@ -227,10 +227,10 @@ const tabTypeObj = {
'下架前台': '能力下架',
'需求前台': '需求评论',
'评论前台': '需求评论',
'会议室前台': '会议室前台'
'会客厅前台': '会客厅前台'
}
// 会议室后台
// 会客厅后台
const goPage = (item) => {
if (item.jumpUrl && item.type !== 12) {
let typeText = typeObj[item.type];
@ -259,7 +259,7 @@ const goPage = (item) => {
// let _page = pageObj[typeText][_applyState]
// window.open(window.SITE_CONFIG.backUrl + `/#/${_page}`)
// } else if (typeText.indexOf('前台') !== -1) {
// if (typeText == '会议室前台') {
// if (typeText == '会客厅前台') {
// router.push({
// path: '/DetailsPageconetent',
// query: {