Merge remote-tracking branch 'origin/master'

k94314517

2024-09-30 af3434a79c2a096105668273cfa27c09eacf6ff1

 admin/src/views/meeting/bookings.vue

@@ -98,7 +98,7 @@
            'business:bookings:update',
            'business:bookings:delete',
          ])
        " label="操作" min-width="100" align="center" fixed="right">
        " label="操作" min-width="140" align="center" fixed="right">
          <template slot-scope="{ row }">
            <template>
              <el-button type="text" @click="$refs.operaBookingsDetailWindow.open('会议详情', row)">查看详情</el-button>
@@ -106,6 +106,7 @@
                @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 type="text" v-if="row.meetingStatus == '2'" @click="handleEnd(row)">结束</el-button>
              <el-button v-if="row.meetingStatus == '1'" type="text" @click="cancelMeeting(row.id)"
                v-permissions="['business:bookings:update']">撤回</el-button>
            </template>
@@ -132,7 +133,7 @@
import { findList } from '@/api/meeting/rooms'
import { getSystemDictData } from '@/api/system/dictData'
import { fetchList } from '@/api/business/company'
import { cancelById, bookingsDetail, startEarlyById, startById } from '@/api/meeting/bookings'
import { cancelById, bookingsDetail, startEarlyById, startById, meetingEndById } from '@/api/meeting/bookings'
import { timeForMat } from '@/utils/util'
export default {
  name: 'Bookings',
@@ -276,6 +277,18 @@
            })
        })
    },
    handleEnd(row) {
      this.$dialog.messageWaring('结束会议', '是否结束当前会议？')
        .then(() => {
          meetingEndById({ id: row.id })
            .then(() => {
              this.$message.success('会议已结束')
              this.handlePageChange()
            })
            .catch(e => {
            })
        })
    },
    cancelMeeting(id) {
      this.$dialog.messageWaring('取消会议', '是否取消当前会议？')
        .then(() => {