|
|
@@ -11,14 +11,14 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="会议开始" prop="startTime">
|
|
|
- <el-date-picker v-model="queryParams.startTime" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ <el-date-picker v-model="queryParams.startTime" style="width: 250px" value-format="yyyy-MM-dd HH:mm"
|
|
|
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
|
|
|
- :default-time="['00:00:00', '23:59:59']" />
|
|
|
+ :default-time="['00:00', '23:59']" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="会议结束" prop="endTime">
|
|
|
- <el-date-picker v-model="queryParams.endTime" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ <el-date-picker v-model="queryParams.endTime" style="width: 250px" value-format="yyyy-MM-dd HH:mm"
|
|
|
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
|
|
|
- :default-time="['00:00:00', '23:59:59']" />
|
|
|
+ :default-time="['00:00', '23:59']" />
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
|
|
|
@@ -28,7 +28,7 @@
|
|
|
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
<el-col :span="1.5">
|
|
|
- <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
|
|
+ <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
|
|
v-hasPermi="['meeting:reserveList:create']">新增</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
@@ -177,7 +177,7 @@
|
|
|
</div>
|
|
|
<div class="field-component">
|
|
|
<span :title="form.participantsName">{{ form.participantsName }}</span>
|
|
|
-
|
|
|
+
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="fx-field x-grid-col-12">
|
|
|
@@ -197,7 +197,7 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { listReserveMeeting, getReserveMeeting, delReserveMeeting,cancelReserveMeeting, addReserveMeeting, updateReserveMeeting, exportReserveMeeting } from "@/api/reserveMeeting";
|
|
|
+import { listReserveMeeting, getReserveMeeting, delReserveMeeting,cancelReserveMeeting, addReserveMeeting, updateReserveMeeting, exportReserveMeeting, endReserveMeeting } from "@/api/reserveMeeting";
|
|
|
import { listSimpleMeetings } from "@/api/meeting";
|
|
|
import PeopleSelect from "@/components/PeopleSelect/index.vue";
|
|
|
import { getDictDatas, DICT_TYPE } from '@/utils/dict'
|
|
|
@@ -520,4 +520,4 @@ ul {
|
|
|
.el-tag+.el-tag {
|
|
|
margin-left: 10px;
|
|
|
}
|
|
|
-</style>
|
|
|
+</style>
|