diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index 345870aa4..d175a4167 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
import { useQuasar, QCheckbox, QBtn, QInput } from 'quasar';
import axios from 'axios';
+import { usePrintService } from 'composables/usePrintService';
import VnUserLink from '../ui/VnUserLink.vue';
import { downloadFile } from 'src/composables/downloadFile';
@@ -23,6 +24,7 @@ const rows = ref([]);
const dmsRef = ref();
const formDialog = ref({});
const token = useSession().getTokenMultimedia();
+const { openReport } = usePrintService();
const $props = defineProps({
model: {
@@ -199,12 +201,7 @@ const columns = computed(() => [
color: 'primary',
}),
click: (prop) =>
- downloadFile(
- prop.row.id,
- $props.downloadModel,
- undefined,
- prop.row.download,
- ),
+ openReport(`dms/${prop.row.id}/downloadFile`, {}, '_blank'),
},
{
component: QBtn,
diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 7020c8489..6e9128a43 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/src/pages/Account/Card/AccountDescriptorProxy.vue b/src/pages/Account/Card/AccountDescriptorProxy.vue
index 6a4b3e267..b7bbc1ef9 100644
--- a/src/pages/Account/Card/AccountDescriptorProxy.vue
+++ b/src/pages/Account/Card/AccountDescriptorProxy.vue
@@ -4,11 +4,6 @@ import AccountSummary from './AccountSummary.vue';
-
+
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 3728a18c0..01937a87a 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -1,5 +1,5 @@
@@ -126,7 +120,7 @@ onMounted(async () => {
size="md"
icon="assignment"
color="primary"
- :href="salixUrl + 'ticket/' + entity.ticketFk + '/sale-tracking'"
+ :to="{ name: 'TicketSaleTracking', params: { id: entity.ticketFk } }"
>
{{ t('claim.saleTracking') }}
@@ -134,7 +128,7 @@ onMounted(async () => {
size="md"
icon="visibility"
color="primary"
- :href="salixUrl + 'ticket/' + entity.ticketFk + '/tracking/index'"
+ :to="{ name: 'TicketTracking', params: { id: entity.ticketFk } }"
>
{{ t('claim.ticketTracking') }}
diff --git a/src/pages/Claim/Card/ClaimDescriptorProxy.vue b/src/pages/Claim/Card/ClaimDescriptorProxy.vue
index 78e686745..f4eff0843 100644
--- a/src/pages/Claim/Card/ClaimDescriptorProxy.vue
+++ b/src/pages/Claim/Card/ClaimDescriptorProxy.vue
@@ -4,11 +4,6 @@ import ClaimSummary from './ClaimSummary.vue';
-
+
diff --git a/src/pages/Item/Card/ItemDescriptorProxy.vue b/src/pages/Item/Card/ItemDescriptorProxy.vue
index 6e1f6d71f..237358871 100644
--- a/src/pages/Item/Card/ItemDescriptorProxy.vue
+++ b/src/pages/Item/Card/ItemDescriptorProxy.vue
@@ -30,7 +30,6 @@ const $props = defineProps({
:dated="dated"
:sale-fk="saleFk"
:warehouse-fk="warehouseFk"
- :proxy-render="true"
/>
diff --git a/src/pages/Shelving/Parking/Card/ParkingDescriptorProxy.vue b/src/pages/Shelving/Parking/Card/ParkingDescriptorProxy.vue
index e78a2b238..cff1f75c2 100644
--- a/src/pages/Shelving/Parking/Card/ParkingDescriptorProxy.vue
+++ b/src/pages/Shelving/Parking/Card/ParkingDescriptorProxy.vue
@@ -4,11 +4,6 @@ import ParkingSummary from './ParkingSummary.vue';
-
+
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index d157916ac..5b04e9cfd 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -70,8 +70,6 @@ async function getDate(query, params) {
for (const param in params) {
if (!params[param]) return;
}
-
- formData.value.zoneFk = null;
zonesOptions.value = [];
const { data } = await axios.get(query, { params });
if (!data) return notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
@@ -79,7 +77,7 @@ async function getDate(query, params) {
formData.value.zoneFk = data.zoneFk;
formData.value.landed = data.landed;
const shippedDate = new Date(params.shipped);
- const landedDate = new Date(data.landed);
+ const landedDate = new Date(data.hour);
shippedDate.setHours(
landedDate.getHours(),
landedDate.getMinutes(),
@@ -427,6 +425,14 @@ async function getZone(options) {
:rules="validate('ticketList.shipped')"
@update:model-value="setShipped"
/>
+
-import { reactive } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router';
@@ -30,31 +29,29 @@ const { t } = useI18n();
const router = useRouter();
const { notify } = useNotify();
-const newTicketFormData = reactive({});
const date = new Date();
-const createTicket = async () => {
+async function createTicket(formData) {
const expeditionIds = $props.selectedExpeditions.map((expedition) => expedition.id);
const params = {
clientId: $props.ticket.clientFk,
- landed: newTicketFormData.landed,
+ landed: formData.landed,
warehouseId: $props.ticket.warehouseFk,
addressId: $props.ticket.addressFk,
agencyModeId: $props.ticket.agencyModeFk,
- routeId: newTicketFormData.routeFk,
+ routeId: formData.routeFk,
expeditionIds: expeditionIds,
};
-
const { data } = await axios.post('Expeditions/moveExpeditions', params);
notify(t('globals.dataSaved'), 'positive');
router.push({ name: 'TicketSummary', params: { id: data.id } });
-};
+}
diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index 591dadcd2..b1bde6d75 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -4,9 +4,11 @@ import VnCard from 'src/components/common/VnCard.vue';
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 9576e7e84..db0c7c096 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -2,7 +2,6 @@
import { computed, ref } from 'vue';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
-import EntityDescriptor from 'src/components/ui/EntityDescriptor.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
import VnChangePassword from 'src/components/common/VnChangePassword.vue';
@@ -11,6 +10,8 @@ import VnImg from 'src/components/ui/VnImg.vue';
import EditPictureForm from 'components/EditPictureForm.vue';
import WorkerDescriptorMenu from './WorkerDescriptorMenu.vue';
import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
+import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
+import WorkerCard from './WorkerCard.vue';
const $props = defineProps({
id: {
@@ -52,14 +53,17 @@ const handlePhotoUpdated = (evt = false) => {
};
-
{
-
+