Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-06-12 a11bc1bed7953b88213330582c2085f60b5a73b1

 admin/src/views/meeting/rooms.vue

@@ -11,13 +11,14 @@
          filterable
          clearable
          multiple
          style="width: 250px"
          placeholder="选择部门成员"
        >
          <el-option
            v-for="item in userList"
            :key="item.id"
            :value="item.id"
            :label="item.department?`${item.department.name}-${item.realname}`:item.realname"
            :label="item.companyId?`${item.companyName}-${item.companyName}`:item.realname"
            ></el-option>
            <!-- :label="`${item.department.name}-${item.realname}`" -->
          <!-- <el-option :key="1" :value="1" label="禁用" /> -->
@@ -67,7 +68,7 @@
        </el-table-column>
        <el-table-column prop="limitNum" label="可选服务项" align="center" min-width="140px" show-overflow-tooltip>
          <template slot-scope="{row}">
            <div class="long-title-style">{{ row.projectList.map(item => item.projectName).join('|') }}</div>
            <div class="long-title-style">{{ row.projectList.map(item => item.projectName).join(' | ') }}</div>

          </template>
        </el-table-column>
@@ -84,8 +85,8 @@
          </template>
        </el-table-column>
        <el-table-column prop="createDate" label="创建时间"  align="center" min-width="140px"></el-table-column>
        <el-table-column prop="editDate" label="更新时间" min-width="140px"></el-table-column>
        <!-- <el-table-column prop="editor" label="更新人编码" min-width="100px"></el-table-column>
        <el-table-column prop="editDate" label="更新时间" min-width="100px"></el-table-column>
        <el-table-column prop="isdeleted" label="是否删除0否 1是" min-width="100px"></el-table-column>
        <el-table-column prop="remark" label="备注" min-width="100px"></el-table-column>
        <el-table-column prop="imgurl" label="会议室图片" min-width="100px"></el-table-column>
@@ -122,7 +123,7 @@
import OperaRoomsWindow from '@/views/meeting/components/OperaRoomsWindow'
import { fetchList as userList } from '@/api/system/user'
// import selectMember from '@/components/meeting/selectMember'
import { updateStatusById } from '@/views/meeting/api/rooms'
import { updateStatusById } from '@/api/meeting/rooms'
export default {
  name: 'Rooms',
  extends: BaseTable,
@@ -159,7 +160,7 @@
  created () {
    this.config({
      module: '会议室信息表',
      api: '@/views/meeting/api/rooms',
      api: '/meeting/rooms',
      'field.id': 'id',
      'field.main': 'id'
    })