Merge pull request '#7524 add my team filter' (!849) from 7524-hotfix-myTeamFilter into master

Reviewed-on: verdnatura/salix-front#849
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

src/i18n/locale/en.yml

@@ -296,6 +296,8 @@ globals:
         from: From
         To: To
         stateFk: State
+        myTeam: My team
+        departmentFk: Department
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred

src/i18n/locale/es.yml

@@ -300,6 +300,8 @@ globals:
         from: Desde
         To: Hasta
         stateFk: Estado
+        myTeam: Mi equipo
+        departmentFk: Departamento
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor

src/pages/Ticket/TicketAdvance.vue

@@ -462,6 +462,9 @@ onMounted(async () => {
     userParams.dateFuture = tomorrow;
     userParams.dateToAdvance = today;
     userParams.warehouseFk = user.value.warehouseFk;
+    userParams.ipt = 'H';
+    userParams.futureIpt = 'H';
+    userParams.isFullMovable = true;
     const filter = { limit: 0 };
     await arrayData.addFilter({ filter, userParams });
 });

src/pages/Ticket/TicketAdvanceFilter.vue

@@ -10,7 +10,7 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 import axios from 'axios';
 import { onMounted } from 'vue';
 
-const { t } = useI18n();
+const { t, te } = useI18n();
 const props = defineProps({
     dataKey: {
         type: String,
@@ -42,6 +42,11 @@ const getItemPackingTypes = async () => {
     }
 };
 
+const getLocale = (val) => {
+    const param = `params.${val}`;
+    return te(param) ? t(param) : t(`globals.${param}`);
+};
+
 onMounted(async () => await getItemPackingTypes());
 </script>
 
@@ -59,7 +64,7 @@ onMounted(async () => await getItemPackingTypes());
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <strong>{{ getLocale(tag.label) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
@@ -126,6 +131,19 @@ onMounted(async () => await getItemPackingTypes());
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        :label="t('globals.params.departmentFk')"
+                        v-model="params.departmentFk"
+                        url="Departments"
+                        :fields="['id', 'name']"
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelect

src/pages/Ticket/locale/es.yml

@@ -88,7 +88,7 @@ weeklyTickets:
 advanceTickets:
     preparation: Preparación
     origin: Origen
-    destination: Destinatario
+    destination: Destino
     originAgency: 'Agencia origen: {agency}'
     destinationAgency: 'Agencia destino: {agency}'
     ticketId: ID