|
@@ -91,6 +91,7 @@
|
|
<el-form-item label="参会角色" prop="orgId">
|
|
<el-form-item label="参会角色" prop="orgId">
|
|
<el-select
|
|
<el-select
|
|
v-model="form.orgId"
|
|
v-model="form.orgId"
|
|
|
|
+ style="width:483px"
|
|
clearable
|
|
clearable
|
|
filterable
|
|
filterable
|
|
placeholder="参会角色"
|
|
placeholder="参会角色"
|
|
@@ -109,6 +110,7 @@
|
|
<el-select
|
|
<el-select
|
|
v-model="form.isParty"
|
|
v-model="form.isParty"
|
|
clearable
|
|
clearable
|
|
|
|
+ style="width:483px"
|
|
filterable
|
|
filterable
|
|
placeholder="是否是党会"
|
|
placeholder="是否是党会"
|
|
>
|
|
>
|
|
@@ -448,7 +450,7 @@ export default {
|
|
newfrom: [], //新获得过滤数字
|
|
newfrom: [], //新获得过滤数字
|
|
titleNew: "",
|
|
titleNew: "",
|
|
delStatus: false,
|
|
delStatus: false,
|
|
- showEvmStatus: "",
|
|
|
|
|
|
+ showEvmStatus: false,
|
|
};
|
|
};
|
|
},
|
|
},
|
|
mounted() {
|
|
mounted() {
|
|
@@ -659,7 +661,11 @@ export default {
|
|
},
|
|
},
|
|
showEwm(a) {
|
|
showEwm(a) {
|
|
if (a == 0) {
|
|
if (a == 0) {
|
|
- this.closexuan();
|
|
|
|
|
|
+ this.showEvmStatus = false;
|
|
|
|
+ this.closexuan()
|
|
|
|
+ }else{
|
|
|
|
+ //驶入
|
|
|
|
+ this.showEvmStatus = true
|
|
}
|
|
}
|
|
},
|
|
},
|
|
//渲染窗体
|
|
//渲染窗体
|
|
@@ -694,17 +700,22 @@ export default {
|
|
},
|
|
},
|
|
//鼠标滑过事件
|
|
//鼠标滑过事件
|
|
eventmouseover(calEvent, event) {
|
|
eventmouseover(calEvent, event) {
|
|
|
|
+ console.log(123);
|
|
this.xuanchuang(calEvent, event);
|
|
this.xuanchuang(calEvent, event);
|
|
},
|
|
},
|
|
- eventmouseout() {},
|
|
|
|
|
|
+ eventmouseout() {
|
|
|
|
+ // setInterval(() =>{
|
|
|
|
+ // if(this.showEvmStatus == false){
|
|
|
|
+ // this.closexuan()
|
|
|
|
+ // }
|
|
|
|
+ // },3000)
|
|
|
|
+ },
|
|
//关闭悬停窗口
|
|
//关闭悬停窗口
|
|
closexuan() {
|
|
closexuan() {
|
|
this.$refs.ove.style.display = "none";
|
|
this.$refs.ove.style.display = "none";
|
|
},
|
|
},
|
|
//悬停窗体修改按钮
|
|
//悬停窗体修改按钮
|
|
xiuxuan(events) {
|
|
xiuxuan(events) {
|
|
- console.log(events);
|
|
|
|
- console.log(this.array);
|
|
|
|
var j = 0;
|
|
var j = 0;
|
|
for (var i = 0; i < this.array.length; i++) {
|
|
for (var i = 0; i < this.array.length; i++) {
|
|
if (this.array[i].id == this.idx) {
|
|
if (this.array[i].id == this.idx) {
|
|
@@ -713,7 +724,6 @@ export default {
|
|
}
|
|
}
|
|
this.calEventt.event = this.array[j];
|
|
this.calEventt.event = this.array[j];
|
|
var aa = this.calEventt;
|
|
var aa = this.calEventt;
|
|
- console.log(aa);
|
|
|
|
this.handleEventClick(aa);
|
|
this.handleEventClick(aa);
|
|
},
|
|
},
|
|
//悬停窗体删除按钮
|
|
//悬停窗体删除按钮
|
|
@@ -722,46 +732,43 @@ export default {
|
|
},
|
|
},
|
|
// 点击日历
|
|
// 点击日历
|
|
handleDateClick: function (arg) {
|
|
handleDateClick: function (arg) {
|
|
- console.log(arg);
|
|
|
|
|
|
+ this.form.orgId = [];
|
|
|
|
+ this.form.isParty = ''
|
|
this.titleNew = "会议新增";
|
|
this.titleNew = "会议新增";
|
|
if (!this.auth) {
|
|
if (!this.auth) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
// this.$forceUpdate();
|
|
// this.$forceUpdate();
|
|
- console.log(arg, "事件1");
|
|
|
|
//开始时间
|
|
//开始时间
|
|
this.form.begindate = arg.dateStr;
|
|
this.form.begindate = arg.dateStr;
|
|
//结束时间
|
|
//结束时间
|
|
this.form.enddate = arg.dateStr;
|
|
this.form.enddate = arg.dateStr;
|
|
- this.$http({
|
|
|
|
- url: "/market/calendar/queryNow",
|
|
|
|
- method: "post",
|
|
|
|
- headers: {
|
|
|
|
- "Content-Type": "application/json",
|
|
|
|
- },
|
|
|
|
- data: { now: arg.dateStr },
|
|
|
|
- }).then((res) => {
|
|
|
|
- if (res.data) {
|
|
|
|
- let result = [];
|
|
|
|
- result = res.data;
|
|
|
|
- result.map((item) => {
|
|
|
|
- item.begindate = item.begindate.substring(10).substring(1, 6);
|
|
|
|
- item.enddate = item.enddate.substring(10).substring(1, 6);
|
|
|
|
- return result;
|
|
|
|
- });
|
|
|
|
- this.newfrom = result;
|
|
|
|
- console.log(this.newfrom);
|
|
|
|
- }
|
|
|
|
- });
|
|
|
|
|
|
+ // this.$http({
|
|
|
|
+ // url: "/market/calendar/queryNow",
|
|
|
|
+ // method: "post",
|
|
|
|
+ // headers: {
|
|
|
|
+ // "Content-Type": "application/json",
|
|
|
|
+ // },
|
|
|
|
+ // data: { now: arg.dateStr },
|
|
|
|
+ // }).then((res) => {
|
|
|
|
+ // if (res.data) {
|
|
|
|
+ // let result = [];
|
|
|
|
+ // result = res.data;
|
|
|
|
+ // result.map((item) => {
|
|
|
|
+ // item.begindate = item.begindate.substring(10).substring(1, 6);
|
|
|
|
+ // item.enddate = item.enddate.substring(10).substring(1, 6);
|
|
|
|
+ // return result;
|
|
|
|
+ // });
|
|
|
|
+ // this.newfrom = result;
|
|
|
|
+ // }
|
|
|
|
+ // });
|
|
this.dialogVisible = true;
|
|
this.dialogVisible = true;
|
|
},
|
|
},
|
|
// 日历日程点击事件
|
|
// 日历日程点击事件
|
|
handleEventClick(calEvent) {
|
|
handleEventClick(calEvent) {
|
|
this.titleNew = "会议修改";
|
|
this.titleNew = "会议修改";
|
|
- console.log(calEvent, "事件2");
|
|
|
|
this.dialogVisible = true;
|
|
this.dialogVisible = true;
|
|
let id = calEvent.event.id;
|
|
let id = calEvent.event.id;
|
|
- console.log(this.subList);
|
|
|
|
let info = this.subList.filter((item) => {
|
|
let info = this.subList.filter((item) => {
|
|
return item.id == id;
|
|
return item.id == id;
|
|
});
|
|
});
|
|
@@ -770,8 +777,6 @@ export default {
|
|
// 处理时间回显
|
|
// 处理时间回显
|
|
this.getShowTime(this.form.begindate, this.form.enddate);
|
|
this.getShowTime(this.form.begindate, this.form.enddate);
|
|
// this.gitPeople(this.form.roleName);
|
|
// this.gitPeople(this.form.roleName);
|
|
- console.log(info[0], "数据");
|
|
|
|
- console.log(this.form, "数据222");
|
|
|
|
this.orgId = this.form.roleName;
|
|
this.orgId = this.form.roleName;
|
|
// this.orgIds=this.form.roleName
|
|
// this.orgIds=this.form.roleName
|
|
// this.roleNameList.userId=info[0].roleName
|
|
// this.roleNameList.userId=info[0].roleName
|
|
@@ -823,7 +828,6 @@ export default {
|
|
},
|
|
},
|
|
// 提交数据
|
|
// 提交数据
|
|
submitForm(formName) {
|
|
submitForm(formName) {
|
|
- console.log(this.form);
|
|
|
|
this.$refs[formName].validate((valid) => {
|
|
this.$refs[formName].validate((valid) => {
|
|
if (valid) {
|
|
if (valid) {
|
|
this.form.begindate = `${this.form.begindate} ${this.form.startTime}`;
|
|
this.form.begindate = `${this.form.begindate} ${this.form.startTime}`;
|