新页面添加预约时间颜色

src/views/IM/diagnosis-admin/overviewScheduling.vue

@@ -174,9 +174,15 @@
         this.dateTime = value;
       },
       search() {
+        if(!this.dateTime || !this.departmentId) {
+          return this.$message({
+            message: '科室和时间都需要选择哦！',
+            type: 'warning'
+          });
+        }
         const params = {
-          dateTime: this.dateTime || null,
-          departmentId: this.departmentId || null,
+          dateTime: this.dateTime,
+          departmentId: this.departmentId,
         };
         previewWork({ ...params }).then((res) => {
           if (res.code === '000000') {
@@ -188,17 +194,29 @@
                 };
               }
             );
-            this.calendarOptions.events = res.data.dutyWorkList.map(
+            const dutyRosterPreList = res.data.dutyRosterPreList.map(
               (item, index) => {
                 return {
                   id: index,
                   resourceId: item.doctorId,
                   end: item.endTime,
                   start: item.startTime,
-                  color: ' #FFEDE9',
+                  color: '#FFEDE9',
                 };
               }
             );
+            const dutyWorkList = res.data.dutyWorkList.map(
+              (item, index) => {
+                return {
+                  id: index,
+                  resourceId: item.doctorId,
+                  end: item.endTime,
+                  start: item.startTime,
+                  color: '#E7F4F5',
+                };
+              }
+            );
+            this.calendarOptions.events = [].concat(dutyRosterPreList, dutyWorkList);
             const calendarApi = this.$refs.fullCalendar.getApi();
             calendarApi.gotoDate(this.dateTime);