From 0873930f45b904a1400e660882af6425550195b9 Mon Sep 17 00:00:00 2001 From: zhangxuanming <2260476558@qq.com> Date: Fri, 27 Dec 2024 16:00:54 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=8E=92=E7=8F=AD=E6=97=A5?= =?UTF-8?q?=E5=8E=86=E4=B8=AD=E5=A2=9E=E5=8A=A0=E4=B8=8B=E6=8B=89=E6=A1=86?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E4=BE=BF=E5=BF=AB=E9=80=9F=E5=AE=9A=E4=BD=8D?= =?UTF-8?q?=E5=88=B0=E6=9F=90=E4=B8=AA=E6=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/cal/calendar/calendarType.vue | 16 ++++++ src/views/mes/cal/calendar/person.vue | 54 ++++++++++++-------- src/views/mes/cal/calendar/team.vue | 56 +++++++++++++-------- 3 files changed, 83 insertions(+), 43 deletions(-) diff --git a/src/views/mes/cal/calendar/calendarType.vue b/src/views/mes/cal/calendar/calendarType.vue index f5c8a18..8eb39ea 100644 --- a/src/views/mes/cal/calendar/calendarType.vue +++ b/src/views/mes/cal/calendar/calendarType.vue @@ -11,6 +11,16 @@ + + + + + + @@ -58,8 +66,8 @@ import { listCalendars } from "@/api/mes/cal/calendar"; import UserSingleSelect from "@/components/userSelect/single.vue" import calendar from '@/utils/calendar'; export default { - name: 'UserView', - dicts:['mes_calendar_type'], + name: 'UserView', + dicts:['mes_calendar_type'], components :{UserSingleSelect}, data(){ return { @@ -81,15 +89,14 @@ 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; @@ -101,12 +108,15 @@ export default { this.getList(); }, methods:{ + changeDate(val) { + this.date = val + }, /** 查询节假日设置列表 */ 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 => { @@ -115,7 +125,7 @@ export default { }else{ that.workdayList.push(theDay.theDay); } - }); + }); this.loading = false; } }); @@ -125,9 +135,9 @@ export default { this.$refs.userSelect.showFlag = true; }, //人员选择返回 - onUserSelected(row){ + onUserSelected(row){ this.form.nickName = row.nickName; - this.loading = true; + this.loading = true; this.teamShiftQueryParams.userId = row.userId; this.teamShiftQueryParams.date = this.date; listCalendars(this.teamShiftQueryParams).then(response =>{ @@ -138,20 +148,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 = []; @@ -159,9 +169,9 @@ export default { festAndTerm.push(lunar.lunarFestival == null ? '' : '' + lunar.lunarFestival) festAndTerm.push(lunar.Term == null ? '' : '' + lunar.Term) festAndTerm = festAndTerm.join('') - + return festAndTerm == '' ? lunarMD : festAndTerm - + } } } @@ -218,4 +228,4 @@ export default { .el-calendar-table .holiday { background-color: #88E325; } - \ No newline at end of file + diff --git a/src/views/mes/cal/calendar/team.vue b/src/views/mes/cal/calendar/team.vue index 257f278..874171d 100644 --- a/src/views/mes/cal/calendar/team.vue +++ b/src/views/mes/cal/calendar/team.vue @@ -2,21 +2,31 @@
- + {{item.teamName}} + >{{item.teamName}} + + + + + + @@ -52,10 +62,11 @@ import { listCalholiday } from "@/api/mes/cal/calholiday"; import { listCalendars } from "@/api/mes/cal/calendar"; import calendar from '@/utils/calendar'; export default { - name: 'TeamView', - dicts:['mes_calendar_type'], + name: 'TeamView', + dicts:['mes_calendar_type'], data(){ return { + form: {}, // 遮罩层 loading: true, date: new Date(), @@ -73,15 +84,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,6 +105,9 @@ export default { this.getTeams(); }, methods:{ + changeDate(val) { + this.date = val + }, getTeams(){ listAllTeam().then(response =>{ this.teamList = response.data; @@ -101,10 +115,10 @@ export default { }, /** 查询节假日设置列表 */ 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 => { @@ -113,14 +127,14 @@ export default { }else{ that.workdayList.push(theDay.theDay); } - }); + }); this.loading = false; } }); }, //点击班组类型 onSelected(teamId){ - this.loading = true; + this.loading = true; this.teamShiftQueryParams.teamId = teamId; this.teamShiftQueryParams.date = this.date; listCalendars(this.teamShiftQueryParams).then(response =>{ @@ -131,20 +145,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 = []; @@ -152,9 +166,9 @@ export default { festAndTerm.push(lunar.lunarFestival == null ? '' : '' + lunar.lunarFestival) festAndTerm.push(lunar.Term == null ? '' : '' + lunar.Term) festAndTerm = festAndTerm.join('') - + return festAndTerm == '' ? lunarMD : festAndTerm - + } } } @@ -211,4 +225,4 @@ export default { .el-calendar-table .holiday { background-color: #88E325; } - \ No newline at end of file +