Commit ceb430b2 authored by 沈翠玲's avatar 沈翠玲

1.点击页面时,去掉刷新事件;

2.点击月份按钮(上个月、今天、下个月)时,只显示当前所选工作组/车间的(左侧列表焦点不要丢失)工厂日历。
parent 798b7818
......@@ -2,17 +2,17 @@
<div class="app-container">
<el-container class="el-container-cal">
<el-aside width="200px" class="el-aside-cal">
<el-tree :data="teamList" :props="defaultProps" :expand-on-click-node="false" class="el-tree-pro" node-key="id"
<el-tree :data="teamList" :props="defaultProps" :expand-on-click-node="false" class="el-tree-pro" highlight-current node-key="id"
:filter-node-method="filterNode" ref="tree" :default-expanded-keys="defaultExpandedKeys" @node-click="onSelected" >
<span slot-scope="{ data }" :title="data.label"
>{{ data.label }}</span>
</el-tree>
</el-aside>
<el-main>
<el-calendar v-loading="loading" v-model="date">
<el-calendar v-loading="loading" v-model="date" class="myteam-cal">
<template slot="dateCell" slot-scope="{date, data }">
<div>
<el-row>
<div @click.stop.prevent style="height: 100%; padding: 8px">
<el-row style="height: 100%;">
<el-col :span="18">
<div class="solar">
{{ data.day.split('-')[1]+'-'+data.day.split('-')[2] }}
......@@ -31,7 +31,7 @@
<el-tag v-else-if="holidayList.indexOf(data.day) > -1" effect="dark" type="success"></el-tag>
</el-col>
</el-row>
<el-row v-for="calendarDay in calendarDayList " :key="calendarDay.theDay">
<el-row v-for="calendarDay in calendarDayList " :key="calendarDay.theDay" @click.stop.prevent>
<el-col :span="24" v-if="calendarDay.theDay == data.day && holidayList.indexOf(data.day) ==-1">
<div v-for="(teamShift,index) in calendarDay.calPlanWorkunitList" :key="index" class="grid-content">
<el-button type="primary" v-if="teamShift.shiftName === '白班'" icon="el-icon-sunny">{{ teamShift.workunitName }}</el-button>
......@@ -63,6 +63,7 @@ export default {
children: "children",
label: "label",
},
selectRow: {},
date: new Date(),
teamList: [], //所有的班组
holidayList:[],//假日
......@@ -83,7 +84,11 @@ export default {
date:{
handler(newVal,oldVal){
this.queryParams.theDay = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate();
this.getList();
let type = ''
if(this.selectRow['level'] === 2 || this.selectRow['level'] === 3){
type = 'id'
}
this.getList(type);
}
}
},
......@@ -146,6 +151,7 @@ export default {
},
//点击班组类型
onSelected(data){
this.selectRow = data
if(data['level'] === 4){
this.loading = true;
this.queryParams.workunitName = data['label'];
......@@ -250,4 +256,10 @@ export default {
.el-calendar-table .holiday {
background-color: #88E325;
}
.myteam-cal .el-calendar-table .el-calendar-day {
padding: 0px;
}
.myteam-cal .el-calendar-table__row .current {
pointer-events: none;
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment