From a81dba842984a70e9d849548f3b871d556c7eb56 Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Mon, 6 Mar 2023 12:01:03 +0300 Subject: [PATCH] =?UTF-8?q?[WIP]=20=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B1=D0=B0?= =?UTF-8?q?=D0=B3=D0=B0=20=D1=81=D0=B1=D1=80=D0=BE=D1=81=D0=B0=20=D0=B4?= =?UTF-8?q?=D0=BD=D0=B5=D0=B9=20=D0=B8=20=D1=81=D1=82=D0=B8=D0=BB=D0=B5?= =?UTF-8?q?=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/schedule/components/ScheduleBar.vue | 3 ++- src/pages/schedule/components/ScheduleTable.vue | 6 ++---- src/pages/schedule/components/ScheduleTableBody.vue | 2 +- src/pages/schedule/components/ScheduleTableSelect.vue | 3 ++- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/schedule/components/ScheduleBar.vue b/src/pages/schedule/components/ScheduleBar.vue index 0ecc257..9964289 100644 --- a/src/pages/schedule/components/ScheduleBar.vue +++ b/src/pages/schedule/components/ScheduleBar.vue @@ -43,7 +43,7 @@ color="primary", style="width: 144px", padding="4px 24px", - @click="createSchedules", + @click="createSchedules(); clearCell()", no-caps ) q-btn( @@ -72,6 +72,7 @@ export default { times: Object, createSchedules: Function, deleteSchedule: Function, + clearCell: Function, }, data() { return { diff --git a/src/pages/schedule/components/ScheduleTable.vue b/src/pages/schedule/components/ScheduleTable.vue index 978cc7e..3fd7b0a 100644 --- a/src/pages/schedule/components/ScheduleTable.vue +++ b/src/pages/schedule/components/ScheduleTable.vue @@ -1,8 +1,5 @@ diff --git a/src/pages/schedule/components/ScheduleTableBody.vue b/src/pages/schedule/components/ScheduleTableBody.vue index a7eb21c..baea05f 100644 --- a/src/pages/schedule/components/ScheduleTableBody.vue +++ b/src/pages/schedule/components/ScheduleTableBody.vue @@ -19,7 +19,7 @@ :serialized="serialized", :change-shift="changeShift" ) - .name-employee.flex.justify-center.items-center.cursor-pointer + .name-employee.flex.justify-center.items-center span {{trimOwnerName(schedule.last_name, schedule.first_name, schedule.patronymic)}} .row.flex .cell.flex.flex-col.items-center.justify-center.w-11.h-11.cursor-pointer.transition( diff --git a/src/pages/schedule/components/ScheduleTableSelect.vue b/src/pages/schedule/components/ScheduleTableSelect.vue index fbec6d5..e72b563 100644 --- a/src/pages/schedule/components/ScheduleTableSelect.vue +++ b/src/pages/schedule/components/ScheduleTableSelect.vue @@ -4,7 +4,7 @@ ) .edit.flex.items-center.justify-center.h-11.w-11(v-if="selectEmployee.label") .flex.icon-edit - .flex.justify-center.items-center.cursor-pointer( + .flex.justify-center.items-center( :class="{'select-name': selectEmployee.label}", :style="{color: 'var(--btn-blue-color)'}" ) @@ -68,6 +68,7 @@ export default { .edit border-bottom: 1.5px solid var(--border-light-grey-color-1) border-left: 1.5px solid var(--border-light-grey-color-1) + border-right: 1.5px solid var(--border-light-grey-color-1) .schedule-select border-right: 8px solid var(--bg-ligth-blue-color)