[
label: t('Worker'),
field: (row) => row.workerFk,
sortable: true,
- options: workers.value,
+ url: 'Workers/search',
+ where: { active: 1 },
+ sortBy: 'name ASC',
model: 'workerFk',
optionValue: 'id',
optionLabel: 'nickname',
@@ -129,13 +130,6 @@ const columns = computed(() => [
@on-fetch="(data) => (claimRedeliveries = data)"
auto-load
/>
- (workers = data)"
- auto-load
- />
[
>
@@ -211,7 +211,7 @@ async function saveWhenHasChanges() {
- toCurrency(sale.quantity * sale.price * ((100 - sale.discount) / 100)),
+ field: (row) =>
+ toCurrency(row.quantity * row.sale.price * ((100 - row.sale.discount) / 100)),
sortable: true,
},
]);
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index eae9721ab..6d85817dc 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -52,6 +52,7 @@ const columns = computed(() => [
name: 'attendedBy',
orderBy: 'workerFk',
columnFilter: {
+ name: 'attenderFk',
component: 'select',
attrs: {
url: 'Workers/activeWithInheritedRole',
diff --git a/src/pages/Entry/EntryBuysTableDialog.vue b/src/pages/Entry/EntryBuysTableDialog.vue
index 9a76770aa..0f9be6298 100644
--- a/src/pages/Entry/EntryBuysTableDialog.vue
+++ b/src/pages/Entry/EntryBuysTableDialog.vue
@@ -116,7 +116,7 @@ const entriesTableColumns = computed(() => [
{{ col.value }}
[
"
unelevated
>
- {{ t('printLabel') }}
+ {{ t('viewLabel') }}
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index f0965b097..a9faa814b 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -11,4 +11,4 @@ shipped: Shipped
fromShipped: Shipped(from)
toShipped: Shipped(to)
printLabels: Print stickers
-printLabel: Print sticker
+viewLabel: View sticker
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index aba04571e..eb1e3f88a 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -15,4 +15,4 @@ shipped: F. salida
fromShipped: F. salida(desde)
toShipped: F. salida(hasta)
printLabels: Imprimir etiquetas
-printLabel: Imprimir etiqueta
+viewLabel: Ver etiqueta
diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index 167a10465..3c95f5cdd 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -40,7 +40,7 @@ const handleScopeDays = (params, days, callback) => {
@@ -64,7 +64,7 @@ const handleScopeDays = (params, days, callback) => {
@@ -105,7 +105,7 @@ const handleScopeDays = (params, days, callback) => {
outlined
dense
rounded
- :label="t('params.salesPersonFk')"
+ :label="t('globals.params.salesPersonFk')"
v-model="params.salesPersonFk"
url="Workers/search"
:params="{ departmentCodes: ['VT'] }"
@@ -158,7 +158,7 @@ const handleScopeDays = (params, days, callback) => {
outlined
dense
rounded
- :label="t('params.stateFk')"
+ :label="t('globals.params.stateFk')"
v-model="params.stateFk"
url="States"
is-outlined
@@ -184,7 +184,7 @@ const handleScopeDays = (params, days, callback) => {
outlined
dense
rounded
- :label="t('params.warehouseFk')"
+ :label="t('globals.params.warehouseFk')"
v-model="params.warehouseFk"
:options="warehouses"
/>
@@ -196,7 +196,7 @@ const handleScopeDays = (params, days, callback) => {
outlined
dense
rounded
- :label="t('params.provinceFk')"
+ :label="t('globals.params.provinceFk')"
v-model="params.provinceFk"
url="Provinces"
/>
@@ -235,22 +235,15 @@ const handleScopeDays = (params, days, callback) => {
en:
params:
- clientFk: Client id
orderFk: Order id
scopeDays: Days onward
nickname: Nickname
- salesPersonFk: Sales person
refFk: Invoice
agencyModeFk: Agency
- stateFk: State
groupedStates: Grouped State
- warehouseFk: Warehouse
- provinceFk: Province
myTeam: My team
problems: With problems
pending: Pending
- from: From
- to: To
alertLevel: Grouped State
FREE: Free
DELIVERED: Delivered
@@ -261,22 +254,15 @@ en:
es:
params:
- clientFk: Id cliente
orderFk: Id cesta
scopeDays: Días en adelante
nickname: Nombre mostrado
- salesPersonFk: Comercial
refFk: Factura
agencyModeFk: Agencia
- stateFk: Estado
groupedStates: Estado agrupado
- warehouseFk: Almacén
- provinceFk: Provincia
myTeam: Mi equipo
problems: Con problemas
pending: Pendiente
- from: Desde
- To: Hasta
alertLevel: Estado agrupado
FREE: Libre
DELIVERED: Servido
diff --git a/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue b/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue
index 4950ab381..f1c347588 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue
@@ -3,7 +3,7 @@ import VnSearchbar from 'components/ui/VnSearchbar.vue';
import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-import { computed } from 'vue';
import VnCard from 'components/common/VnCard.vue';
import TicketDescriptor from './TicketDescriptor.vue';
import TicketFilter from '../TicketFilter.vue';
const { t } = useI18n();
-const route = useRoute();
-
-const routeName = computed(() => route.name);
-const customRouteRedirectName = computed(() => routeName.value);
routeName.value);
:descriptor="TicketDescriptor"
search-data-key="TicketList"
:searchbar-props="{
- customRouteRedirectName,
+ url: 'Tickets/filter',
label: t('card.search'),
info: t('card.searchInfo'),
}"
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index f3e0e5c06..81e185014 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -1,6 +1,7 @@