Merge branch 'feature/dxp' into 'develop'

瑞排班

See merge request !189

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

@@ -413,8 +413,14 @@
         const oneHour = 1 * 60 * 60 * 1000 * 24; // 一天的时间戳
         const timeDifference = (cz / oneHour) | 0; // 每周一时间距离今天时间数量
         const headObj = this.calendarOptions.customButtons.myCustomButton;
-        console.log(timeDifference, 'timeDifference');
+        console.log(timeDifference, 'timeDifference', cz / oneHour);
         // debugger;
+        const czCorrert = cz / oneHour;
+        if (timeDifference == 0 && czCorrert > 0) {
+          this.week = 1;
+          headObj.text = '本周';
+          return;
+        }
         if (timeDifference > 0 && timeDifference <= 6) {
           // 过去
           this.week = 1;