From accf61517a2367ca0f09923b23f29d060784f96b Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 5 Dec 2024 13:31:39 +0100
Subject: [PATCH] refactor: refs #8194 requested changes

---
 src/components/common/VnSelectWorker.vue      | 24 ++++++++++++-------
 src/pages/Customer/CustomerList.vue           |  1 -
 src/pages/Item/ItemRequestFilter.vue          |  2 ++
 src/pages/Order/Card/OrderFilter.vue          |  3 +++
 src/pages/Route/Card/RouteFilter.vue          |  1 -
 src/pages/Route/Card/RouteForm.vue            |  2 +-
 src/pages/Supplier/Card/SupplierBasicData.vue |  2 +-
 .../Ticket/Card/TicketCreateTracking.vue      |  2 +-
 src/pages/Worker/WorkerList.vue               |  1 +
 9 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/components/common/VnSelectWorker.vue b/src/components/common/VnSelectWorker.vue
index a6caeb300..07288954a 100644
--- a/src/components/common/VnSelectWorker.vue
+++ b/src/components/common/VnSelectWorker.vue
@@ -31,23 +31,28 @@ const value = computed({
         emit('update:modelValue', val);
     },
 });
+const url = computed(() => {
+    let url = 'Workers/search';
+    const { departmentCodes } = $props.params ?? {};
+    if (!departmentCodes) return url;
+    const params = new URLSearchParams({
+        departmentCodes: JSON.stringify(departmentCodes),
+    });
+
+    return url.concat(`?${params.toString()}`);
+});
 </script>
 
 <template>
     <VnSelect
+        :label="$t('globals.worker')"
         v-bind="$attrs"
         v-model="value"
-        :url="
-            $props.params
-                ? `Workers/search?departmentCodes=${JSON.stringify(
-                      $props.params.departmentCodes
-                  )}`
-                : 'Workers/search'
-        "
+        :url="url"
         option-value="id"
         option-label="nickname"
         :fields="['id', 'name', 'nickname', 'code']"
-        sort-by="name ASC"
+        sort-by="nickname ASC"
         :params="$props.params"
     >
         <template #prepend v-if="$props.hasAvatar">
@@ -55,9 +60,10 @@ const value = computed({
         </template>
         <template #append v-if="$props.hasInfo">
             <QIcon name="info" class="cursor-pointer">
-                <QTooltip>{{ $t('Responsible for approving invoices') }}</QTooltip>
+                <QTooltip>{{ $t($props.hasInfo) }}</QTooltip>
             </QIcon>
         </template>
+        <slot name="more-options" />
         <template #option="scope">
             <QItem v-bind="scope.itemProps">
                 <QItemSection>
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 6d6599b9c..e86e35966 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -431,7 +431,6 @@ function handleLocation(data, location) {
                 :id-value="data.salesPersonFk"
                 emit-value
                 auto-load
-                option-label="nickname"
             />
             <VnLocation
                 :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index 83758fd79..38dae75f0 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -150,7 +150,9 @@ const decrement = (paramsObj, key) => {
                         :label="t('params.requesterFk')"
                         v-model="params.requesterFk"
                         @update:model-value="searchFn()"
+                        :fields="['id', 'name']"
                         :params="{ departmentCodes: ['VT'] }"
+                        hide-selected
                         dense
                         outlined
                         rounded
diff --git a/src/pages/Order/Card/OrderFilter.vue b/src/pages/Order/Card/OrderFilter.vue
index 66de9eaa1..dc86600ac 100644
--- a/src/pages/Order/Card/OrderFilter.vue
+++ b/src/pages/Order/Card/OrderFilter.vue
@@ -65,6 +65,9 @@ const sourceList = ref([]);
                 <VnSelectWorker
                     :label="t('globals.salesPerson')"
                     v-model="params.workerFk"
+                    :params="{
+                        departmentCodes: ['VT'],
+                    }"
                     dense
                     outlined
                     rounded
diff --git a/src/pages/Route/Card/RouteFilter.vue b/src/pages/Route/Card/RouteFilter.vue
index 2e429aba8..6f65313d3 100644
--- a/src/pages/Route/Card/RouteFilter.vue
+++ b/src/pages/Route/Card/RouteFilter.vue
@@ -33,7 +33,6 @@ const emit = defineEmits(['search']);
             <QItem class="q-my-sm">
                 <QItemSection>
                     <VnSelectWorker
-                        :label="t('Worker')"
                         v-model="params.workerFk"
                         dense
                         outlined
diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index f323ccc3b..aa5caf1ef 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -95,7 +95,7 @@ const onSave = (data, response) => {
     >
         <template #form="{ data }">
             <VnRow>
-                <VnSelectWorker :label="t('worker')" v-model="data.workerFk" />
+                <VnSelectWorker v-model="data.workerFk" />
                 <VnSelect
                     :label="t('Vehicle')"
                     v-model="data.vehicleFk"
diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index cc5f26e4b..759608dca 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -34,7 +34,7 @@ const companySizes = [
                 <VnSelectWorker
                     :label="t('supplier.basicData.workerFk')"
                     v-model="data.workerFk"
-                    :has-info="true"
+                    has-info="Responsible for approving invoices"
                     :rules="validate('supplier.workerFk')"
                 />
                 <VnSelect
diff --git a/src/pages/Ticket/Card/TicketCreateTracking.vue b/src/pages/Ticket/Card/TicketCreateTracking.vue
index 74fbfa4a8..5c1e916f2 100644
--- a/src/pages/Ticket/Card/TicketCreateTracking.vue
+++ b/src/pages/Ticket/Card/TicketCreateTracking.vue
@@ -47,7 +47,7 @@ const onStateFkChange = (formData) => (formData.userFk = user.value.id);
                     option-label="name"
                     option-value="id"
                 />
-                <VnSelectWorker :label="t('expedition.worker')" v-model="data.userFk" />
+                <VnSelectWorker v-model="data.userFk" :fields="['id', 'name']" />
             </VnRow>
         </template>
     </FormModelPopup>
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 907d50298..bd1c27938 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -361,6 +361,7 @@ async function autofillBic(worker) {
 
 <i18n>
 es:
+    Create worker: Crear trabajador
     Search worker: Buscar trabajador
     You can search by worker id or name: Puedes buscar por id o nombre del trabajador
 </i18n>