提交 0927f9b8 authored 作者: pengxiaohui's avatar pengxiaohui

会议过期增加查看按钮

上级 b8ee3506
...@@ -28,6 +28,10 @@ ...@@ -28,6 +28,10 @@
<el-button type="text" size="small" @click="handleDetails">查看</el-button> <el-button type="text" size="small" @click="handleDetails">查看</el-button>
<el-button type="text" size="small" v-if="operatable" @click="handleDelete">删除</el-button> <el-button type="text" size="small" v-if="operatable" @click="handleDelete">删除</el-button>
</template> </template>
<template v-if="status === 3">
<el-button type="text" size="small" @click="handleDetails">查看</el-button>
<!-- <el-button type="text" size="small" v-if="operatable" @click="handleDelete">删除</el-button> -->
</template>
<el-dialog :title="domicTitle" :visible.sync="dialogVisible" width="520px" center> <el-dialog :title="domicTitle" :visible.sync="dialogVisible" width="520px" center>
<div slot="title" class="dialog-header"> <div slot="title" class="dialog-header">
<p class="meeting-status" v-show="dialogType === 'details'">会议{{rowData.status | statusFilter}}</p> <p class="meeting-status" v-show="dialogType === 'details'">会议{{rowData.status | statusFilter}}</p>
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<el-option label="进行中" :value="1" /> <el-option label="进行中" :value="1" />
<el-option label="未开始" :value="0" /> <el-option label="未开始" :value="0" />
<el-option label="已完成" :value="2" /> <el-option label="已完成" :value="2" />
<el-option label="已过期" :value="3" />
</el-select> </el-select>
</el-col> </el-col>
</el-row> </el-row>
...@@ -31,11 +32,11 @@ ...@@ -31,11 +32,11 @@
</el-option> </el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="8">
<label>会议时间</label> <label>会议时间</label>
<el-date-picker v-model="filter.timeRange" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" size="mini" clearable></el-date-picker> <el-date-picker v-model="filter.timeRange" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" size="mini" clearable></el-date-picker>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="8" style="box-sizing:border-box;padding-left:94px;">
<el-button type="primary" icon="el-icon-search" size="mini" @click="fetchMeetingList">查询</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="fetchMeetingList">查询</el-button>
<el-button icon="el-icon-refresh-left" size="mini" @click="reset">重置</el-button> <el-button icon="el-icon-refresh-left" size="mini" @click="reset">重置</el-button>
</el-col> </el-col>
...@@ -175,7 +176,8 @@ export default { ...@@ -175,7 +176,8 @@ export default {
fetchMeetingList() { fetchMeetingList() {
const filter = this.filter const filter = this.filter
let start, endPlus1 let start, endPlus1
if (filter.timeRange.length > 0) { console.log(filter.timeRange)
if (Array.isArray(filter.timeRange) && filter.timeRange.length > 0) {
start = dateFormat(filter.timeRange[0]) start = dateFormat(filter.timeRange[0])
const end = filter.timeRange[1] const end = filter.timeRange[1]
endPlus1 = dateFormat(new Date(end.getFullYear(), end.getMonth(), end.getDate() + 1)) endPlus1 = dateFormat(new Date(end.getFullYear(), end.getMonth(), end.getDate() + 1))
...@@ -253,9 +255,9 @@ h5{ ...@@ -253,9 +255,9 @@ h5{
width: calc(100% - 120px); width: calc(100% - 120px);
min-width:160px; min-width:160px;
} }
.search-filter ::v-deep.el-date-editor--datetimerange.el-input__inner{ .search-filter ::v-deep.el-date-editor--daterange.el-input__inner{
width:300px; width: calc(100% - 120px);
padding:3px; padding:3px 0 3px 6px;
} }
.status-start{ .status-start{
color:#409eff; color:#409eff;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论