From 1050affe7cb800ddb65ed0fab3fe83f56dd380ce Mon Sep 17 00:00:00 2001
From: zhangxuanming <2260476558@qq.com>
Date: Thu, 26 Dec 2024 14:12:59 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=8E=92=E7=89=88=E6=97=A5?=
 =?UTF-8?q?=E5=8E=86=E5=88=87=E6=8D=A2=E5=90=8E=E7=AC=AC=E4=B8=80=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=B2=A1=E6=9C=89=E5=88=B7=E6=96=B0=EF=BC=8C=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=88=87=E6=8D=A2=E6=9C=88=E4=BB=BD=E5=90=8E=E6=89=8D?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/cal/calendar/calendarType.vue | 46 ++++++++++-----------
 1 file changed, 23 insertions(+), 23 deletions(-)

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 @@
       <div class="app-container">
           <el-container>
                   <el-aside width="150px">
-                        <el-radio-group v-model="selectedType" class="x-fillitem el-group-list" @change="onSelected">        
+                        <el-radio-group v-model="selectedType" class="x-fillitem el-group-list" @change="onSelected">
                               <el-radio-button
                                     v-for="dict in dict.type.mes_calendar_type"
                                     :key="dict.value"
                                     :label="dict.value"
-                              >{{dict.label}}</el-radio-button>                                              
+                              >{{dict.label}}</el-radio-button>
                         </el-radio-group>
                   </el-aside>
                   <el-main>
@@ -16,7 +16,7 @@
                               <div>
                                     <el-row>
                                           <el-col :span="6">
-                                                <div class="solar">                    
+                                                <div class="solar">
                                                       {{ data.day.split('-')[2] }}
                                                 </div>
                                           </el-col>
@@ -35,10 +35,10 @@
                                                       <el-button v-if="teamShift.orderNum ==2 && calendarDay.shiftType=='SHIFT_THREE'" type="warning" icon="el-icon-sunny">{{ teamShift.teamName }}</el-button>
                                                       <el-button v-if="teamShift.orderNum ==2 && calendarDay.shiftType=='SHIFT_TWO'"   type="info"    icon="el-icon-moon">{{ teamShift.teamName }}</el-button>
                                                       <el-button v-if="teamShift.orderNum ==3 && calendarDay.shiftType=='SHIFT_THREE'" type="info"    icon="el-icon-moon">{{ teamShift.teamName }}</el-button>
-                                                </div>                                               
+                                                </div>
                                           </el-col>
-                                    </el-row>                                  
-                              </div>                
+                                    </el-row>
+                              </div>
                               </template>
                         </el-calendar>
                   </el-main>
@@ -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;
       }
-</style>
\ No newline at end of file
+</style>