Merge branch 'feature/jq_1' into 'develop'

Feature/jq 1

See merge request !192

src/views/IM/diagnosis-admin/modal/newScheduling.vue

@@ -511,8 +511,35 @@
         });
       },
       selectInfo(info) {
+        console.log(info, 'infoinfoinfo');
         const startDay = new Date(info.start).getDay();
         const endDay = new Date(info.end).getDay();
+        // const chooseStartH = new Date(info.start).getHours();
+        // const chooseEndH = new Date(info.end).getHours();
+        // // const startH = 9;
+        // const middleH = 12;
+        // // const middleEH = 18;
+        // const endH = 21;
+        // const timeList = [];
+        // const timeObj = {};
+        // if (chooseStartH < middleH && chooseEndH >= endH ) {
+        //   console.log(chooseStartH, chooseEndH, 'endDayendDayendDayendDay1111');
+        //   timeList.push(
+        //     {
+        //       start:'2021-11-25 09:00:00',
+        //       end:'2021-11-25 12:00:00'
+        //     },
+        //     {
+        //       start:'2021-11-25 13:00:00',
+        //       end:'2021-11-25 17:00:00'
+        //     },
+        //     {
+        //       start:'2021-11-25 18:00:00',
+        //       end:'2021-11-25 21:00:00'
+        //     }
+        //   );
+        // }
+        // this.calendarOptions.events = timeList;
         if (startDay != endDay) {
           return this.$toast('不能夸天选择排班');
         }
@@ -527,15 +554,30 @@
             dataObj[item] = info[item];
           }
         });
+
+        console.log(dataObj, 'dataObjdataObj');
         this.calendarOptions.events.push(dataObj);
       },
       selectAllow(info) {
         this.isDoIt = true;
         const startDay = new Date(info.start).getDay();
         const endDay = new Date(info.end).getDay();
+        const startHour = dayjs(info.start).hour();
+        const endHour = dayjs(info.end).hour();
+        console.log(dayjs(info.start).format('YYYY-MM-DD HH:mm:ss'));
         if (startDay != endDay) {
           return false;
         }
+
+        // if (dayjs(info.start).format('YYYY-MM-DD HH:mm:ss').split(' ')[1] == '12:00:00' || dayjs(info.start).format('YYYY-MM-DD HH:mm:ss').split(' ')[1] == '17:00:00') {
+        //   return false;
+        // }
+        if (startHour <= 12 && endHour <= 21) {
+          return false;
+        } else if (startHour >= 12 && endHour <= 21) {
+          return false;
+        }
+
         const currentDate = new Date();
         const start = info.start;
         const end = info.end;