-
+
[
},
{
align: 'left',
- name: 'companyCode',
+ name: 'companyFk',
label: t('globals.company'),
cardVisible: true,
component: 'select',
- attrs: { url: 'Companies', optionLabel: 'code', optionValue: 'id' },
- columnField: { component: null },
+ attrs: {
+ url: 'Companies',
+ optionLabel: 'code',
+ optionValue: 'id',
+ },
+ columnField: {
+ component: null,
+ },
+ format: (row, dashIfEmpty) => dashIfEmpty(row.companyCode),
},
{
align: 'left',
diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index f363f5bf853..e0e8248cc25 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -61,6 +61,7 @@ function exprBuilder(param, value) {
case 'nickname':
return { [`t.nickname`]: { like: `%${value}%` } };
case 'zoneFk':
+ return { 't.zoneFk': value };
case 'department':
return { 'd.name': value };
case 'totalWithVat':
diff --git a/src/pages/Order/Card/OrderCatalogItemDialog.vue b/src/pages/Order/Card/OrderCatalogItemDialog.vue
index 163b036ebf2..77f6a840548 100644
--- a/src/pages/Order/Card/OrderCatalogItemDialog.vue
+++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue
@@ -43,10 +43,9 @@ const addToOrder = async () => {
);
state.set('orderTotal', orderTotal);
- const rows = orderData.value.rows.push(...items) || [];
state.set('orderData', {
...orderData.value,
- rows,
+ items,
});
notify(t('globals.dataSaved'), 'positive');
emit('added', -totalQuantity(items));