diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 2a111d246..61a65f38e 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -159,7 +159,7 @@ const handleObservationTypes = async (data) => {
function exprBuilder(param, value) {
switch (param) {
case 'observationTypeFk':
- case 'workerFk':
+ case 'userFk':
return { [param]: value };
}
}
diff --git a/src/pages/Customer/Card/CustomerNotes.vue b/src/pages/Customer/Card/CustomerNotes.vue
index facc4a1c3..94dbb4a7f 100644
--- a/src/pages/Customer/Card/CustomerNotes.vue
+++ b/src/pages/Customer/Card/CustomerNotes.vue
@@ -3,6 +3,7 @@ import { ref, computed, onMounted, onUnmounted } from 'vue';
import { useI18n } from 'vue-i18n';
import { useStateStore } from 'stores/useStateStore';
+import { useState } from 'src/composables/useState';
import RightMenu from 'src/components/common/RightMenu.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
@@ -22,17 +23,17 @@ const columns = computed(() => [
name: 'observationTypeFk',
},
{
- name: 'workerFk',
+ name: 'userFk',
},
]);
const setWorkerObservations = (data) => {
const seen = new Set();
filteredWorkers.value = data;
- filteredWorkers.value = data.filter((worker) => {
- if (!seen.has(worker.workerFk)) {
- seen.add(worker.workerFk);
- return true;
+ filteredWorkers.value = data.filter((observation) => {
+ if (!seen.has(observation.userFk)) {
+ seen.add(observation.userFk);
+ return observation.user;
}
return false;
});
@@ -40,7 +41,7 @@ const setWorkerObservations = (data) => {
function exprBuilder(param, value) {
switch (param) {
case 'observationTypeFk':
- case 'workerFk':
+ case 'userFk':
return { [param]: value };
}
}
@@ -57,7 +58,6 @@ onUnmounted(() => {
{
data-cy="VnNotes-observation-type-filter"
/>
-
+
searchFn()"
- hide-selected
dense
filled
data-cy="VnNotes-user-filter"
@@ -95,12 +94,12 @@ onUnmounted(() => {
-
+
- {{ opt.worker?.user?.name }}
+ {{ opt?.user?.name }}
- {{ `#${opt.worker?.user?.id}` }}
+ {{ `#${opt?.user?.id}` }}
@@ -118,7 +117,6 @@ onUnmounted(() => {
:body="{ clientFk: $route.params.id, userFk: user.id }"
style="overflow-y: auto"
:select-type="true"
- :filter-columns="['workerFk', 'observationTypeFk']"
required
order="created DESC"
@on-fetch="(data) => setWorkerObservations(data)"