Merge remote-tracking branch 'origin/master'

jiangping

2024-09-20 af1603e4e4f5505a1fd5526134bbd43dc66d5281

 admin/src/views/meeting/bookings.vue

@@ -1,36 +1,15 @@
<template>
  <TableLayout :permissions="['business:bookings:query']">
    <!-- 搜索表单 -->
    <el-form
      ref="searchForm"
      slot="search-form"
      :model="searchForm"
      label-width="100px"
      inline
    >
    <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-option
            v-for="item in rooms"
            :key="item.id"
            :value="item.id"
            :label="item.name"
          />
        <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>
      <el-form-item label="预约部门" prop="department">
        <el-cascader
          v-model="searchForm.department"
          :options="department"
          :show-all-levels="false"
          clearable
          :props="props"
        ></el-cascader>
        <el-cascader v-model="searchForm.department" :options="department" :show-all-levels="false" clearable
          :props="props"></el-cascader>
        <!-- @change="handleChange" -->
        <!-- <el-select
          v-model="searchForm.departmentId"
@@ -42,52 +21,23 @@
        </el-select> -->
      </el-form-item>
      <el-form-item label="会议主题" prop="name">
        <el-input
          v-model="searchForm.name"
          placeholder="请输入会议主题"
          @keypress.enter.native="search"
        ></el-input>
        <el-input v-model="searchForm.name" placeholder="请输入会议主题" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="预约人" prop="realName">
        <el-input
          v-model="searchForm.realName"
          placeholder="请输入预约人"
          @keypress.enter.native="search"
        ></el-input>
        <el-input v-model="searchForm.realName" placeholder="请输入预约人" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="会议状态" prop="status">
        <el-select
          v-model="searchForm.meetingStatus"
          filterable
          clearable
          placeholder="请选择状态"
        >
          <el-option
            v-for="item in status"
            :key="item.id"
            :value="item.id"
            :label="item.name"
          />
        <el-select v-model="searchForm.meetingStatus" filterable clearable placeholder="请选择状态">
          <el-option v-for="item in status" :key="item.id" :value="item.id" :label="item.name" />
        </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"
          :default-time="['00:00:00', '23:59:59']"
          start-placeholder="开始时间"
          end-placeholder="结束时间"
          @change="selectDate"
        ></el-date-picker>
        <el-date-picker v-model="date" type="datetimerange" range-separator="至" value-format="yyyy-MM-dd HH:mm:ss"
          :default-time="['00:00:00', '23:59:59']" 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>
      <el-radio-group
        v-model="searchForm.radio"
        size="small"
        @input="changeRadio"
      >
      <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
        <el-radio-button label="0">当天</el-radio-button>
        <el-radio-button label="1">近7天</el-radio-button>
        <el-radio-button label="2">近30天</el-radio-button>
@@ -102,73 +52,35 @@
    </el-form>
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul
        class="toolbar"
        v-permissions="[
      <ul class="toolbar" v-permissions="[
          'business:bookings:create',
          'business:bookings:exportExcel',
        ]"
      >
      ]">
        <li>
          <el-button
            type="primary"
            @click="$refs.operaBookingsWindow.open('新建会议')"
            v-permissions="['business:bookings:create']"
            >新建</el-button
          >
          <el-button type="primary" @click="$refs.operaBookingsWindow.open('新建会议')"
            v-permissions="['business:bookings:create']">新建</el-button>
        </li>
        <!-- <li><el-button @click="deleteByIdInBatch" v-permissions="['business:bookings:delete']">删除</el-button></li> -->
        <li>
          <el-button
            :loading="isWorking.export"
            v-permissions="['business:bookings:exportExcel']"
            @click="exportExcel"
            >导出</el-button
          >
          <el-button :loading="isWorking.export" v-permissions="['business:bookings:exportExcel']"
            @click="exportExcel">导出</el-button>
        </li>
      </ul>
      <el-table
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe
        border
        @selection-change="handleSelectionChange"
      >
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe border
        @selection-change="handleSelectionChange">
        <!-- <el-table-column type="selection" align="center" width="55"></el-table-column> -->
        <el-table-column
          prop="name"
          label="会议主题"
          align="center"
          min-width="120px"
          show-overflow-tooltip
        >
        <el-table-column prop="name" label="会议主题" align="center" min-width="120px" show-overflow-tooltip>
          <template slot-scope="{ row }">
            <span class="long-title-style">{{ row.name }}</span>
          </template>
        </el-table-column>
        <el-table-column
          prop="roomName"
          label="会议室"
          align="center"
          min-width="120px"
          show-overflow-tooltip
        >
        <el-table-column prop="roomName" label="会议室" align="center" min-width="120px" show-overflow-tooltip>
          <template slot-scope="{ row }">
            <span class="long-title-style">{{ row.roomName }}</span>
          </template>
        </el-table-column>
        <el-table-column
          prop="meetingTime"
          label="会议时间"
          align="center"
          min-width="120px"
        ></el-table-column>
        <el-table-column
          prop="managerInfo"
          label="预约人"
          align="center"
          min-width="100px"
        ></el-table-column>
        <el-table-column prop="meetingTime" label="会议时间" align="center" min-width="120px"></el-table-column>
        <el-table-column prop="managerInfo" label="预约人" align="center" min-width="100px"></el-table-column>
        <el-table-column label="会议状态" align="center" min-width="60px">
          <template slot-scope="{ row }">
            <span v-if="row.meetingStatus == 1">未开始</span>
@@ -179,56 +91,34 @@
            <!-- {{ row.status==0 ? '正常' : '取消' }} -->
          </template>
        </el-table-column>
        <el-table-column
          prop="createDate"
          label="创建时间"
          align="center"
          min-width="150px"
        ></el-table-column>
        <el-table-column prop="createDate" label="创建时间" align="center" min-width="150px"></el-table-column>
        <!-- <el-table-column prop="content" label="会议内容" min-width="100px"></el-table-column> -->
        <el-table-column
          v-if="
        <el-table-column v-if="
            containPermissions([
              'business:bookings:update',
              'business:bookings:delete',
            ])
          "
          label="操作"
          min-width="100"
          align="center"
          fixed="right"
        >
        " label="操作" min-width="100" align="center" fixed="right">
          <template slot-scope="{ row }">
            <template>
              <el-button
                type="text"
                @click="$refs.operaBookingsDetailWindow.open('会议详情', row)"
                >查看详情</el-button
              >
              <el-button v-if="row.meetingStatus == '1'" type="text" @click="$refs.operaBookingsWindow.open('编辑会议预约', row)" v-permissions="['business:bookings:update']">编辑</el-button>
              <!-- <el-button type="text" @click="copy(row)">复制</el-button> -->
              <el-button v-if="row.meetingStatus == '1'"  type="text" @click="cancelMeeting(row.id)" v-permissions="['business:bookings:update']">撤回</el-button>
              <el-button type="text" @click="$refs.operaBookingsDetailWindow.open('会议详情', row)">查看详情</el-button>
              <el-button v-if="row.meetingStatus == '1'" type="text"
                @click="$refs.operaBookingsWindow.open('编辑会议预约', row)"
                v-permissions="['business:bookings:update']">编辑</el-button>
              <el-button type="text" v-if="row.meetingStatus == '1'" @click="handleStart(row)">开始</el-button>
              <el-button v-if="row.meetingStatus == '1'" type="text" @click="cancelMeeting(row.id)"
                v-permissions="['business:bookings:update']">撤回</el-button>
            </template>
            <!-- <el-button v-else type="text" @click="deleteById(row)" v-permissions="['business:bookings:delete']">删除</el-button> -->
          </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>
    <!-- 新建/修改 -->
    <OperaBookingsWindow
      ref="operaBookingsWindow"
      @success="handlePageChange"
    />
    <OperaBookingsDetailWindow
      @success="search"
      ref="operaBookingsDetailWindow"
    />
    <OperaBookingsWindow ref="operaBookingsWindow" @success="handlePageChange" />
    <OperaBookingsDetailWindow @success="search" ref="operaBookingsDetailWindow" />

  </TableLayout>
</template>
@@ -242,7 +132,7 @@
import { findList } from '@/api/meeting/rooms'
import { getSystemDictData } from '@/api/system/dictData'
import { fetchList } from '@/api/business/company'
import { cancelById, bookingsDetail } from '@/api/meeting/bookings'
import { cancelById, bookingsDetail, startEarlyById, startById } from '@/api/meeting/bookings'
import { timeForMat } from '@/utils/util'
export default {
  name: 'Bookings',
@@ -373,6 +263,19 @@
        .catch(e => {
        })
    },
    handleStart(row) {
      this.$dialog.messageWaring('开始会议', '是否开始当前会议？')
        .then(() => {
          let fn = new Date(row.startTime).getTime() > new Date().getTime() ? startEarlyById : startById
          fn({ id: row.id })
            .then(() => {
              this.$message.success('会议已开始')
              this.handlePageChange()
            })
            .catch(e => {
            })
        })
    },
    cancelMeeting (id) {
      this.$dialog.messageWaring('取消会议', '是否取消当前会议？')
        .then(() => {
@@ -433,24 +336,29 @@
<style lang="scss" scoped>
.detail_modal {
  padding: 20px 16px;

  .title {
    text-align: center;
    font-weight: 600;
    font-size: 16px;
    margin-bottom: 20px;
  }

  .h1 {
    font-weight: 600;
    font-size: 16px;
    margin-bottom: 15px;
  }

  .line {
    display: flex;
    margin-bottom: 10px;

    .label {
      width: 70px;
      color: #888888;
    }

    .value {
      color: #333333;
    }