+
-
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 760c48726..402df1173 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -420,7 +420,7 @@ const getCategoryClass = (category, params) => {
.category-icon {
border-radius: 50%;
- background-color: var(--vn-light-gray);
+ background-color: var(--vn-accent-color);
font-size: 2.6rem;
padding: 8px;
cursor: pointer;
diff --git a/src/pages/Order/Card/OrderCatalogItem.vue b/src/pages/Order/Card/OrderCatalogItem.vue
index ee73bcffb..0e1005493 100644
--- a/src/pages/Order/Card/OrderCatalogItem.vue
+++ b/src/pages/Order/Card/OrderCatalogItem.vue
@@ -11,8 +11,8 @@ import toCurrency from '../../../filters/toCurrency';
const DEFAULT_PRICE_KG = 0;
-const session = useSession();
-const token = session.getToken();
+const { getTokenMultimedia } = useSession();
+const token = getTokenMultimedia();
const { t } = useI18n();
defineProps({
@@ -88,11 +88,11 @@ const dialog = ref(null);
font-size: 11px;
.label {
- color: var(--vn-label);
+ color: var(--vn-label-color);
}
.value {
- color: var(--vn-text);
+ color: var(--vn-text-color);
}
}
}
@@ -125,7 +125,7 @@ const dialog = ref(null);
gap: 4px;
.subName {
- color: var(--vn-label);
+ color: var(--vn-label-color);
text-transform: uppercase;
}
@@ -163,7 +163,7 @@ const dialog = ref(null);
position: absolute;
bottom: 12px;
right: 12px;
- background: linear-gradient($dark, $primary);
+ background: linear-gradient(var(--vn-section-color), $primary);
border-radius: 50%;
width: 40px;
height: 40px;
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index 1c770194a..60e86d04e 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -61,7 +61,7 @@ const data = ref(useCardDescription());
const setData = (entity) => {
if (!entity) return;
data.value = useCardDescription(entity.client.name, entity.id);
- state.set('ClaimDescriptor', entity);
+ state.set('OrderDescriptor', entity);
};
const getConfirmationValue = (isConfirmed) => {
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index 50e8e8eaf..6e06be9bf 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -162,7 +162,6 @@ const detailsColumns = ref([
:columns="detailsColumns"
:rows="entity?.rows"
flat
- hide-pagination
>
@@ -248,7 +247,7 @@ const detailsColumns = ref([
.subName {
text-transform: uppercase;
- color: var(--vn-label);
+ color: var(--vn-label-color);
}
}
}
diff --git a/src/pages/Order/OrderCatalog.vue b/src/pages/Order/OrderCatalog.vue
index 21442d10d..1ed03c47d 100644
--- a/src/pages/Order/OrderCatalog.vue
+++ b/src/pages/Order/OrderCatalog.vue
@@ -104,7 +104,7 @@ function extractTags(items) {
.no-result {
font-size: 24px;
font-weight: bold;
- color: var(--vn-label);
+ color: var(--vn-label-color);
text-align: center;
}
diff --git a/src/pages/Order/OrderLines.vue b/src/pages/Order/OrderLines.vue
index a2ee42481..5a31598e1 100644
--- a/src/pages/Order/OrderLines.vue
+++ b/src/pages/Order/OrderLines.vue
@@ -17,9 +17,9 @@ import axios from 'axios';
const route = useRoute();
const { t } = useI18n();
-const session = useSession();
+const { getTokenMultimedia } = useSession();
const quasar = useQuasar();
-const token = session.getToken();
+const token = getTokenMultimedia();
const orderSummary = ref({
total: null,
vat: null,
@@ -213,7 +213,7 @@ async function confirmOrder() {
gap: 2%;
.label {
- color: var(--vn-label);
+ color: var(--vn-label-color);
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
@@ -246,13 +246,13 @@ async function confirmOrder() {
}
.subname {
- color: var(--vn-label);
+ color: var(--vn-label-color);
}
.no-result {
font-size: 24px;
font-weight: bold;
- color: var(--vn-label);
+ color: var(--vn-label-color);
text-align: center;
}
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index b7b233a64..203eaccd1 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -104,7 +104,7 @@ function navigate(id) {
/>
-
+
{{ toDate(row?.landed) }}
diff --git a/src/pages/Order/OrderVolume.vue b/src/pages/Order/OrderVolume.vue
index 5bb106edc..67f409b45 100644
--- a/src/pages/Order/OrderVolume.vue
+++ b/src/pages/Order/OrderVolume.vue
@@ -106,7 +106,7 @@ const loadVolumes = async (rows) => {
gap: 2%;
.label {
- color: var(--vn-label);
+ color: var(--vn-label-color);
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
@@ -132,7 +132,7 @@ const loadVolumes = async (rows) => {
.no-result {
font-size: 24px;
font-weight: bold;
- color: var(--vn-label);
+ color: var(--vn-label-color);
text-align: center;
}
diff --git a/src/pages/Parking/Card/ParkingBasicData.vue b/src/pages/Parking/Card/ParkingBasicData.vue
new file mode 100644
index 000000000..26a1ed8be
--- /dev/null
+++ b/src/pages/Parking/Card/ParkingBasicData.vue
@@ -0,0 +1,56 @@
+
+
+ (sectors = data)"
+ auto-load
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Parking/Card/ParkingCard.vue b/src/pages/Parking/Card/ParkingCard.vue
new file mode 100644
index 000000000..621680985
--- /dev/null
+++ b/src/pages/Parking/Card/ParkingCard.vue
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Parking/Card/ParkingDescriptor.vue b/src/pages/Parking/Card/ParkingDescriptor.vue
new file mode 100644
index 000000000..3ff0a5d17
--- /dev/null
+++ b/src/pages/Parking/Card/ParkingDescriptor.vue
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Parking/Card/ParkingLog.vue b/src/pages/Parking/Card/ParkingLog.vue
new file mode 100644
index 000000000..f25abd2e4
--- /dev/null
+++ b/src/pages/Parking/Card/ParkingLog.vue
@@ -0,0 +1,6 @@
+
+
+
+
diff --git a/src/pages/Parking/Card/ParkingSummary.vue b/src/pages/Parking/Card/ParkingSummary.vue
new file mode 100644
index 000000000..a30705068
--- /dev/null
+++ b/src/pages/Parking/Card/ParkingSummary.vue
@@ -0,0 +1,54 @@
+
+
+
+
+
+ {{ parking.code }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Parking/ParkingFilter.vue b/src/pages/Parking/ParkingFilter.vue
new file mode 100644
index 000000000..2e559a879
--- /dev/null
+++ b/src/pages/Parking/ParkingFilter.vue
@@ -0,0 +1,77 @@
+
+
+
+ (sectors = data)"
+ auto-load
+ />
+
+
+
+ {{ t(`params.${tag.label}`) }}:
+ {{ formatFn(tag.value) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+en:
+ params:
+ code: Code
+ sectorFk: Sector
+ search: General Search
+es:
+ params:
+ code: Código
+ search: Búsqueda general
+
+
diff --git a/src/pages/Parking/ParkingList.vue b/src/pages/Parking/ParkingList.vue
new file mode 100644
index 000000000..7bf6cfdab
--- /dev/null
+++ b/src/pages/Parking/ParkingList.vue
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('globals.collapseMenu') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+es:
+ Search parking: Buscar parking
+ You can search by parking code: Puede buscar por el código del parking
+
diff --git a/src/pages/Route/Card/RouteFilter.vue b/src/pages/Route/Card/RouteFilter.vue
index 4be1981ab..bbd71df49 100644
--- a/src/pages/Route/Card/RouteFilter.vue
+++ b/src/pages/Route/Card/RouteFilter.vue
@@ -197,6 +197,15 @@ const warehouseList = ref([]);
/>
+
+
+
+
+
@@ -212,6 +221,7 @@ en:
workerFk: Worker
from: From
to: To
+ Served: Served
es:
params:
warehouseFk: Almacén
@@ -229,4 +239,5 @@ es:
Worker: Trabajador
From: Desde
To: Hasta
+ Served: Servida
diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index 60693cbf1..7087037b0 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -11,8 +11,8 @@ import VnInputDate from 'components/common/VnInputDate.vue';
import VnInput from 'components/common/VnInput.vue';
import axios from 'axios';
import VnInputTime from 'components/common/VnInputTime.vue';
-import RouteSearchbar from "pages/Route/Card/RouteSearchbar.vue";
-import {useStateStore} from "stores/useStateStore";
+import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
+import { useStateStore } from 'stores/useStateStore';
const { t } = useI18n();
const route = useRoute();
@@ -26,6 +26,7 @@ const defaultInitialData = {
description: '',
vehicleFk: null,
workerFk: null,
+ isOk: false,
};
const workerList = ref([]);
@@ -211,6 +212,7 @@ const onSave = (data, response) => {
size="sm"
v-model="data.isOk"
:label="t('Is served')"
+ clearable
/>
diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue
index 304dc8a86..220f93f30 100644
--- a/src/pages/Route/Card/RouteSummary.vue
+++ b/src/pages/Route/Card/RouteSummary.vue
@@ -73,9 +73,9 @@ const ticketColumns = ref([
align: 'left',
},
{
- name: 'warehouse',
- label: t('route.summary.warehouse'),
- field: (row) => row?.warehouseName,
+ name: 'state',
+ label: t('route.summary.state'),
+ field: (row) => row?.ticketStateName,
sortable: false,
align: 'left',
},
@@ -187,6 +187,15 @@ const ticketColumns = ref([
:label="t('route.summary.packages')"
:value="getTotalPackages(entity.tickets)"
/>
+