|
|
@@ -35,12 +35,13 @@
|
|
|
title="会议新增"
|
|
|
:visible.sync="dialogVisible"
|
|
|
:before-close="close"
|
|
|
+ :modal="false"
|
|
|
width="45%">
|
|
|
<el-form :model="form" :rules="rules" ref="form" label-width="120px" size="small" class="demo-ruleForm" :disabled="auth? false: 'disabled'">
|
|
|
<el-form-item label="会议名称" prop="title">
|
|
|
<el-input v-model="form.title"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="参会角色" prop="roleId">
|
|
|
+ <el-form-item label="参会角色" prop="roleName">
|
|
|
<el-select v-model="form.roleName" clearable filterable placeholder="参会角色">
|
|
|
<el-option
|
|
|
v-for="item in roleNameList"
|
|
|
@@ -60,18 +61,18 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="发起科室" prop="title">
|
|
|
+ <el-form-item label="发起科室" prop="leaderName">
|
|
|
<el-input v-model="form.leaderName"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="会议开始时间" required>
|
|
|
<el-col :span="11">
|
|
|
- <el-form-item prop="startDate" style="margin-bottom: 0">
|
|
|
+ <el-form-item prop="begindate" style="margin-bottom: 0">
|
|
|
<el-date-picker type="date"
|
|
|
format="yyyy-MM-dd"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
placeholder="选择日期"
|
|
|
v-model="form.begindate"
|
|
|
- style="width: 100%;">
|
|
|
+ style="width: 100%;" >
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -93,7 +94,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="会议结束时间" required>
|
|
|
<el-col :span="11">
|
|
|
- <el-form-item prop="endDate" style="margin-bottom: 0">
|
|
|
+ <el-form-item prop="enddate" style="margin-bottom: 0">
|
|
|
<el-date-picker type="date"
|
|
|
format="yyyy-MM-dd"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
@@ -150,7 +151,7 @@
|
|
|
return {
|
|
|
activeNum: 0,
|
|
|
dialogVisible: false,
|
|
|
- meetingRoomList: [],
|
|
|
+ // meetingRoomList: [],
|
|
|
subList: [],
|
|
|
array: [],
|
|
|
auth: false,
|
|
|
@@ -175,6 +176,7 @@
|
|
|
is_party: '0',
|
|
|
name: '否'
|
|
|
},
|
|
|
+
|
|
|
],
|
|
|
form: {
|
|
|
title: '',
|
|
|
@@ -188,16 +190,20 @@
|
|
|
roleId: '',
|
|
|
roleColor: '',
|
|
|
id: '',
|
|
|
- isParty: ''
|
|
|
+ isParty: '否',
|
|
|
+ roleName: '分管公司领导/部门负责人'
|
|
|
},
|
|
|
rules: {
|
|
|
title: [{required: true, message: '请输入会议主题', trigger: 'blur'}],
|
|
|
userid:[{required: true, message: '请选择会议室使用人', trigger: 'change'}],
|
|
|
- beginDate:[{required: true, message: '请选择开始日期', trigger: 'change'}],
|
|
|
- startTime:[{required: true, message: '请选择开始时间', trigger: 'change'}],
|
|
|
- enddate:[{required: true, message: '请选择结束日期', trigger: 'change'}],
|
|
|
- endTime:[{required: true, message: '请选择结束时间', trigger: 'change'}],
|
|
|
- remark:[{required: true, message: '请填写会议备注', trigger: 'blur'}]
|
|
|
+ begindate:[{required: true, message: '请选择开始日期', trigger: 'change'}],
|
|
|
+ startTime:[{required: true, message: '请选择开始时间', trigger: 'change'}],
|
|
|
+ enddate:[{required: true, message: '请选择结束日期', trigger: 'change'}],
|
|
|
+ endTime:[{required: true, message: '请选择结束时间', trigger: 'change'}],
|
|
|
+ remark:[{required: true, message: '请填写会议备注', trigger: 'blur'}],
|
|
|
+ leaderName:[{required: true, message: '发起科室', trigger: 'blur'}],
|
|
|
+ isParty:[{required: true, message: '是否是党会', trigger: 'change'}],
|
|
|
+ roleName:[{required: true, message: '参会角色', trigger: 'change'}]
|
|
|
},
|
|
|
calendarOptions: {
|
|
|
// timeGridPlugin 可显示每日时间段
|
|
|
@@ -205,8 +211,8 @@
|
|
|
plugins: [dayGridPlugin, interactionPlugin],
|
|
|
headerToolbar: {
|
|
|
left: "prev,next today",
|
|
|
- center: "title",
|
|
|
- right: "dayGridMonth,dayGridWeek,dayGrid",
|
|
|
+ center: "title",
|
|
|
+ right: "dayGridMonth,dayGridWeek,dayGrid",
|
|
|
// right: 'agendaWeek,dayGridWeek,dayGrid'
|
|
|
},
|
|
|
buttonText: {
|
|
|
@@ -277,8 +283,8 @@
|
|
|
// this.meetingRoomList = this.array.meetingRoomList;
|
|
|
// console.log('this.array', this.array)
|
|
|
// this.getReservationList(this.array.scheduleList0);
|
|
|
- this.getList();
|
|
|
this.queryRole();
|
|
|
+ this.getList();
|
|
|
},
|
|
|
methods: {
|
|
|
// 获取会议信息
|
|
|
@@ -309,10 +315,11 @@
|
|
|
},
|
|
|
data: {isFile: "0"},
|
|
|
}).then((res) => {
|
|
|
- console.log('res', res)
|
|
|
- if (res.data && res.data.length > 0) {
|
|
|
- this.auth = res.data;
|
|
|
- }
|
|
|
+ console.log('res====', typeof res.data)
|
|
|
+ console.log(res.data)
|
|
|
+ this.auth = res.data;
|
|
|
+ console.log("res.data",res.data)
|
|
|
+
|
|
|
});
|
|
|
},
|
|
|
getReservationList(arrayData) {
|
|
|
@@ -325,7 +332,7 @@
|
|
|
end: this.addDate(this.dealWithTime(item.enddate), 1),
|
|
|
color: item.roleColor,
|
|
|
id: item.id,
|
|
|
- title: `${this.getTitle(item.begindate, item.enddate)} ${item.title}`,
|
|
|
+ title: `${this.getTitle(item.begindate, item.enddate)} ${item.title} ${item.leaderName}`,
|
|
|
})
|
|
|
});
|
|
|
this.calendarOptions.events = newArr;
|
|
|
@@ -383,7 +390,6 @@
|
|
|
},
|
|
|
// 日历日程点击事件
|
|
|
handleEventClick(calEvent) {
|
|
|
-
|
|
|
console.log(calEvent, '事件2');
|
|
|
this.dialogVisible = true;
|
|
|
let id = calEvent.event.id;
|
|
|
@@ -425,7 +431,6 @@
|
|
|
this.dialogVisible = false;
|
|
|
this.$http({
|
|
|
url: this.form.id === '' ? '/market/calendar/add' : '/market/calendar/update',
|
|
|
- // url: '/market/calendar/add',
|
|
|
method: "post",
|
|
|
headers: {
|
|
|
"Content-Type": "application/json",
|
ningl