diff --git a/src/views/mes/cal/calendar/calendarType.vue b/src/views/mes/cal/calendar/calendarType.vue
index 403f4de..f5c8a18 100644
--- a/src/views/mes/cal/calendar/calendarType.vue
+++ b/src/views/mes/cal/calendar/calendarType.vue
@@ -2,12 +2,12 @@
-
+
{{dict.label}}
+ >{{dict.label}}
@@ -16,7 +16,7 @@
-
+
{{ data.day.split('-')[2] }}
@@ -35,10 +35,10 @@
{{ teamShift.teamName }}
{{ teamShift.teamName }}
{{ teamShift.teamName }}
-
+
-
-
+
+
@@ -51,8 +51,8 @@ import { listCalholiday } from "@/api/mes/cal/calholiday";
import { listCalendars } from "@/api/mes/cal/calendar";
import calendar from '@/utils/calendar';
export default {
- name: 'CalendarTypeView',
- dicts:['mes_calendar_type'],
+ name: 'CalendarTypeView',
+ dicts:['mes_calendar_type'],
data(){
return {
// 遮罩层
@@ -72,15 +72,15 @@ export default {
holidayType: null,
startTime: null,
endTime: null,
- },
+ },
}
},
watch:{
date:{
handler(newVal,oldVal){
console.log(newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate());
- this.teamShiftQueryParams.date = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate();
- this.loading = true;
+ this.teamShiftQueryParams.date = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate();
+ this.loading = true;
listCalendars(this.teamShiftQueryParams).then(response =>{
this.calendarDayList = response.data;
this.loading = false;
@@ -94,10 +94,10 @@ export default {
methods:{
/** 查询节假日设置列表 */
getList() {
- this.loading = true;
+ this.loading = true;
this.holidayList =[];
this.workdayList =[];
- let that = this;
+ let that = this;
listCalholiday(this.queryParams).then(response => {
if(response.data !=null){
response.data.forEach(theDay => {
@@ -106,16 +106,16 @@ export default {
}else{
that.workdayList.push(theDay.theDay);
}
- });
+ });
this.loading = false;
}
});
},
//点击班组类型
onSelected(calType){
- this.loading = true;
+ this.loading = true;
this.teamShiftQueryParams.calendarType = calType;
- this.teamShiftQueryParams.date = this.date;
+ this.teamShiftQueryParams.date = this.date.getFullYear() + '-' + (this.date.getMonth() + 1) + '-' + this.date.getDate();
listCalendars(this.teamShiftQueryParams).then(response =>{
this.calendarDayList = response.data;
this.loading = false;
@@ -124,20 +124,20 @@ export default {
isFestival(slotDate, slotData) {
let solarDayArr = slotData.day.split('-');
let lunarDay = calendar.solar2lunar(solarDayArr[0], solarDayArr[1], solarDayArr[2])
-
+
// 公历节日\农历节日\农历节气
let festAndTerm = [];
festAndTerm.push(lunarDay.festival == null ? '' : ' ' + lunarDay.festival)
festAndTerm.push(lunarDay.lunarFestival == null ? '' : '' + lunarDay.lunarFestival)
festAndTerm.push(lunarDay.Term == null ? '' : '' + lunarDay.Term)
festAndTerm = festAndTerm.join('')
-
+
return festAndTerm != ''
},
solarDate2lunar(solarDate) {
var solar = solarDate.split('-')
- var lunar = calendar.solar2lunar(solar[0], solar[1], solar[2])
-
+ var lunar = calendar.solar2lunar(solar[0], solar[1], solar[2])
+
let lunarMD = lunar.IMonthCn + lunar.IDayCn;
// 公历节日\农历节日\农历节气
let festAndTerm = [];
@@ -145,9 +145,9 @@ export default {
festAndTerm.push(lunar.lunarFestival == null ? '' : '' + lunar.lunarFestival)
festAndTerm.push(lunar.Term == null ? '' : '' + lunar.Term)
festAndTerm = festAndTerm.join('')
-
+
return festAndTerm == '' ? lunarMD : festAndTerm
-
+
}
}
}
@@ -204,4 +204,4 @@ export default {
.el-calendar-table .holiday {
background-color: #88E325;
}
-
\ No newline at end of file
+