diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 7a635104a..51f344af3 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -1,6 +1,6 @@
{
v-if="justInput"
:url="url"
:filter="filter"
- @on-fetch="(data) => (newNote.text = data[0]?.notes, originalText = data[0]?.notes, emit('onFetch', data))"
+ @on-fetch="fetchData"
auto-load
/>
{{ t('New note') }}
@@ -126,7 +134,7 @@ onBeforeRouteLeave((to, from, next) => {
v-model="newNote.observationTypeFk"
option-label="description"
style="flex: 0.15"
- :required="$props.required"
+ :required="$attrs.required"
@keyup.enter.stop="insert"
/>
{
size="lg"
autogrow
@keyup.enter.stop="handleClick"
- :required="$props.required"
+ :required="$attrs.required"
clearable
>
@@ -250,6 +258,11 @@ onBeforeRouteLeave((to, from, next) => {
}
}
}
+.just-input {
+ padding-right: 18px;
+ margin-bottom: 2px;
+ box-shadow: none;
+}
es:
diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue
index 006acee59..b671f0ebc 100644
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@@ -26,9 +26,7 @@ onMounted(() => {
if (data.value) observer.observe(data.value, opts);
});
-const actionsChildCount = () => {
- return !!actions.value?.childNodes?.length;
-};
+const actionsChildCount = computed(() => !!actions.value?.childNodes?.length);
onBeforeUnmount(() => stateStore.toggleSubToolbar() && hasSubToolbar);
diff --git a/src/pages/Customer/Card/CustomerNotes.vue b/src/pages/Customer/Card/CustomerNotes.vue
index f85634b2c..189b59904 100644
--- a/src/pages/Customer/Card/CustomerNotes.vue
+++ b/src/pages/Customer/Card/CustomerNotes.vue
@@ -23,6 +23,6 @@ const noteFilter = computed(() => {
:body="{ clientFk: route.params.id }"
style="overflow-y: auto"
:select-type="true"
- :required="true"
+ required
/>
diff --git a/src/pages/Worker/Card/WorkerCalendar.vue b/src/pages/Worker/Card/WorkerCalendar.vue
index 42c1a0423..32026dffe 100644
--- a/src/pages/Worker/Card/WorkerCalendar.vue
+++ b/src/pages/Worker/Card/WorkerCalendar.vue
@@ -205,7 +205,6 @@ watch([year, businessFk], () => refreshData());
}
"
:body="body"
- :required="false"
/>
diff --git a/src/pages/Worker/Card/WorkerCalendarFilter.vue b/src/pages/Worker/Card/WorkerCalendarFilter.vue
index 4b3cfebfe..48fc4094b 100644
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@@ -221,7 +221,7 @@ const yearList = ref(generateYears());
>
{{ type.name }}
-
+