[
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/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index cf15cb7fa..73b6f5543 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -1,17 +1,11 @@
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 cbd102317..25315b5d1 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -1,6 +1,7 @@
-
+
await cardDescriptorRef.value.getData();