diff --git a/src/components/FetchData.vue b/src/components/FetchData.vue
index 5b3dcbea7..6d4e79f24 100644
--- a/src/components/FetchData.vue
+++ b/src/components/FetchData.vue
@@ -60,3 +60,6 @@ async function fetch(fetchFilter = {}) {
}
}
+
+
+
diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index 8b3731478..5c143740e 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -173,14 +173,14 @@ function copyUserToken() {
-
-
- en:
- localWarehouse: Local warehouse
- localBank: Local bank
- localCompany: Local company
- userWarehouse: User warehouse
- userCompany: User company
- es:
- localWarehouse: Almacén local
- localBank: Banco local
- localCompany: Empresa local
- userWarehouse: Almacén del usuario
- userCompany: Empresa del usuario
-
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 4903a5327..480d36e4f 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -51,8 +51,8 @@ const $props = defineProps({
default: null,
},
limit: {
- type: Number,
- default: 30,
+ type: [Number, String],
+ default: '30',
},
});
@@ -151,7 +151,7 @@ watch(modelValue, (newValue) => {
@on-fetch="(data) => setOptions(data)"
:where="where || { [optionValue]: value }"
:limit="limit"
- :order-by="orderBy"
+ :sort-by="sortBy"
:fields="fields"
/>
-
+
{{ t('Total') }}
@@ -213,6 +213,16 @@ function navigateToRouteSummary(event, row) {
{{ toCurrency(total) }}
+
+
+ {{ t('Create invoiceIn') }}
+
+
-
-
-
- {{ t('Create invoiceIn') }}
-
-
-
{
-
-
-
-
-
{
+
+
+
+
+
{
en:
addEntry: Add entry
+ searchByIdOrReference: Search by ID or reference
es:
addEntry: Añadir entrada
+ searchByIdOrReference: Buscar por ID o por referencia
diff --git a/src/pages/Worker/Card/WorkerLog.vue b/src/pages/Worker/Card/WorkerLog.vue
new file mode 100644
index 000000000..ef5a2e0d8
--- /dev/null
+++ b/src/pages/Worker/Card/WorkerLog.vue
@@ -0,0 +1,6 @@
+
+
+
+
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 1c722afe8..448aab79c 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -12,7 +12,7 @@ export default {
redirect: { name: 'WorkerMain' },
menus: {
main: ['WorkerList', 'WorkerDepartment'],
- card: ['WorkerNotificationsManager', 'WorkerPda'],
+ card: ['WorkerNotificationsManager', 'WorkerPda', 'WorkerLog'],
departmentCard: ['BasicData'],
},
children: [
@@ -85,6 +85,15 @@ export default {
},
component: () => import('src/pages/Worker/Card/WorkerPda.vue'),
},
+ {
+ name: 'WorkerLog',
+ path: 'log',
+ meta: {
+ title: 'log',
+ icon: 'vn:History',
+ },
+ component: () => import('src/pages/Worker/Card/WorkerLog.vue'),
+ },
],
},
],