Merge remote-tracking branch 'origin/master'

jiangping

2025-03-05 c88fe3ea9fd8bd1ea556b4769a1a0cd6c9b5661d

 admin/src/views/meeting/roomRecord.vue

@@ -3,12 +3,7 @@
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="会议室" prop="roomId">
        <el-select
            v-model="searchForm.roomId"
            filterable
            clearable
            placeholder="请选择会议室"
        >
        <el-select v-model="searchForm.roomId" filterable clearable placeholder="请选择会议室">
          <el-option v-for="item in rooms" :key="item.id" :value="item.id" :label="item.name" />
        </el-select>
      </el-form-item>
@@ -26,20 +21,14 @@
        </el-select>
      </el-form-item>
      <el-form-item label="开门时间" prop="startTime">
        <el-date-picker
            v-model="date"
            type="datetimerange"
            range-separator="至"
            value-format="yyyy-MM-dd HH:mm:ss"
            start-placeholder="开始时间"
            end-placeholder="结束时间"
            @change="selectDate"
        ></el-date-picker>
        <!-- <el-date-picker v-model="searchForm.startTime" value-format="yyyy-MM-dd" placeholder="请输入开始时间" @change="search"/> -->
        <el-date-picker v-model="date" type="datetimerange" range-separator="至" value-format="yyyy-MM-dd HH:mm:ss"
          start-placeholder="开始时间" end-placeholder="结束时间" @change="selectDate"></el-date-picker>
        <!-- <el-date-picker v-model="searchForm.startTime" value-format="yyyy-MM-dd" placeholder="请选择开始时间" @change="search"/> -->
      </el-form-item>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button type="primary" :loading="isWorking.export" v-permissions="['business:roomrecord:exportExcel']" @click="exportExcel">导出</el-button>
        <el-button type="primary" :loading="isWorking.export" v-permissions="['business:roomrecord:exportExcel']"
          @click="exportExcel">导出</el-button>
        <el-button @click="reset">重置</el-button>
      </section>
    </el-form>
@@ -49,12 +38,7 @@
        <li><el-button type="primary" @click="$refs.operaRoomRecordWindow.open('新建会议室开门记录表')" icon="el-icon-plus" v-permissions="['business:roomrecord:create']">新建</el-button></li>
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:roomrecord:delete']">删除</el-button></li>
      </ul>-->
      <el-table
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe
        @selection-change="handleSelectionChange"
      >
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
        <el-table-column label="人员姓名"  prop="userName" min-width="100px"></el-table-column>
        <el-table-column label="人员类型" prop="objType" min-width="100px">
            <template  slot-scope="{row}">
@@ -78,11 +62,7 @@
          </template>
        </el-table-column>-->
      </el-table>
      <pagination
        @size-change="handleSizeChange"
        @current-change="handlePageChange"
        :pagination="tableData.pagination"
      >
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>
    </template>
    <!-- 新建/修改 -->