diff --git a/package.json b/package.json index a2b2cc9a..91a80122 100755 --- a/package.json +++ b/package.json @@ -74,6 +74,7 @@ "vue-svgicon": "^4.0.0-alpha.3", "vue-timeago3": "^2.3.0", "vue2-dragula": "^2.5.5", + "vue3-pdf-app": "^1.0.3", "vuex": "^4.1.0", "vuex-router-sync": "^6.0.0-rc.1" }, diff --git a/src/components/CLineChart/CLineChart.ts b/src/components/CLineChart/CLineChart.ts index 7368648f..8d0ec3dd 100755 --- a/src/components/CLineChart/CLineChart.ts +++ b/src/components/CLineChart/CLineChart.ts @@ -7,7 +7,7 @@ import { useGlobalStore } from '@store/globalStore' import { useI18n } from '@/boot/i18n' import { useQuasar } from 'quasar' -import { Chart, ChartItem, ChartConfiguration } from 'chart.js/auto' +import { Chart, ChartItem, ChartConfiguration } from 'chart.js' export default defineComponent({ diff --git a/src/components/CProductCard/CProductCard.ts b/src/components/CProductCard/CProductCard.ts index c4dc3b2f..491b4a14 100755 --- a/src/components/CProductCard/CProductCard.ts +++ b/src/components/CProductCard/CProductCard.ts @@ -19,6 +19,12 @@ import { shared_consts } from '@src/common/shared_vuejs' import { useRouter } from 'vue-router' import { costanti } from '@costanti' + +import VuePdfApp from 'vue3-pdf-app' +// import this to use default icons for buttons +import 'vue3-pdf-app/dist/icons/main.css' + + export default defineComponent({ name: 'CProductCard', props: { @@ -61,6 +67,8 @@ export default defineComponent({ const fullscreenImage = ref(null) + const apriSchedaPDF = ref(false) + let myorder = reactive({ idapp: process.env.APP_ID, quantity: 0, @@ -89,6 +97,7 @@ export default defineComponent({ const startY = ref(0) const scale = ref(1) + const valoriopt = computed(() => (item: any, addall: boolean, addnone: boolean) => { // console.log('valoriopt', item.table) return globalStore.getTableJoinByName(item.table, addall, addnone, item.filter) @@ -271,6 +280,7 @@ export default defineComponent({ function mounted() { load() + // Start the timer when the component is mounted startTimer(); } @@ -456,6 +466,7 @@ export default defineComponent({ updateproductmodif, isOrdineChiuso, ricarica, + apriSchedaPDF, } } }) diff --git a/src/components/CProductCard/CProductCard.vue b/src/components/CProductCard/CProductCard.vue index 50782478..bdb7b5d8 100755 --- a/src/components/CProductCard/CProductCard.vue +++ b/src/components/CProductCard/CProductCard.vue @@ -47,16 +47,7 @@ style="bottom: -10px; right: 0px; transform: translateY(-50%)" /> - + @@ -253,7 +244,7 @@ -
+
{{ t('products.link_scheda') }}
@@ -361,8 +352,11 @@ + + + - + + @@ -902,6 +916,35 @@ + + + + + {{ myproduct.productInfo.name }} + + + + + + + + + + + + + +