en:
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 9870be9b3..d96a33ef5 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -11,6 +11,9 @@ import VnSelect from 'src/components/common/VnSelect.vue';
import OrderSearchbar from './Card/OrderSearchbar.vue';
import RightMenu from 'src/components/common/RightMenu.vue';
import OrderFilter from './Card/OrderFilter.vue';
+import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
+import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
+import { toDateTimeFormat } from 'src/filters/date';
const { t } = useI18n();
const { viewSummary } = useSummaryDialog();
@@ -75,7 +78,7 @@ const columns = computed(() => [
label: t('module.created'),
component: 'date',
cardVisible: true,
- format: (row) => toDate(row?.landed),
+ format: (row) => toDateTimeFormat(row?.landed),
columnField: {
component: null,
},
@@ -115,6 +118,7 @@ const columns = computed(() => [
},
},
cardVisible: true,
+ columnClass: 'expand',
},
{
align: 'left',
@@ -132,6 +136,7 @@ const columns = computed(() => [
title: t('InvoiceOutSummary'),
icon: 'preview',
action: (row) => viewSummary(row.id, OrderSummary),
+ isPrimary: true,
},
],
},
@@ -154,6 +159,16 @@ async function fetchAgencies({ landed, addressId }) {
});
agencyList.value = data;
}
+
+const getDateColor = (date) => {
+ const today = Date.vnNew();
+ today.setHours(0, 0, 0, 0);
+ const timeTicket = new Date(date);
+ timeTicket.setHours(0, 0, 0, 0);
+ const comparation = today - timeTicket;
+ if (comparation == 0) return 'bg-warning';
+ if (comparation < 0) return 'bg-success';
+};
@@ -183,6 +198,25 @@ async function fetchAgencies({ landed, addressId }) {
:columns="columns"
redirect="order"
>
+
+
+ {{ row?.clientName }}
+
+
+
+
+
+ {{ row?.name }}
+
+
+
+
+
+
+ {{ toDate(row?.landed) }}
+
+
+
{
{{ buy.subName }}
-
+
{{ dashIfEmpty(buy.quantity) }}
{{ dashIfEmpty(buy.price) }}
diff --git a/src/pages/Ticket/Card/BasicData/BasicDataTable.vue b/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
index 48b8c882f..7f2f100ad 100644
--- a/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
+++ b/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
@@ -245,7 +245,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
{{ row.item.name }}
{{ row.item.subName }}
-
+
diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
index 3954b5a62..6131c92db 100644
--- a/src/pages/Ticket/Card/TicketComponents.vue
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -310,7 +310,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
{{ row.item.name }}
{{ row.item.subName }}
-
+
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index bd7297b56..2ea12bb05 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -656,7 +656,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
{{ row.concept }}
{{ row.item?.subName }}
-
+
diff --git a/src/pages/Ticket/Card/TicketSaleTracking.vue b/src/pages/Ticket/Card/TicketSaleTracking.vue
index e699d2bfd..6978d92c8 100644
--- a/src/pages/Ticket/Card/TicketSaleTracking.vue
+++ b/src/pages/Ticket/Card/TicketSaleTracking.vue
@@ -412,7 +412,7 @@ const qCheckBoxController = (sale, action) => {
{{ row.subName }}
-
+
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index a7a541e6d..f6c9ebf43 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -391,7 +391,6 @@ async function changeState(value) {
{{ props.row.price }} €
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index 93da31e53..68d2a1f73 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -145,7 +145,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
{{ row.item.name }}
{{ row.item.subName }}
-
+
diff --git a/src/pages/Worker/Card/WorkerMedical.vue b/src/pages/Worker/Card/WorkerMedical.vue
new file mode 100644
index 000000000..6bca4ae85
--- /dev/null
+++ b/src/pages/Worker/Card/WorkerMedical.vue
@@ -0,0 +1,91 @@
+
+
+
+
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index f80df5e06..2a523e7fe 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -25,6 +25,7 @@ export default {
'WorkerLocker',
'WorkerBalance',
'WorkerFormation',
+ 'WorkerMedical',
],
},
children: [
@@ -196,6 +197,15 @@ export default {
},
component: () => import('src/pages/Worker/Card/WorkerFormation.vue'),
},
+ {
+ name: 'WorkerMedical',
+ path: 'medical',
+ meta: {
+ title: 'medical',
+ icon: 'medical_information',
+ },
+ component: () => import('src/pages/Worker/Card/WorkerMedical.vue'),
+ },
],
},
],