|
@@ -8,14 +8,10 @@
|
|
|
label-width="68px"
|
|
|
>
|
|
|
<el-form-item prop="unitName">
|
|
|
- <el-input
|
|
|
- placeholder="请输入单位"
|
|
|
- v-model="queryParams.unitName"
|
|
|
- @input="handleQuery"
|
|
|
- />
|
|
|
+ <el-input placeholder="请输入单位" v-model="queryParams.unitName" @input="handleQuery" />
|
|
|
</el-form-item>
|
|
|
|
|
|
- <el-form-item label="" prop="compereId">
|
|
|
+ <el-form-item label prop="compereId">
|
|
|
<el-select
|
|
|
v-model="queryParams.compereId"
|
|
|
placeholder="请选择主持人"
|
|
@@ -29,8 +25,7 @@
|
|
|
:label="item.name"
|
|
|
:value="item.id"
|
|
|
class="input_xiala"
|
|
|
- >
|
|
|
- </el-option>
|
|
|
+ ></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
@@ -46,8 +41,7 @@
|
|
|
size="mini"
|
|
|
@click="handleAdd"
|
|
|
v-hasPermi="['grassrootsregistration:bdgleven:add']"
|
|
|
- >新增</el-button
|
|
|
- >
|
|
|
+ >新增</el-button>
|
|
|
</el-col>
|
|
|
<!-- <el-col :span="1.5">
|
|
|
<el-button
|
|
@@ -84,7 +78,7 @@
|
|
|
v-hasPermi="['grassrootsregistration:bdgleven:export']"
|
|
|
>导出</el-button
|
|
|
>
|
|
|
- </el-col> -->
|
|
|
+ </el-col>-->
|
|
|
</el-row>
|
|
|
|
|
|
<el-table
|
|
@@ -97,9 +91,11 @@
|
|
|
<!-- <el-table-column label="序号" align="center" prop="id" /> -->
|
|
|
<el-table-column label="序号" type="index" width="50" align="center">
|
|
|
<template scope="scope">
|
|
|
- <span>{{
|
|
|
+ <span>
|
|
|
+ {{
|
|
|
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
|
|
|
- }}</span>
|
|
|
+ }}
|
|
|
+ </span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="单位" align="center" prop="unitName" />
|
|
@@ -108,51 +104,44 @@
|
|
|
align="center"
|
|
|
prop="title"
|
|
|
show-overflow-tooltip
|
|
|
- /> -->
|
|
|
+ />-->
|
|
|
<el-table-column label="会议议题" align="center" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ onEditor(scope.row.title) }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="主持人" align="center" prop="compereRen" />
|
|
|
- <el-table-column
|
|
|
- label="出席人"
|
|
|
- align="center"
|
|
|
- prop="joinId"
|
|
|
- show-overflow-tooltip
|
|
|
- />
|
|
|
+ <el-table-column label="出席人" align="center" prop="joinId" show-overflow-tooltip />
|
|
|
<!-- <el-table-column label="记录人" align="center" prop="peopleJiLu" /> -->
|
|
|
<!-- <el-table-column label="会议议题" align="center" prop="title" /> -->
|
|
|
<el-table-column label="召开地点" align="center" prop="address" />
|
|
|
<el-table-column label="会议时间" align="center" prop="convokeTime" />
|
|
|
- <el-table-column
|
|
|
- label="操作"
|
|
|
- align="center"
|
|
|
- class-name="small-padding fixed-width"
|
|
|
- width="200"
|
|
|
- >
|
|
|
+ <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
|
size="btk"
|
|
|
type="text"
|
|
|
@click="handleChakan(scope.row)"
|
|
|
v-hasPermi="['grassrootsregistration:bdgldiary:edit']"
|
|
|
- ><span class="chakan">查看</span></el-button
|
|
|
>
|
|
|
+ <span class="chakan">查看</span>
|
|
|
+ </el-button>
|
|
|
<el-button
|
|
|
size="btu"
|
|
|
type="text"
|
|
|
@click="handleUpdate(scope.row)"
|
|
|
v-hasPermi="['grassrootsregistration:bdgleven:edit']"
|
|
|
- ><span>修改</span></el-button
|
|
|
>
|
|
|
+ <span>修改</span>
|
|
|
+ </el-button>
|
|
|
<el-button
|
|
|
size="btd"
|
|
|
type="text"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
v-hasPermi="['grassrootsregistration:bdgleven:remove']"
|
|
|
- ><span class="delete">删除</span></el-button
|
|
|
>
|
|
|
+ <span class="delete">删除</span>
|
|
|
+ </el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
@@ -175,13 +164,7 @@
|
|
|
>
|
|
|
<div class="userAgree">
|
|
|
<div class="jiben">基本信息</div>
|
|
|
- <el-form
|
|
|
- ref="form"
|
|
|
- :model="form"
|
|
|
- :rules="rules"
|
|
|
- label-width="80px"
|
|
|
- :inline="true"
|
|
|
- >
|
|
|
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
|
|
|
<el-form-item label="单位" prop="unitId">
|
|
|
<treeselect
|
|
|
v-model="form.unitId"
|
|
@@ -202,8 +185,7 @@
|
|
|
value-format="yyyy-MM-dd"
|
|
|
placeholder="请选择召开时间"
|
|
|
@change="timeDay"
|
|
|
- >
|
|
|
- </el-date-picker>
|
|
|
+ ></el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="召开地点" prop="address" class="address">
|
|
|
<el-input v-model="form.address" placeholder="请输入召开地点" />
|
|
@@ -218,7 +200,7 @@
|
|
|
>
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
- </el-form-item> -->
|
|
|
+ </el-form-item>-->
|
|
|
<el-form-item label="主持人" prop="compereId">
|
|
|
<el-select
|
|
|
ref="headerSearchSelect"
|
|
@@ -233,17 +215,12 @@
|
|
|
:value="item.id"
|
|
|
@click.native="compere(item.name)"
|
|
|
class="input_xiala"
|
|
|
- >
|
|
|
- </el-option>
|
|
|
+ ></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
|
|
|
<el-form-item label="记录人" prop="peopleId">
|
|
|
- <el-select
|
|
|
- v-model="form.peopleId"
|
|
|
- placeholder="请选择记录人"
|
|
|
- class="input_xiala"
|
|
|
- >
|
|
|
+ <el-select v-model="form.peopleId" placeholder="请选择记录人" class="input_xiala">
|
|
|
<el-option
|
|
|
v-for="(item, i) in renYuan"
|
|
|
:key="i"
|
|
@@ -251,13 +228,12 @@
|
|
|
:label="item.name"
|
|
|
@click.native="people(item.name)"
|
|
|
class="input_xiala"
|
|
|
- >
|
|
|
- </el-option>
|
|
|
+ ></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<!-- <el-form-item label="会议议题" prop="title">
|
|
|
<el-input v-model="form.title" placeholder="请输入会议议题" />
|
|
|
- </el-form-item> -->
|
|
|
+ </el-form-item>-->
|
|
|
<el-form-item label="出席人" prop="joinId" class="joinId">
|
|
|
<el-select
|
|
|
ref="abc"
|
|
@@ -273,8 +249,7 @@
|
|
|
:label="item.name"
|
|
|
:value="item.name"
|
|
|
class="input_xiala"
|
|
|
- >
|
|
|
- </el-option>
|
|
|
+ ></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
|
|
@@ -297,8 +272,8 @@
|
|
|
ref="myTextEditor"
|
|
|
v-model="form.contents"
|
|
|
style="height: 150px; width: 920px; margin-left: 0px"
|
|
|
- ></quill-editor> -->
|
|
|
- <ImageUpload v-model="form.fileUrl"></ImageUpload>
|
|
|
+ ></quill-editor>-->
|
|
|
+ <ImageUpload2 v-model="form.fileUrl"></ImageUpload2>
|
|
|
</el-form>
|
|
|
</div>
|
|
|
<div slot="footer" class="dialog-footer" v-if="opens">
|
|
@@ -320,7 +295,7 @@
|
|
|
:message="wordInfo"
|
|
|
></bdgleven>
|
|
|
</el-dialog>
|
|
|
- </div> -->
|
|
|
+ </div>-->
|
|
|
|
|
|
<!-- 查看显示图片 -->
|
|
|
<div class="fff">
|
|
@@ -339,10 +314,11 @@
|
|
|
font-weight: 700;
|
|
|
"
|
|
|
>
|
|
|
- 会议时间:<span>{{ tiemse }}</span>
|
|
|
+ 会议时间:
|
|
|
+ <span>{{ tiemse }}</span>
|
|
|
</div>
|
|
|
<div v-for="item in arr" :key="item" class="divbox">
|
|
|
- <img :src="baseUrl + item" alt="" />
|
|
|
+ <img :src="baseUrl + item" alt />
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
@@ -361,13 +337,13 @@ import {
|
|
|
addBdgleven,
|
|
|
updateBdgleven,
|
|
|
exportBdgleven,
|
|
|
- getDept,
|
|
|
+ getDept
|
|
|
} from "@/api/grassrootsregistration/bdgleven";
|
|
|
import { jieZhiList } from "@/api/grassrootsregistration/bdgldiary";
|
|
|
import {
|
|
|
getZhuChiRen,
|
|
|
getShouBu,
|
|
|
- getAll,
|
|
|
+ getAll
|
|
|
} from "@/api/grassrootsregistration/bdglmeeting";
|
|
|
// 富文本
|
|
|
import "quill/dist/quill.core.css";
|
|
@@ -383,7 +359,7 @@ export default {
|
|
|
components: {
|
|
|
Treeselect,
|
|
|
quillEditor,
|
|
|
- bdgleven,
|
|
|
+ bdgleven
|
|
|
},
|
|
|
dicts: ["sys_huiyi"],
|
|
|
data() {
|
|
@@ -429,33 +405,33 @@ export default {
|
|
|
contents: null,
|
|
|
createtime: null,
|
|
|
updatetime: null,
|
|
|
- unitId: null,
|
|
|
+ unitId: null
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {},
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
unitId: [
|
|
|
- { required: true, message: "单位名称不能为空", trigger: "blur" },
|
|
|
+ { required: true, message: "单位名称不能为空", trigger: "blur" }
|
|
|
],
|
|
|
convokeTime: [
|
|
|
- { required: true, message: "召开时间按不能为空", trigger: "blur" },
|
|
|
+ { required: true, message: "召开时间按不能为空", trigger: "blur" }
|
|
|
],
|
|
|
address: [
|
|
|
- { required: true, message: "召开地点不能为空", trigger: "blur" },
|
|
|
+ { required: true, message: "召开地点不能为空", trigger: "blur" }
|
|
|
],
|
|
|
compereId: [
|
|
|
- { required: true, message: "主持人不能为空", trigger: "blur" },
|
|
|
+ { required: true, message: "主持人不能为空", trigger: "blur" }
|
|
|
],
|
|
|
joinId: [
|
|
|
- { required: true, message: "出席人不能为空", trigger: "blur" },
|
|
|
+ { required: true, message: "出席人不能为空", trigger: "blur" }
|
|
|
],
|
|
|
peopleId: [
|
|
|
- { required: true, message: "记录人不能为空", trigger: "blur" },
|
|
|
+ { required: true, message: "记录人不能为空", trigger: "blur" }
|
|
|
],
|
|
|
title: [
|
|
|
- { required: true, message: "会议议题不能为空", trigger: "blur" },
|
|
|
- ],
|
|
|
+ { required: true, message: "会议议题不能为空", trigger: "blur" }
|
|
|
+ ]
|
|
|
// meetingForm:[
|
|
|
// { required: true, message: "会议形式不能为空", trigger: "blur" },
|
|
|
// ]
|
|
@@ -471,7 +447,7 @@ export default {
|
|
|
// 树形配置对象
|
|
|
defaultProps: {
|
|
|
children: "children",
|
|
|
- label: "label",
|
|
|
+ label: "label"
|
|
|
},
|
|
|
// 修改拿到的数据
|
|
|
result: {},
|
|
@@ -489,7 +465,7 @@ export default {
|
|
|
// 下月日期
|
|
|
current_month1: [],
|
|
|
// 日期开关状态
|
|
|
- dayTime:null
|
|
|
+ dayTime: null
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
@@ -501,26 +477,26 @@ export default {
|
|
|
// 获取下月
|
|
|
this.getDayX();
|
|
|
//会议形式
|
|
|
- this.getDicts("sys_huiyi").then((response) => {
|
|
|
+ this.getDicts("sys_huiyi").then(response => {
|
|
|
this.huiYiList = response.data;
|
|
|
});
|
|
|
- jieZhiList().then(res=>{
|
|
|
+ jieZhiList().then(res => {
|
|
|
console.log(res);
|
|
|
- this.dayTime=res.rows[0].time
|
|
|
- })
|
|
|
+ this.dayTime = res.rows[0].time;
|
|
|
+ });
|
|
|
},
|
|
|
methods: {
|
|
|
timeDay(val) {
|
|
|
var date1 = Math.round(new Date(val) / 1000);
|
|
|
// 当月时间
|
|
|
- this.current_month.forEach((element) => {
|
|
|
+ this.current_month.forEach(element => {
|
|
|
// 十号之前是1678406400
|
|
|
var date2 = Math.round(new Date(element) / 1000);
|
|
|
- if (date1 > 1678406400&&this.dayTime==1) {
|
|
|
+ if (date1 > 1678406400 && this.dayTime == 1) {
|
|
|
this.$confirm("请在规定时间内填写", "提示", {
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
|
- type: "warning",
|
|
|
+ type: "warning"
|
|
|
})
|
|
|
.then(() => {
|
|
|
this.form.convokeTime = null;
|
|
@@ -529,11 +505,11 @@ export default {
|
|
|
this.form.convokeTime = null;
|
|
|
});
|
|
|
}
|
|
|
- if (date1<1675180250&&this.dayTime==1) {
|
|
|
+ if (date1 < 1675180250 && this.dayTime == 1) {
|
|
|
this.$confirm("请在规定时间内填写", "提示", {
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
|
- type: "warning",
|
|
|
+ type: "warning"
|
|
|
})
|
|
|
.then(() => {
|
|
|
this.form.convokeTime = null;
|
|
@@ -597,13 +573,13 @@ export default {
|
|
|
},
|
|
|
// 获取搜索所有人
|
|
|
getSuo() {
|
|
|
- getAll().then((res) => {
|
|
|
+ getAll().then(res => {
|
|
|
this.renYuans = res.rows;
|
|
|
});
|
|
|
},
|
|
|
// 获取搜索下拉部门
|
|
|
getBuMen() {
|
|
|
- getShouBu().then((res) => {
|
|
|
+ getShouBu().then(res => {
|
|
|
this.buMens = res.data;
|
|
|
});
|
|
|
},
|
|
@@ -628,7 +604,7 @@ export default {
|
|
|
},
|
|
|
// 获取主持人
|
|
|
getZhuChi(id) {
|
|
|
- getZhuChiRen(id).then((res) => {
|
|
|
+ getZhuChiRen(id).then(res => {
|
|
|
this.renYuan = res.data;
|
|
|
});
|
|
|
},
|
|
@@ -646,7 +622,7 @@ export default {
|
|
|
/** 查询连务会记录本列表 */
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
|
- listBdgleven(this.queryParams).then((response) => {
|
|
|
+ listBdgleven(this.queryParams).then(response => {
|
|
|
this.bdglevenList = response.rows;
|
|
|
this.total = response.total;
|
|
|
this.loading = false;
|
|
@@ -657,7 +633,7 @@ export default {
|
|
|
this.getList();
|
|
|
var url = "/grassrootsregistration/common/getZhuChiRen";
|
|
|
// 联动人员
|
|
|
- getDeptId(url, this.queryParams.unitId).then((res) => {
|
|
|
+ getDeptId(url, this.queryParams.unitId).then(res => {
|
|
|
this.renYuans = res.data;
|
|
|
});
|
|
|
},
|
|
@@ -684,7 +660,7 @@ export default {
|
|
|
contents: null,
|
|
|
createtime: null,
|
|
|
updatetime: null,
|
|
|
- unitId: null,
|
|
|
+ unitId: null
|
|
|
};
|
|
|
this.resetForm("form");
|
|
|
},
|
|
@@ -700,7 +676,7 @@ export default {
|
|
|
contents: null,
|
|
|
createtime: null,
|
|
|
updatetime: null,
|
|
|
- unitId: null,
|
|
|
+ unitId: null
|
|
|
};
|
|
|
this.resetForm("form");
|
|
|
},
|
|
@@ -731,7 +707,7 @@ export default {
|
|
|
this.$confirm("您编辑的内容尚未保存,是否退出?", "保存提示", {
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
|
- type: "warning",
|
|
|
+ type: "warning"
|
|
|
})
|
|
|
.then(() => {})
|
|
|
.catch(() => {});
|
|
@@ -740,7 +716,7 @@ export default {
|
|
|
|
|
|
// 多选框选中数据
|
|
|
handleSelectionChange(selection) {
|
|
|
- this.ids = selection.map((item) => item.id);
|
|
|
+ this.ids = selection.map(item => item.id);
|
|
|
this.single = selection.length !== 1;
|
|
|
this.multiple = !selection.length;
|
|
|
},
|
|
@@ -763,7 +739,7 @@ export default {
|
|
|
this.getTreeselect();
|
|
|
this.opens = true;
|
|
|
const id = row.id || this.ids;
|
|
|
- getBdgleven(id).then((response) => {
|
|
|
+ getBdgleven(id).then(response => {
|
|
|
this.result = response.data;
|
|
|
if (this.result.joinId !== "") {
|
|
|
this.result.joinId = response.data.joinId.split(",");
|
|
@@ -778,13 +754,13 @@ export default {
|
|
|
// 是否隐藏按钮
|
|
|
this.opens = false;
|
|
|
const id = row.id || this.ids;
|
|
|
- getBdgleven(id).then((response) => {
|
|
|
+ getBdgleven(id).then(response => {
|
|
|
// this.wordInfo = response.data;
|
|
|
if (response.data.fileUrl != null) {
|
|
|
if (response.data.fileUrl != "") {
|
|
|
this.arr = response.data.fileUrl.split(",");
|
|
|
this.tiemse = response.data.convokeTime;
|
|
|
- this.huiYiList.map((item) => {
|
|
|
+ this.huiYiList.map(item => {
|
|
|
if (item.dictValue == response.data.meetingForm) {
|
|
|
this.names = item.dictLabel;
|
|
|
}
|
|
@@ -800,13 +776,13 @@ export default {
|
|
|
/** 提交按钮 */
|
|
|
submitForm() {
|
|
|
// this.style = style
|
|
|
- this.$refs["form"].validate((valid) => {
|
|
|
+ this.$refs["form"].validate(valid => {
|
|
|
if (valid) {
|
|
|
if (this.form.id != null) {
|
|
|
if (this.form.joinId !== undefined) {
|
|
|
this.form.joinId = this.form.joinId.join(",");
|
|
|
}
|
|
|
- updateBdgleven(this.form).then((response) => {
|
|
|
+ updateBdgleven(this.form).then(response => {
|
|
|
this.$modal.msgSuccess("修改成功");
|
|
|
this.open = false;
|
|
|
this.getList();
|
|
@@ -818,7 +794,7 @@ export default {
|
|
|
// str = str.replace(/\n[\s| | ]*\r/g, "\n"); //去除多余空行
|
|
|
// this.form.title = str.replace(/ /gi, ""); //去掉
|
|
|
(this.form.joinId = this.form.joinId.join(",")),
|
|
|
- addBdgleven(this.form).then((response) => {
|
|
|
+ addBdgleven(this.form).then(response => {
|
|
|
this.$modal.msgSuccess("新增成功");
|
|
|
this.open = false;
|
|
|
this.getList();
|
|
@@ -833,7 +809,7 @@ export default {
|
|
|
this.$modal
|
|
|
// .confirm('是否确认删除连务会记录本编号为"' + ids + '"的数据项?')
|
|
|
.confirm("是否确认删除该数据?")
|
|
|
- .then(function () {
|
|
|
+ .then(function() {
|
|
|
return delBdgleven(ids);
|
|
|
})
|
|
|
.then(() => {
|
|
@@ -851,7 +827,7 @@ export default {
|
|
|
this.exportLoading = true;
|
|
|
return exportBdgleven(queryParams);
|
|
|
})
|
|
|
- .then((response) => {
|
|
|
+ .then(response => {
|
|
|
this.$download.name(response.msg);
|
|
|
this.exportLoading = false;
|
|
|
})
|
|
@@ -859,11 +835,11 @@ export default {
|
|
|
},
|
|
|
/** 查询部门下拉树结构 */
|
|
|
getTreeselect() {
|
|
|
- getDept().then((response) => {
|
|
|
+ getDept().then(response => {
|
|
|
this.deptOptions = response.data;
|
|
|
});
|
|
|
- },
|
|
|
- },
|
|
|
+ }
|
|
|
+ }
|
|
|
};
|
|
|
</script>
|
|
|
<style scoped>
|
|
@@ -1048,10 +1024,17 @@ export default {
|
|
|
/* 图片上传 */
|
|
|
::v-deep .el-upload--picture-card {
|
|
|
background-color: transparent;
|
|
|
+ width: 700px !important;
|
|
|
}
|
|
|
::v-deep .el-upload__tip {
|
|
|
color: #fff;
|
|
|
}
|
|
|
+
|
|
|
+::v-deep .el-upload-list--picture-card .el-upload-list__item {
|
|
|
+ width: 700px !important;
|
|
|
+ height: auto;
|
|
|
+ min-height: 120px;
|
|
|
+}
|
|
|
::v-deep img {
|
|
|
object-fit: cover;
|
|
|
}
|