+
-
-
es:
- Search invoice: Buscar factura emitida
+ Search invoice: Buscar factura recibida
You can search by invoice reference: Puedes buscar por referencia de la factura
Download: Descargar
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummaryDialog.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummaryDialog.vue
deleted file mode 100644
index 76283ff10..000000000
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummaryDialog.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/InvoiceOut/InvoiceOutFilter.vue b/src/pages/InvoiceOut/InvoiceOutFilter.vue
index 124ea00d1..985bfb085 100644
--- a/src/pages/InvoiceOut/InvoiceOutFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutFilter.vue
@@ -6,6 +6,7 @@ import FetchData from 'components/FetchData.vue';
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
import VnInput from 'src/components/common/VnInput.vue';
import VnInputDate from 'components/common/VnInputDate.vue';
+import VnCurrency from 'src/components/common/VnCurrency.vue';
const { t } = useI18n();
const props = defineProps({
@@ -41,95 +42,93 @@ function setWorkers(data) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 292fa2e0a..08f893db2 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -1,22 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
new file mode 100644
index 000000000..8c986e627
--- /dev/null
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -0,0 +1,332 @@
+
+
+
+
+
+
+
+ {{ t('Regularize stock') }}
+
+
+
+
+
+
+
+ {{ t('Clone') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('item.descriptor.item') }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('item.descriptor.visible') }}
+
+ {{
+ visible
+ }}
+
+
+
+ {{ t('item.descriptor.available') }}
+
+ {{
+ available
+ }}
+
+
+
+ {{ warehouseText }}
+
+
+
+
+
+es:
+ Regularize stock: Regularizar stock
+ Clone: Clonar
+ All it's properties will be copied: Todas sus propiedades serán copiadas
+ Do you want to clone this item?: ¿Desea clonar este artículo?
+
+
+
diff --git a/src/pages/Item/Card/ItemDescriptorProxy.vue b/src/pages/Item/Card/ItemDescriptorProxy.vue
new file mode 100644
index 000000000..2b7b39a65
--- /dev/null
+++ b/src/pages/Item/Card/ItemDescriptorProxy.vue
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
new file mode 100644
index 000000000..21249349f
--- /dev/null
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -0,0 +1 @@
+
Item diary (CREAR CUANDO SE DESARROLLE EL MODULO DE ITEMS)
diff --git a/src/pages/Item/Card/ItemSummary.vue b/src/pages/Item/Card/ItemSummary.vue
new file mode 100644
index 000000000..567fbf32b
--- /dev/null
+++ b/src/pages/Item/Card/ItemSummary.vue
@@ -0,0 +1 @@
+
Item summary
diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue
new file mode 100644
index 000000000..95f4380e4
--- /dev/null
+++ b/src/pages/Item/Card/ItemTags.vue
@@ -0,0 +1 @@
+
Item tags (CREAR CUANDO SE DESARROLLE EL MODULO DE ITEMS)
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
new file mode 100644
index 000000000..49a5dbb64
--- /dev/null
+++ b/src/pages/Item/ItemList.vue
@@ -0,0 +1 @@
+
Item list
diff --git a/src/pages/Item/ItemMain.vue b/src/pages/Item/ItemMain.vue
new file mode 100644
index 000000000..c1f2a31db
--- /dev/null
+++ b/src/pages/Item/ItemMain.vue
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index c325a9b05..760c48726 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -219,183 +219,181 @@ const getCategoryClass = (category, params) => {
-
-
-
-
-
- {{ t(category.name) }}
-
-
-
-
-
-
-
-
-
-
- {{ opt.name }}
-
- {{ opt.categoryName }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+ {{ t(category.name) }}
+
+
+
+
+
+
+
+
+
+ {{ opt.name }}
+
+ {{ opt.categoryName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/src/pages/Order/Card/OrderCatalogItem.vue b/src/pages/Order/Card/OrderCatalogItem.vue
index bc448eb8c..ee73bcffb 100644
--- a/src/pages/Order/Card/OrderCatalogItem.vue
+++ b/src/pages/Order/Card/OrderCatalogItem.vue
@@ -1,10 +1,13 @@
-
-
-
-
-
-
-
-
diff --git a/src/pages/Order/OrderCatalog.vue b/src/pages/Order/OrderCatalog.vue
index 55f5e7da1..21442d10d 100644
--- a/src/pages/Order/OrderCatalog.vue
+++ b/src/pages/Order/OrderCatalog.vue
@@ -1,7 +1,7 @@
@@ -70,7 +70,7 @@ function extractTags(items) {
-
+
diff --git a/src/pages/Order/OrderVolume.vue b/src/pages/Order/OrderVolume.vue
index 4f4c269f6..5bb106edc 100644
--- a/src/pages/Order/OrderVolume.vue
+++ b/src/pages/Order/OrderVolume.vue
@@ -35,7 +35,7 @@ const loadVolumes = async (rows) => {
auto-load
/>
-
+
{
}
+
+es:
+ Search route: Buscar rutas
+ You can search by route reference: Puedes buscar por referencia de la ruta
+
diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue
new file mode 100644
index 000000000..df4495d3a
--- /dev/null
+++ b/src/pages/Route/Card/RouteSummary.vue
@@ -0,0 +1,314 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ `${entity?.route.id} - ${entity?.route?.description}` }}
+
+
+
+
+
+
+
+
+
+
+ {{ dashIfEmpty(entity?.route?.worker?.user?.name) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dashIfEmpty(entity?.route?.description) }}
+
+
+
+
+
+
+
+
+
+ {{ value }}
+
+
+
+
+
+
+ {{ value }}
+
+
+
+
+
+
+
+ {{ value }}
+
+
+
+
+
+
+
+ {{ value }}
+
+
+
+
+
+
+
+
+
+en:
+ route:
+ summary:
+ date: Date
+ agency: Agency
+ vehicle: Vehicle
+ driver: Driver
+ cost: Cost
+ started: Started time
+ finished: Finished time
+ kmStart: Km start
+ kmEnd: Km end
+ volume: Volume
+ packages: Packages
+ description: Description
+ tickets: Tickets
+ order: Order
+ street: Street
+ city: City
+ pc: PC
+ client: Client
+ warehouse: Warehouse
+ m3: m³
+ packaging: Packaging
+ ticket: Ticket
+es:
+ route:
+ summary:
+ date: Fecha
+ agency: Agencia
+ vehicle: Vehículo
+ driver: Conductor
+ cost: Costo
+ started: Hora inicio
+ finished: Hora fin
+ kmStart: Km inicio
+ kmEnd: Km fin
+ volume: Volumen
+ packages: Bultos
+ description: Descripción
+ tickets: Tickets
+ order: Orden
+ street: Dirección fiscal
+ city: Población
+ pc: CP
+ client: Cliente
+ warehouse: Almacén
+ packaging: Encajado
+
diff --git a/src/pages/Route/Cmr/CmrFilter.vue b/src/pages/Route/Cmr/CmrFilter.vue
index a5bf5513b..553f19431 100644
--- a/src/pages/Route/Cmr/CmrFilter.vue
+++ b/src/pages/Route/Cmr/CmrFilter.vue
@@ -28,103 +28,101 @@ const countries = ref();
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
new file mode 100644
index 000000000..0b4aa6795
--- /dev/null
+++ b/src/pages/Route/RouteList.vue
@@ -0,0 +1,538 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('globals.collapseMenu') }}
+
+
+
+
+
+
+
+
+ {{ t('Select the starting date') }}
+
+
+
+
+
+
+
+
+ {{ t('Clone') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('Clone Selected Routes') }}
+
+
+ {{ t('Download selected routes as PDF') }}
+
+
+ {{ t('Mark as served') }}
+
+
+
+
+
+
+
+
+
+
+ {{ props.row?.workerUserName }}
+
+
+
+
+
+ {{ opt.name }}
+ {{
+ opt.nickname
+ }}
+
+
+
+
+
+
+
+
+
+ {{ props.row?.agencyName }}
+
+
+
+
+
+
+
+ {{ props.row?.vehiclePlateNumber }}
+
+
+
+
+
+
+
+ {{ toDate(props.row?.created) }}
+
+
+
+
+
+
+
+ {{ props.row?.description }}
+
+
+
+
+
+
+
+ {{ toHour(props.row.started) }}
+
+
+
+
+
+
+
+ {{ toHour(props.row.finished) }}
+
+
+
+
+
+
+
+
+
+ {{ t('Add ticket') }}
+
+
+ {{ t('Preview') }}
+
+
+
+
+
+
+
+
+
+
+en:
+ newRoute: New Route
+es:
+ ID: ID
+ Worker: Trabajador
+ Agency: Agencia
+ Vehicle: Vehículo
+ Date: Fecha
+ Description: Descripción
+ Hour started: Hora inicio
+ Hour finished: Hora fin
+ newRoute: Nueva Ruta
+ Clone Selected Routes: Clonar rutas seleccionadas
+ Select the starting date: Seleccione la fecha de inicio
+ Stating date: Fecha de inicio
+ Cancel: Cancelar
+ Clone: Clonar
+ Mark as served: Marcar como servidas
+ Download selected routes as PDF: Descargar rutas seleccionadas como PDF
+ Add ticket: Añadir tickets
+ Preview: Vista previa
+
diff --git a/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue b/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue
index 6290cda75..684a46807 100644
--- a/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue
+++ b/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue
@@ -21,19 +21,19 @@ function confirmRemove() {
.dialog({
component: VnConfirm,
componentProps: {
- title: t('confirmDeletion'),
- message: t('confirmDeletionMessage'),
- promise: remove,
+ title: t('Confirm deletion'),
+ message: t('Are you sure you want to delete this shelving?'),
+ promise: remove
},
})
- .onOk(async () => await router.push({ name: 'ShelvingList' }));
}
async function remove() {
- if (!$props.shelving.value.id) {
+ if (!$props.shelving.id) {
return;
}
- await axios.delete(`Shelvings/${$props.shelving.value.id}`);
+ await axios.delete(`Shelvings/${$props.shelving.id}`);
+ await router.push({ name: 'ShelvingList' });
quasar.notify({
message: t('globals.dataDeleted'),
type: 'positive',
@@ -45,17 +45,13 @@ async function remove() {
-
{{ t('deleteShelving') }}
+
{{ t('Delete Shelving') }}
-{
- "en": {
- "deleteShelving": "Delete Shelving"
- },
- "es": {
- "deleteShelving": "Eliminar carro"
- }
-}
+es:
+ Confirm deletion: Confirmar eliminación
+ Are you sure you want to delete this shelving?: ¿Seguro que quieres eliminar este carro?
+ Delete Shelving: Eliminar carro
diff --git a/src/pages/Shelving/Card/ShelvingFilter.vue b/src/pages/Shelving/Card/ShelvingFilter.vue
index 423402f89..abc91373b 100644
--- a/src/pages/Shelving/Card/ShelvingFilter.vue
+++ b/src/pages/Shelving/Card/ShelvingFilter.vue
@@ -41,7 +41,11 @@ function setParkings(data) {
@on-fetch="setWorkers"
auto-load
/>
-
+
{{ t(`params.${tag.label}`) }}:
@@ -49,59 +53,57 @@ function setParkings(data) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -112,9 +114,11 @@ en:
parkingFk: Parking
userFk: Worker
isRecyclable: Recyclable
+ search: Search
es:
params:
parkingFk: Parking
userFk: Trabajador
isRecyclable: Reciclable
+ search: Contiene
diff --git a/src/pages/Shelving/Card/ShelvingForm.vue b/src/pages/Shelving/Card/ShelvingForm.vue
index e9e5e68c3..238879bd4 100644
--- a/src/pages/Shelving/Card/ShelvingForm.vue
+++ b/src/pages/Shelving/Card/ShelvingForm.vue
@@ -1,7 +1,7 @@
@@ -75,6 +82,7 @@ const shelvingFilter = {
model="shelving"
:auto-load="!isNew"
:form-initial-data="defaultInitialData"
+ @on-data-saved="onSave"
>
@@ -107,6 +115,7 @@ const shelvingFilter = {
diff --git a/src/pages/Shelving/Card/ShelvingSearchbar.vue b/src/pages/Shelving/Card/ShelvingSearchbar.vue
index 89a4de01e..bfc8ad4f5 100644
--- a/src/pages/Shelving/Card/ShelvingSearchbar.vue
+++ b/src/pages/Shelving/Card/ShelvingSearchbar.vue
@@ -7,12 +7,12 @@ const { t } = useI18n();
-
es:
Search shelving: Buscar carros
diff --git a/src/pages/Shelving/Card/ShelvingSummary.vue b/src/pages/Shelving/Card/ShelvingSummary.vue
index f1f914385..27ef33c34 100644
--- a/src/pages/Shelving/Card/ShelvingSummary.vue
+++ b/src/pages/Shelving/Card/ShelvingSummary.vue
@@ -6,6 +6,7 @@ import { useStateStore } from 'stores/useStateStore';
import CardSummary from 'components/ui/CardSummary.vue';
import VnLv from 'components/ui/VnLv.vue';
import ShelvingFilter from 'pages/Shelving/Card/ShelvingFilter.vue';
+import VnUserLink from 'components/ui/VnUserLink.vue';
const $props = defineProps({
id: {
@@ -24,7 +25,7 @@ const hideRightDrawer = () => {
if (!isDialog) {
stateStore.rightDrawer = false;
}
-}
+};
onMounted(hideRightDrawer);
onUnmounted(hideRightDrawer);
const filter = {
@@ -69,9 +70,13 @@ const filter = {
-
+
+
-
+
+
+
+
+
-import { useDialogPluginComponent } from 'quasar';
-import ShelvingSummary from "pages/Shelving/Card/ShelvingSummary.vue";
-
-const $props = defineProps({
- id: {
- type: Number,
- required: true,
- },
-});
-
-defineEmits([...useDialogPluginComponent.emits]);
-
-const { dialogRef, onDialogHide } = useDialogPluginComponent();
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/Shelving/ShelvingList.vue b/src/pages/Shelving/ShelvingList.vue
index 71b3a6ccf..a5a24e84d 100644
--- a/src/pages/Shelving/ShelvingList.vue
+++ b/src/pages/Shelving/ShelvingList.vue
@@ -5,16 +5,16 @@ import { useI18n } from 'vue-i18n';
import { onMounted, onUnmounted } from 'vue';
import CardList from 'components/ui/CardList.vue';
import VnLv from 'components/ui/VnLv.vue';
-import { useQuasar } from 'quasar';
import { useRouter } from 'vue-router';
import ShelvingFilter from 'pages/Shelving/Card/ShelvingFilter.vue';
-import ShelvingSummaryDialog from 'pages/Shelving/Card/ShelvingSummaryDialog.vue';
+import ShelvingSummary from 'pages/Shelving/Card/ShelvingSummary.vue';
import ShelvingSearchbar from 'pages/Shelving/Card/ShelvingSearchbar.vue';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
const stateStore = useStateStore();
const router = useRouter();
-const quasar = useQuasar();
const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
const filter = {
include: [{ relation: 'parking' }],
};
@@ -26,15 +26,6 @@ function navigate(id) {
router.push({ path: `/shelving/${id}` });
}
-function viewSummary(id) {
- quasar.dialog({
- component: ShelvingSummaryDialog,
- componentProps: {
- id,
- },
- });
-}
-
function exprBuilder(param, value) {
switch (param) {
case 'search':
@@ -74,12 +65,13 @@ function exprBuilder(param, value) {
-
+
@@ -102,17 +94,10 @@ function exprBuilder(param, value) {
/>
-
@@ -129,10 +114,3 @@ function exprBuilder(param, value) {
-
-
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index 2b7059ea3..302e03217 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -1 +1,193 @@
-Supplier accounts
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ t('components.iban_tooltip')
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.opt.bic }}
+ {{ scope.opt.name }}
+
+
+
+
+
+
+
+
+
+ {{
+ t(
+ 'Name of the bank account holder if different from the provider'
+ )
+ }}
+
+
+
+
+
+
+
+ {{ t('Remove account') }}
+
+
+
+
+
+
+
+ {{ t('Add account') }}
+
+
+
+
+
+
+
+
+
+ es:
+ Do you want to change the pay method to wire transfer?: ¿Quieres modificar la forma de pago a transferencia?
+ Add account: Añadir cuenta
+ Remove account: Remover cuenta
+ Name of the bank account holder if different from the provider: Nombre del titular de la cuenta bancaria en caso de ser diferente del proveedor
+
diff --git a/src/pages/Supplier/Card/SupplierAddresses.vue b/src/pages/Supplier/Card/SupplierAddresses.vue
index dd82abe78..c6b08075f 100644
--- a/src/pages/Supplier/Card/SupplierAddresses.vue
+++ b/src/pages/Supplier/Card/SupplierAddresses.vue
@@ -1 +1,90 @@
-Supplier addresses
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('supplier.list.newSupplier') }}
+
+
+
+
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
new file mode 100644
index 000000000..69c180e0a
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -0,0 +1,125 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Supplier/Card/SupplierAgencyTerm.vue b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
index 2a0c341cf..769ff4dad 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTerm.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
@@ -1 +1,139 @@
-Supplier agency term
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.agency?.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('Remove row') }}
+
+
+
+
+
+
+
+
+
+
+ {{ t('supplier.agencyTerms.addRow') }}
+
+
+
+
+
+ es:
+ Remove row: Eliminar fila
+
diff --git a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
new file mode 100644
index 000000000..17786c1ea
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index 582da48f3..bc50deb9b 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -1 +1,108 @@
-Supplier basic data
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ t('Responsible for approving invoices')
+ }}
+
+
+
+
+
+ {{ scope.opt?.name }}
+
+ {{ scope.opt?.nickname }}, {{ scope.opt?.id }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+es:
+ Responsible for approving invoices: Responsable de aprobar las facturas
+
diff --git a/src/pages/Supplier/Card/SupplierBillingData.vue b/src/pages/Supplier/Card/SupplierBillingData.vue
index 849737fa7..bf5ccb115 100644
--- a/src/pages/Supplier/Card/SupplierBillingData.vue
+++ b/src/pages/Supplier/Card/SupplierBillingData.vue
@@ -1 +1,73 @@
-Supplier billing data
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Supplier/Card/SupplierCard.vue b/src/pages/Supplier/Card/SupplierCard.vue
index 5b44159df..ddac988e7 100644
--- a/src/pages/Supplier/Card/SupplierCard.vue
+++ b/src/pages/Supplier/Card/SupplierCard.vue
@@ -14,6 +14,7 @@ const { t } = useI18n();
@@ -29,7 +30,6 @@ const { t } = useI18n();
-
@@ -63,3 +63,8 @@ const { t } = useI18n();
}
}
+
+
+ es:
+ Search suppliers: Buscar proveedores
+
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index df1dead17..59dd2281c 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -1 +1,208 @@
-Supplier consumption
+
+
+
+
+
+
+ {{ t('Open as PDF') }}
+
+
+
+
+ {{ t('Send to email') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ t('supplier.consumption.entry')
+ }}
+ {{ row.id }}
+ {{ t('supplier.consumption.date') }}
+ {{ toDate(row.shipped) }}
+ {{
+ t('supplier.consumption.reference')
+ }}
+ {{ row.invoiceNumber }}
+
+
+
+ {{ buy.itemName }}
+
+
+
+
+ {{ buy.subName }}
+
+
+ {{ dashIfEmpty(buy.quantity) }}
+ {{ dashIfEmpty(buy.price) }}
+ {{ dashIfEmpty(buy.total) }}
+
+
+
+ {{ t('Total entry') }}:
+ {{ calculateTotal(row.buys) }}
+
+
+
+
+
+
+
+
+
+
+es:
+ Total entry: Total entrada
+ Open as PDF: Abrir como PDF
+ Send to email: Enviar por email
+ This supplier does not have a contact with an email address: Este proveedor no tiene un email de contacto
+
diff --git a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
new file mode 100644
index 000000000..339a9d0d9
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
@@ -0,0 +1,181 @@
+
+
+
+
+
+
+
+
+
+ {{ t(`params.${tag.label}`) }}:
+ {{ formatFn(tag.value) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.opt?.name }}
+ {{
+ scope.opt?.category?.name
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+en:
+ params:
+ search: General search
+ itemId: Item id
+ buyerId: Buyer
+ typeId: Type
+ categoryId: Category
+ from: From
+ to: To
+es:
+ params:
+ search: Búsqueda general
+ itemId: Id Artículo
+ buyerId: Comprador
+ typeId: Tipo
+ categoryId: Reino
+ from: Desde
+ to: Hasta
+
diff --git a/src/pages/Supplier/Card/SupplierContacts.vue b/src/pages/Supplier/Card/SupplierContacts.vue
index ca58d4ab7..d69b74a4c 100644
--- a/src/pages/Supplier/Card/SupplierContacts.vue
+++ b/src/pages/Supplier/Card/SupplierContacts.vue
@@ -1 +1,118 @@
-Supplier contacts
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('Remove contact') }}
+
+
+
+
+
+
+
+
+ {{ t('Add contact') }}
+
+
+
+
+
+
+
+
+
+
+
+ es:
+ Add contact: Añadir contacto
+ Remove contact: Remover contacto
+
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 43857fd1e..83bad87d2 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -1,10 +1,14 @@
@@ -73,6 +103,22 @@ const setData = (entity) => {
@on-fetch="setData"
data-key="Supplier"
>
+
+
+
+ {{ t('Go to module index') }}
+
+
+
@@ -87,8 +133,69 @@ const setData = (entity) => {
+
+
+
+ {{ t('Inactive supplier') }}
+
+
+ {{ t('Unverified supplier') }}
+
+
+
+
+
+
+ {{ t('All entries with current supplier') }}
+
+
+ {{ t('Go to client') }}
+
+
+ {{ t('Create invoiceIn') }}
+
+
+
-
+
+es:
+ All entries with current supplier: Todas las entradas con proveedor actual
+ Go to client: Ir a cliente
+ Create invoiceIn: Crear factura recibida
+ Go to module index: Ir al índice del módulo
+ Inactive supplier: Proveedor inactivo
+ Unverified supplier: Proveedor no verificado
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index dd018ac60..becf6d818 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -1 +1,189 @@
-Supplier fiscal data
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ t(
+ 'When activating it, do not enter the country code in the ID field.'
+ )
+ }}
+
+
+
+
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index ea7bc3cb0..e8668fa08 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -1,18 +1,19 @@
@@ -44,7 +36,12 @@ const viewSummary = (id) => {
-
+
+
+
+
+
+
{
>
-
+
{
@@ -95,13 +92,6 @@ const viewSummary = (id) => {
-
-
en:
Search suppliers: Search suppliers
diff --git a/src/pages/Supplier/SupplierListFilter.vue b/src/pages/Supplier/SupplierListFilter.vue
new file mode 100644
index 000000000..ff90df6e1
--- /dev/null
+++ b/src/pages/Supplier/SupplierListFilter.vue
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+ {{ t(`params.${tag.label}`) }}:
+ {{ formatFn(tag.value) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+en:
+ params:
+ search: General search
+ nickname: Alias
+ nif: Tax number
+ provinceFk: Province
+ countryFk: Country
+es:
+ params:
+ search: Búsqueda general
+ nickname: Alias
+ nif: NIF/CIF
+ provinceFk: Provincia
+ countryFk: País
+
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 65523bb82..f3e01d06b 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -58,7 +58,7 @@ function formattedAddress() {
function isEditable() {
try {
- return !ticket.value.ticketState.state.alertLevel;
+ return !ticket.value.ticketState?.state?.alertLevel;
} catch (e) {
console.error(e);
}
@@ -153,8 +153,8 @@ async function changeState(value) {
-
- {{ ticket.ticketState.state.name }}
+
+ {{ ticket.ticketState?.state?.name }}
@@ -270,7 +270,7 @@ async function changeState(value) {
{{ t('ticket.summary.visible') }}
{{ t('ticket.summary.available') }}
{{ t('ticket.summary.quantity') }}
- {{ t('ticket.summary.description') }}
+ {{ t('globals.description') }}
{{ t('ticket.summary.price') }}
{{ t('ticket.summary.discount') }}
{{ t('globals.amount') }}
@@ -425,7 +425,7 @@ async function changeState(value) {
{{ t('ticket.summary.quantity') }}
- {{ t('ticket.summary.description') }}
+ {{ t('globals.description') }}
{{ t('ticket.summary.price') }}
{{ t('ticket.summary.taxClass') }}
{{ t('globals.amount') }}
diff --git a/src/pages/Ticket/Card/TicketSummaryDialog.vue b/src/pages/Ticket/Card/TicketSummaryDialog.vue
deleted file mode 100644
index 11e12c8a9..000000000
--- a/src/pages/Ticket/Card/TicketSummaryDialog.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index b0b584257..7b74117bb 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -56,66 +56,138 @@ const warehouses = ref();
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 9186eb6ad..72c2da57c 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -1,21 +1,21 @@
@@ -74,7 +65,7 @@ function viewSummary(id) {
-
+
@@ -134,13 +125,6 @@ function viewSummary(id) {
-
-
es:
Search ticket: Buscar ticket
diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
new file mode 100644
index 000000000..2edaac853
--- /dev/null
+++ b/src/pages/Travel/Card/TravelBasicData.vue
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue
index 34ecc25ee..1b185592b 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -17,7 +17,6 @@ const stateStore = useStateStore();
-
diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue
index 6a45710ad..c7501b1d4 100644
--- a/src/pages/Travel/Card/TravelDescriptor.vue
+++ b/src/pages/Travel/Card/TravelDescriptor.vue
@@ -2,10 +2,13 @@
import { ref, computed } from 'vue';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
-import { toDate } from 'src/filters';
+
import CardDescriptor from 'components/ui/CardDescriptor.vue';
import VnLv from 'src/components/ui/VnLv.vue';
+import TravelDescriptorMenuItems from './TravelDescriptorMenuItems.vue';
+
import useCardDescription from 'src/composables/useCardDescription';
+import { toDate } from 'src/filters';
const $props = defineProps({
id: {
@@ -28,6 +31,7 @@ const filter = {
'warehouseInFk',
'warehouseOutFk',
'cargoSupplierFk',
+ 'agencyModeFk',
],
include: [
{
@@ -66,6 +70,25 @@ const setData = (entity) => {
@on-fetch="setData"
data-key="travelData"
>
+
+
+
+ {{ t('Go to module index') }}
+
+
+
+
+
+
@@ -73,8 +96,32 @@ const setData = (entity) => {
+
+
+
+ {{ t('All travels with current agency') }}
+
+
+
-
+
+es:
+ Go to module index: Ir al índice del módulo
+ The travel will be deleted: El envío será eliminado
+ Do you want to delete this travel?: ¿Quieres eliminar este envío?
+ All travels with current agency: Todos los envíos con la agencia actual
diff --git a/src/pages/Travel/Card/TravelDescriptorMenuItems.vue b/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
new file mode 100644
index 000000000..17b9333ca
--- /dev/null
+++ b/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
@@ -0,0 +1,108 @@
+
+
+
+
+ {{ t('travel.summary.cloneShipping') }}
+
+
+
+ {{ t('travel.summary.CloneTravelAndEntries') }}
+
+
+
+
+ {{ t('travel.summary.deleteTravel') }}
+
+
+
+
+
+ {{ t('travel.summary.AddEntry') }}
+
+
+
+
+
+
+es:
+ The travel will be deleted: El envío será eliminado
+ Do you want to delete this travel?: ¿Quieres eliminar este envío?
+
diff --git a/src/pages/Travel/Card/TravelLog.vue b/src/pages/Travel/Card/TravelLog.vue
new file mode 100644
index 000000000..1a2667ff7
--- /dev/null
+++ b/src/pages/Travel/Card/TravelLog.vue
@@ -0,0 +1,6 @@
+
+
+
+
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 3bc5f0584..2ed6a0487 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -1,23 +1,19 @@
+
-
+ {{ t('travel.pageTitles.summary') }}
+
{{ travel.ref }} - {{ travel.id }}
@@ -208,89 +255,56 @@ const openEntryDescriptor = () => {};
{{ t('components.cardDescriptor.moreOptions') }}
-
-
- {{ option.name }}
-
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
{};
row-key="id"
class="full-width q-mt-md"
>
-
-
-
- {{ props.value }}
- {{
- props.col.toolTip
- }}
-
+
+
+
+ {{ t(col.label) }}
+
+
+
+
+
+
+
+
+
+ {{ value }}
+
+
+
+
+
+
+
+ {{ value }}
+
+
+
+
+
+
+
+
+ {{ entriesTotalHb }}
+ {{ entriesTotalFreight }}
+ {{ entriesTotalPackageValue }}
+ {{ entriesTotalCc }}
+ {{ entriesTotalPallet }}
+ {{ entriesTotalM3 }}
+
+
+
+
+
+
-
diff --git a/src/pages/Travel/Card/TravelSummaryDialog.vue b/src/pages/Travel/Card/TravelSummaryDialog.vue
deleted file mode 100644
index 8351d6e5b..000000000
--- a/src/pages/Travel/Card/TravelSummaryDialog.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/Travel/Card/TravelThermographs.vue b/src/pages/Travel/Card/TravelThermographs.vue
new file mode 100644
index 000000000..435d9054f
--- /dev/null
+++ b/src/pages/Travel/Card/TravelThermographs.vue
@@ -0,0 +1,216 @@
+
+
+
+
+
+
+
+
+
+
+ {{ t('Download file') }}
+
+
+
+
+
+
+ {{ t('Edit file') }}
+
+
+
+
+
+
+ {{ t('Remove thermograph') }}
+
+
+
+
+
+
+
+
+
+ {{ t('Add thermograph') }}
+
+
+
+
+
+es:
+ Add thermograph: Añadir termógrafo
+ Download file: Descargar fichero
+ Edit file: Editar fichero
+ Remove thermograph: Eliminar termógrafo
+ Thermograph removed: Termógrafo eliminado
+ Are you sure you want to remove the thermograph?: ¿Seguro que quieres quitar el termógrafo?
+ No results: Sin resultados
+
diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
new file mode 100644
index 000000000..4462846cb
--- /dev/null
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -0,0 +1,348 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('Select files') }}
+
+
+ {{
+ t('globals.allowedFilesText', {
+ allowedContentTypes: allowedContentTypes,
+ })
+ }}
+
+
+
+
+
+
+
+
+
+
+
+es:
+ Select files: Selecciona ficheros
+ Thermograph created: Termógrafo creado
+ New thermograph: Nuevo termógrafo
+
diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index 62292f115..e7805a7ed 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -1,6 +1,6 @@
@@ -258,13 +430,20 @@ onMounted(async () => {
/>
-
-
-
-
-
-
-
+
+
+
+
+ {{ t('Open as PDF') }}
+
+
+
+
@@ -277,61 +456,61 @@ onMounted(async () => {
hide-bottom
row-key="clientId"
:pagination="{ rowsPerPage: 0 }"
- class="full-width q-mt-md"
+ class="full-width"
+ table-style="user-select: none;"
+ @drag="handleDragScroll($event)"
+ @dragend="handleDragEnd($event)"
+ :separator="!targetRowIndex && targetRowIndex !== 0 ? 'horizontal' : 'none'"
>
-
-
-
- {{ col.value }}
-
-
-
-
-
-
- {{ col.value }}
+ {{ col.value }}
-
{
+
- {{ entry.id }}
-
-
+
+ {{ entry.id }}
+
- {{
- entry.supplierName
- }}
+
+ {{ entry.supplierName }}
+
+
+ {{ toCurrency(entry.invoiceAmount) }}
+
+
+ {{ entry.reference }}
+
+
+ {{ entry.stickers }}
+
- {{
- toCurrency(entry.invoiceAmount)
- }}
- {{ entry.reference }}
- {{ entry.stickers }}
-
- {{ entry.loadedkg }}
- {{ entry.volumeKg }}
-
-
-
-
+
+ {{ entry.loadedkg }}
+
+
+ {{ entry.volumeKg }}
+
+
+
+
+
-
@@ -415,4 +634,5 @@ es:
physicKg: KG físico
shipped: F. envío
landed: F. llegada
+ Open as PDF: Abrir como PDF
diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index 260b0fb42..0b8975165 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -65,171 +65,156 @@ const decrement = (paramsObj, key) => {
{{ formatFn(tag.value) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
en:
params:
diff --git a/src/pages/Travel/TravelCreate.vue b/src/pages/Travel/TravelCreate.vue
index c8ac7e690..abee03562 100644
--- a/src/pages/Travel/TravelCreate.vue
+++ b/src/pages/Travel/TravelCreate.vue
@@ -1,7 +1,7 @@
@@ -63,6 +64,7 @@ onBeforeMount(() => {
model="travel"
:form-initial-data="newTravelForm"
:observe-form-changes="viewAction === 'create'"
+ @on-data-saved="redirectToTravelBasicData"
>
@@ -82,62 +84,13 @@ onBeforeMount(() => {
-
-
-
-
-
-
-
-
-
-
-
-
-
+ />
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
en:
params:
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 889f096aa..edcfbac52 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -1,22 +1,24 @@
+
-
+
{
:value="row.agencyModeName"
/>
-
-
+
+
+
+ {{ toDate(row.shipped) }}
+
+ {{ toDate(row.shipped) }}
+
+
+
+
+
+ {{ toDate(row.landed) }}
+
+ {{ toDate(row.landed) }}
+
+
-
{
/>
@@ -132,20 +169,10 @@ onMounted(async () => {
-
-
en:
addEntry: Add entry
-
es:
addEntry: Añadir entrada
-
-
diff --git a/src/pages/Wagon/Type/WagonTypeList.vue b/src/pages/Wagon/Type/WagonTypeList.vue
index 8e4ace744..a7c713039 100644
--- a/src/pages/Wagon/Type/WagonTypeList.vue
+++ b/src/pages/Wagon/Type/WagonTypeList.vue
@@ -42,7 +42,7 @@ async function remove(row) {
-
+
-
-
diff --git a/src/pages/Wagon/WagonList.vue b/src/pages/Wagon/WagonList.vue
index 77d9da0bf..18417f433 100644
--- a/src/pages/Wagon/WagonList.vue
+++ b/src/pages/Wagon/WagonList.vue
@@ -48,7 +48,7 @@ async function remove(row) {
-
+
-
-
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index f089c0022..bec56bee7 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -101,7 +101,7 @@ const setData = (entity) => {
-
+
import WorkerDescriptor from './WorkerDescriptor.vue';
-import WorkerSummaryDialog from './WorkerSummaryDialog.vue';
+import WorkerSummary from './WorkerSummary.vue';
const $props = defineProps({
id: {
@@ -12,10 +12,6 @@ const $props = defineProps({
-
+
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 26328b9cd..8867c4289 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -78,9 +78,9 @@ const filter = {
-
+
-
+
{{ t('worker.summary.personalPhone') }}
-
+
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index a476632bb..eef29a8a4 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -7,9 +7,10 @@ import FormModel from 'components/FormModel.vue';
import VnRow from 'components/ui/VnRow.vue';
import VnInputDate from 'components/common/VnInputDate.vue';
import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
-import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
+import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
-import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
+import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
+import VnLocation from 'src/components/common/VnLocation.vue';
import VnInput from 'src/components/common/VnInput.vue';
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
@@ -21,14 +22,6 @@ const workerConfigFilter = {
field: ['payMethodFk'],
};
-const provincesFilter = {
- fields: ['id', 'name', 'countryFk'],
-};
-
-const townsFilter = {
- fields: ['id', 'name', 'provinceFk'],
-};
-
const newWorkerForm = ref({
companyFk: null,
payMethodFk: null,
@@ -49,9 +42,6 @@ const newWorkerForm = ref({
bankEntityFk: null,
});
-const postcodeFetchDataRef = ref(null);
-const provincesOptions = ref([]);
-const townsOptions = ref([]);
const companiesOptions = ref([]);
const workersOptions = ref([]);
const payMethodsOptions = ref([]);
@@ -66,9 +56,13 @@ const onBankEntityCreated = (data) => {
bankEntitiesOptions.value.push(data);
};
-const onPostcodeCreated = async () => {
- postcodeFetchDataRef.value.fetch();
-};
+function handleLocation(data, location) {
+ const { town, postcode: code, provinceFk, countryFk } = location ?? {};
+ data.postcode = code;
+ data.city = town;
+ data.provinceFk = provinceFk;
+ data.countryFk = countryFk;
+}
onMounted(async () => {
const userInfo = await useUserConfig().fetch();
@@ -83,24 +77,7 @@ onMounted(async () => {
:filter="workerConfigFilter"
auto-load
/>
-
-
-
+
{
-
-
-
-
-
-
-
- {{ scope.opt.code }}
- {{ scope.opt.code }} -
- {{ scope.opt.town.name }} ({{
- scope.opt.town.province.name
- }},
- {{
- scope.opt.town.province.country.country
- }})
-
-
-
-
-
-
-
+
-
-
-
-
-
- {{ scope.opt.name }}
- {{ scope.opt.name }},
- {{ scope.opt.province.name }} ({{
- scope.opt.province.country.country
- }})
-
-
-
-
-
{
v-model="data.iban"
:label="t('worker.create.iban')"
:rules="validate('Worker.iban')"
- />
+ >
+
+
+ {{
+ t('components.iban_tooltip')
+ }}
+
+
+
- {
-
+
diff --git a/src/pages/Worker/WorkerFilter.vue b/src/pages/Worker/WorkerFilter.vue
index 680a17937..0853791ef 100644
--- a/src/pages/Worker/WorkerFilter.vue
+++ b/src/pages/Worker/WorkerFilter.vue
@@ -27,74 +27,72 @@ const departments = ref();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index e7e86d16e..5214a9066 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -1,33 +1,24 @@