diff --git a/src/pages/schedule/TheSchedule.vue b/src/pages/schedule/TheSchedule.vue
index a6b3f96..7922d70 100644
--- a/src/pages/schedule/TheSchedule.vue
+++ b/src/pages/schedule/TheSchedule.vue
@@ -31,15 +31,11 @@
:active-cell="activeCell",
:set-active-cell="setActiveCell",
:change-shift="postUpdateSchedule",
- @schedule-employee="createScheduleEmployee",
- @schedules="distributeRequest"
- )
- schedule-bar(
- :buttons="buttons",
:times="times",
:create-schedules="postCreateSchedules",
:delete-schedule="deleteSchedule",
- :template="template"
+ @schedule-employee="createScheduleEmployee",
+ @schedules="distributeRequest"
)
@@ -48,14 +44,12 @@ import * as moment from "moment";
import BaseLoader from "@/components/Loader/BaseLoader.vue";
import { fetchWrapper } from "@/shared/fetchWrapper.js";
import ScheduleHeader from "@/pages/schedule/components/ScheduleHeader.vue";
-import ScheduleBar from "@/pages/schedule/components/ScheduleBar.vue";
import ScheduleTable from "@/pages/schedule/components/ScheduleTable.vue";
export default {
name: "TheSchedule",
components: {
ScheduleHeader,
- ScheduleBar,
ScheduleTable,
BaseLoader,
},
diff --git a/src/pages/schedule/components/FormChangeShift.vue b/src/pages/schedule/components/FormChangeShift.vue
index 7784d6d..283bf3d 100644
--- a/src/pages/schedule/components/FormChangeShift.vue
+++ b/src/pages/schedule/components/FormChangeShift.vue
@@ -106,7 +106,7 @@ export default {
height: fit-content
width: 534px
background-color: var(--default-white)
- box-shadow: 0px 0px 9px rgba(0, 0, 0, 0.05)
+ box-shadow: 0px 0px 9px rgba(0, 0, 0, 0.25)
border-radius: 4px
z-index: 5
diff --git a/src/pages/schedule/components/ScheduleBar.vue b/src/pages/schedule/components/ScheduleBar.vue
index 97960d5..0ecc257 100644
--- a/src/pages/schedule/components/ScheduleBar.vue
+++ b/src/pages/schedule/components/ScheduleBar.vue
@@ -79,6 +79,7 @@ export default {
{ label: "2/2", name: "2/2", symbol: "'2/2'" },
{ label: "Дежурство", name: "DUTY", symbol: "'Д'" },
{ label: "Смена", name: "FirstEvenSecondOdd", symbol: "'С'" },
+ { label: "-", name: "None", symbol: false },
],
};
},
diff --git a/src/pages/schedule/components/ScheduleTable.vue b/src/pages/schedule/components/ScheduleTable.vue
index cc6dd9b..978cc7e 100644
--- a/src/pages/schedule/components/ScheduleTable.vue
+++ b/src/pages/schedule/components/ScheduleTable.vue
@@ -1,5 +1,8 @@
- .schedule.flex-col(:style="themeCell")
+ .schedule.flex-col(
+ :style="themeCell",
+ v-click-outside="clearCell"
+ )
schedule-table-header(:result="result")
schedule-table-body(
:serialized="serialized",
@@ -27,6 +30,13 @@
:choice-state="choiceState",
:trim-owner-name="trimOwnerName"
)
+ schedule-bar(
+ :buttons="buttons",
+ :times="times",
+ :create-schedules="createSchedules",
+ :delete-schedule="deleteSchedule",
+ :template="template"
+ )