|
@@ -1,94 +1,7 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
- <el-form-item label="会议类型" prop="meetingType">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.meetingType"
|
|
|
- placeholder="请输入会议类型"
|
|
|
- clearable
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="时间" prop="meetingTime">
|
|
|
- <el-date-picker clearable
|
|
|
- v-model="queryParams.meetingTime"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="请选择时间">
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="地点" prop="meetingVenue">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.meetingVenue"
|
|
|
- placeholder="请输入地点"
|
|
|
- clearable
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="主持人" prop="host">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.host"
|
|
|
- placeholder="请输入主持人"
|
|
|
- clearable
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="记录人" prop="recorder">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.recorder"
|
|
|
- placeholder="请输入记录人"
|
|
|
- clearable
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="参加人员" prop="participants">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.participants"
|
|
|
- placeholder="请输入参加人员"
|
|
|
- clearable
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="缺席人员" prop="absentees">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.absentees"
|
|
|
- placeholder="请输入缺席人员"
|
|
|
- clearable
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="列席人员" prop="attendees">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.attendees"
|
|
|
- placeholder="请输入列席人员"
|
|
|
- clearable
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="主要议题" prop="mainTopics">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.mainTopics"
|
|
|
- placeholder="请输入主要议题"
|
|
|
- clearable
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="形成决议" prop="resolutionsFormed">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.resolutionsFormed"
|
|
|
- placeholder="请输入形成决议"
|
|
|
- clearable
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="备注" prop="remarks">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.remarks"
|
|
|
- placeholder="请输入备注"
|
|
|
- clearable
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
+
|
|
|
<el-form-item>
|
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
@@ -153,8 +66,7 @@
|
|
|
|
|
|
<el-table v-loading="loading" :data="mgrList" @selection-change="handleSelectionChange" :height="clientHeight" border>
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
- <el-table-column label="会议类型" align="center" prop="meetingType">
|
|
|
- </el-table-column>
|
|
|
+ <el-table-column label="会议类型" align="center" prop="meetingType" :formatter="meetingTypeFormat"/>
|
|
|
<el-table-column label="时间" align="center" prop="meetingTime" width="120">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ parseTime(scope.row.meetingTime, '{y}-{m}-{d}') }}</span>
|
|
@@ -169,7 +81,6 @@
|
|
|
<el-table-column label="主要议题" align="left" prop="mainTopics" width="350"/>
|
|
|
<el-table-column label="形成决议" align="left" prop="resolutionsFormed" width="350"/>
|
|
|
<el-table-column label="备注" align="center" prop="remarks"/>
|
|
|
- <el-table-column label="数据归属部门" align="center" prop="deptId"/>
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120" fixed="right">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
@@ -202,7 +113,14 @@
|
|
|
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
|
<el-form-item label="会议类型" prop="meetingType">
|
|
|
- <el-input v-model="form.meetingType" placeholder="请输入会议类型" />
|
|
|
+ <el-select v-model="form.meetingType" placeholder="请输入会议类型">
|
|
|
+ <el-option
|
|
|
+ v-for="dict in meetingTypeOptions"
|
|
|
+ :key="dict.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="时间" prop="meetingTime">
|
|
|
<el-date-picker clearable
|
|
@@ -239,6 +157,9 @@
|
|
|
<el-form-item label="备注" prop="remarks">
|
|
|
<el-input v-model="form.remarks" placeholder="请输入备注" />
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="归属部门" prop="deptId">
|
|
|
+ <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
|
|
|
+ </el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
|
@@ -250,9 +171,14 @@
|
|
|
|
|
|
<script>
|
|
|
import { listMeeting, getMeeting, delMeeting, addMeeting, updateMeeting } from "@/api/branch/meeting";
|
|
|
+import { treeselect } from "@/api/system/dept";
|
|
|
+import { getToken } from "@/utils/auth";
|
|
|
+import Treeselect from "@riophae/vue-treeselect";
|
|
|
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
|
|
|
|
export default {
|
|
|
name: "Meeting",
|
|
|
+ components: { Treeselect },
|
|
|
data() {
|
|
|
return {
|
|
|
clientHeight:300,
|
|
@@ -298,17 +224,41 @@ export default {
|
|
|
meetingId: [
|
|
|
{ required: true, message: "$comment不能为空", trigger: "blur" }
|
|
|
],
|
|
|
- }
|
|
|
+ },
|
|
|
+ // 会议类型字典
|
|
|
+ meetingTypeOptions: [],
|
|
|
+ // 部门树选项
|
|
|
+ deptOptions: undefined,
|
|
|
};
|
|
|
},
|
|
|
+ watch: {
|
|
|
+ // 根据名称筛选部门树
|
|
|
+ deptName(val) {
|
|
|
+ this.$refs.tree.filter(val);
|
|
|
+ }
|
|
|
+ },
|
|
|
created() {
|
|
|
//设置表格高度对应屏幕高度
|
|
|
this.$nextTick(() => {
|
|
|
this.clientHeight = document.body.clientHeight -250
|
|
|
})
|
|
|
this.getList();
|
|
|
+ this.getTreeselect();
|
|
|
+ this.getDicts("meeting_type").then(response => {
|
|
|
+ this.meetingTypeOptions = response.data;
|
|
|
+ });
|
|
|
},
|
|
|
methods: {
|
|
|
+ /** 查询部门下拉树结构 */
|
|
|
+ getTreeselect() {
|
|
|
+ treeselect().then(response => {
|
|
|
+ this.deptOptions = response.data;
|
|
|
+ });
|
|
|
+ },
|
|
|
+ // 会议类型字典翻译
|
|
|
+ meetingTypeFormat(row, column) {
|
|
|
+ return this.selectDictLabel(this.meetingTypeOptions, row.meetingType);
|
|
|
+ },
|
|
|
/** 查询支部会议管理列表 */
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
@@ -366,7 +316,7 @@ export default {
|
|
|
handleAdd() {
|
|
|
this.reset();
|
|
|
this.open = true;
|
|
|
- this.title = "添加支部会议管理";
|
|
|
+ this.title = "添加支部会议";
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row) {
|
|
@@ -375,7 +325,7 @@ export default {
|
|
|
getMeeting(meetingId).then(response => {
|
|
|
this.form = response.data;
|
|
|
this.open = true;
|
|
|
- this.title = "修改支部会议管理";
|
|
|
+ this.title = "修改支部会议";
|
|
|
});
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
@@ -401,7 +351,7 @@ export default {
|
|
|
/** 删除按钮操作 */
|
|
|
handleDelete(row) {
|
|
|
const meetingIds = row.meetingId || this.ids;
|
|
|
- this.$modal.confirm('是否确认删除支部会议管理编号为"' + meetingIds + '"的数据项?').then(function() {
|
|
|
+ this.$modal.confirm('是否确认删除支部会议编号为"' + meetingIds + '"的数据项?').then(function() {
|
|
|
return delMeeting(meetingIds);
|
|
|
}).then(() => {
|
|
|
this.getList();
|