update:修改日历列表数据

src/api/mes/cal/calholiday.js

 import request from '@/utils/request'
 
-// 查询节假日设置列表
+// 查询工作日设置列表
 export function listCalholiday(query) {
   return request({
-    url: '/mes/cal/calholiday/list',
-    method: 'get',
-    params: query
-  })
+    url: "/mes/cal/calendar/list",
+    method: "get",
+    params: query,
+  });
 }
 
 // 查询上班数据工作单元列表

src/views/mes/cal/calendar/calendarType.vue

@@ -15,8 +15,8 @@
                                       <div class="lunar" :class="{ festival : isFestival(date, data) }">{{ solarDate2lunar(data.day) }}</div>
                                 </el-col>
                                 <el-col :span="6">
-                                      <el-tag v-if="holidayList.indexOf(data.day) ==-1" effect="dark">班</el-tag>
-                                      <el-tag v-else effect="dark" type="success">休</el-tag>
+                                  <el-tag v-if="workdayList.indexOf(data.day)> -1" effect="dark">班</el-tag>
+                                  <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">
@@ -55,9 +55,7 @@ export default {
                   },
                   queryParams: {
                     theDay: null,
-                        holidayType: null,
-                        startTime: null,
-                        endTime: null,
+                    isWork: 1
                   },
             }
       },
@@ -66,11 +64,11 @@ export default {
           handler(newVal,oldVal){
             console.log(newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate());
             this.teamShiftQueryParams.theDay = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate();
-            this.loading = true;
+            this.queryParams.theDay = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate();
             listCalendars(this.teamShiftQueryParams).then(response =>{
               this.calendarDayList = response.data;
-              this.loading = false;
             });
+            this.getList();
           }
         }
       },
@@ -89,7 +87,7 @@ export default {
                         response.data.forEach(theDay => {
                               if(theDay.holidayType =='HOLIDAY'){
                               that.holidayList.push(theDay.theDay);
-                              }else{
+                              } else if(theDay.holidayType == 'WORKDAY'){
                                   that.workdayList.push(theDay.theDay);
                               }
                         });

src/views/mes/cal/calendar/team.vue

@@ -24,8 +24,8 @@
                                                 <div class="lunar" :class="{ festival : isFestival(date, data) }">{{ solarDate2lunar(data.day) }}</div>
                                           </el-col>
                                           <el-col :span="6">
-                                                <el-tag v-if="holidayList.indexOf(data.day) ==-1" effect="dark">班</el-tag>
-                                                <el-tag v-else effect="dark" type="success">休</el-tag>
+                                              <el-tag v-if="workdayList.indexOf(data.day)> -1" effect="dark">班</el-tag>
+                                              <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">
@@ -66,9 +66,7 @@ export default {
                   },
                   queryParams: {
                     theDay: null,
-                        holidayType: null,
-                        startTime: null,
-                        endTime: null,
+                    isWork: 1
                   }
             }
       },
@@ -77,11 +75,11 @@ export default {
                   handler(newVal,oldVal){
                     console.log(newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate());
                     this.teamShiftQueryParams.theDay = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate();
-                    this.loading = true;
+                    this.queryParams.theDay = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate();
                     listCalendars(this.teamShiftQueryParams).then(response =>{
                           this.calendarDayList = response.data;
-                          this.loading = false;
                     });
+                    this.getList();
                   }
             }
       },
@@ -106,7 +104,7 @@ export default {
                         response.data.forEach(theDay => {
                               if(theDay.holidayType =='HOLIDAY'){
                               that.holidayList.push(theDay.theDay);
-                              }else{
+                              }else if(theDay.holidayType == 'WORKDAY'){
                                   that.workdayList.push(theDay.theDay);
                               }
                         });

src/views/mes/cal/holiday/index.vue

@@ -10,8 +10,8 @@
                             </div>
                         </el-col>
                         <el-col :span="8">
-                            <el-tag v-if="holidayList.indexOf(data.day) ==-1" effect="dark">班</el-tag>
-                            <el-tag v-else effect="dark" type="success">休</el-tag>
+                            <el-tag v-if="workdayList.indexOf(data.day)> -1" effect="dark">班</el-tag>
+                            <el-tag v-else-if="holidayList.indexOf(data.day) > -1" effect="dark" type="success">休</el-tag>
                         </el-col>
                     </el-row>
                     <el-row>
@@ -79,9 +79,7 @@ export default {
             theDay: null,
             queryParams: {
                 theDay: null,
-                holidayType: null,
-                startTime: null,
-                endTime: null,
+                isWork: 1
             },
             // 表单校验
             rules: {
@@ -91,6 +89,15 @@ export default {
             }
         }
     },
+    watch:{
+      date:{
+        handler(newVal,oldVal){
+          console.log(newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate());
+          this.queryParams.theDay = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate();
+          this.getList()
+        }
+      }
+    },
     created() {
         this.getList();
     },
@@ -102,12 +109,11 @@ export default {
             this.workdayList =[];
             let that = this;
             listCalholiday(this.queryParams).then(response => {
-                debugger;
                 if(response.data !=null){
                     response.data.forEach(theDay => {
                         if(theDay.holidayType =='HOLIDAY'){
                             that.holidayList.push(theDay.theDay);
-                        }else{
+                        } else if(theDay.holidayType == 'WORKDAY'){
                             that.workdayList.push(theDay.theDay);
                         }
                     });