Skip to content

P
pda-ui
Commit 54271902 authored by 张海景's avatar 张海景
Browse files
Options

update:修改排班日历

parent 0894b4df
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 34 deletions
src/views/mes/cal/calendar/calendarType.vue
View file @ 54271902
...@@ -70,11 +70,11 @@ export default { ...@@ -70,11 +70,11 @@ export default {
date:{ date:{
handler(newVal,oldVal){ handler(newVal,oldVal){
console.log(newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate()); console.log(newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate());
this.teamShiftQueryParams.theDay = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate(); // this.teamShiftQueryParams.theDay = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate();
this.queryParams.theDay = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate(); this.queryParams.theDay = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate();
listCalendars(this.teamShiftQueryParams).then(response =>{ // listCalendars(this.teamShiftQueryParams).then(response =>{
this.calendarDayList = response.data; // this.calendarDayList = response.data;
}); // });
this.getList(); this.getList();
} }
} }
...@@ -88,8 +88,10 @@ export default { ...@@ -88,8 +88,10 @@ export default {
this.loading = true; this.loading = true;
this.holidayList =[]; this.holidayList =[];
this.workdayList =[]; this.workdayList =[];
this.calendarDayList = []
let that = this; let that = this;
listCalholiday(this.queryParams).then(response => { listCalholiday(this.queryParams).then(response => {
this.calendarDayList = response.data
if(response.data !=null){ if(response.data !=null){
response.data.forEach(theDay => { response.data.forEach(theDay => {
if(theDay.holidayType =='HOLIDAY'){ if(theDay.holidayType =='HOLIDAY'){
......
src/views/mes/cal/calendar/team.vue
View file @ 54271902
...@@ -81,11 +81,11 @@ export default { ...@@ -81,11 +81,11 @@ export default {
date:{ date:{
handler(newVal,oldVal){ handler(newVal,oldVal){
console.log(newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate()); console.log(newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate());
this.teamShiftQueryParams.theDay = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate(); // this.teamShiftQueryParams.theDay = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate();
this.queryParams.theDay = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate(); this.queryParams.theDay = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate();
listCalendars(this.teamShiftQueryParams).then(response =>{ // listCalendars(this.teamShiftQueryParams).then(response =>{
this.calendarDayList = response.data; // this.calendarDayList = response.data;
}); // });
this.getList(); this.getList();
} }
} }
...@@ -110,6 +110,7 @@ export default { ...@@ -110,6 +110,7 @@ export default {
this.queryParams.workunitName = this.teamShiftQueryParams.workunitName this.queryParams.workunitName = this.teamShiftQueryParams.workunitName
} }
listCalholiday(this.queryParams).then(response => { listCalholiday(this.queryParams).then(response => {
this.calendarDayList = response.data;
if(response.data !=null){ if(response.data !=null){
response.data.forEach(theDay => { response.data.forEach(theDay => {
if(theDay.holidayType =='HOLIDAY'){ if(theDay.holidayType =='HOLIDAY'){
...@@ -125,12 +126,12 @@ export default { ...@@ -125,12 +126,12 @@ export default {
//点击班组类型 //点击班组类型
onSelected(teamId){ onSelected(teamId){
this.loading = true; this.loading = true;
this.teamShiftQueryParams.workunitName = teamId; this.queryParams.workunitName = teamId;
this.teamShiftQueryParams.theDay = this.date.getFullYear()+'-'+(this.date.getMonth()+1)+'-'+this.date.getDate(); this.queryParams.theDay = this.date.getFullYear()+'-'+(this.date.getMonth()+1)+'-'+this.date.getDate();
listCalendars(this.teamShiftQueryParams).then(response =>{ // listCalendars(this.teamShiftQueryParams).then(response =>{
this.calendarDayList = response.data; // this.calendarDayList = response.data;
this.loading = false; // this.loading = false;
}); // });
this.getList() this.getList()
}, },
isFestival(slotDate, slotData) { isFestival(slotDate, slotData) {
......
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