diff --git a/src/components/modal/label/Show.vue b/src/components/modal/label/Show.vue index 4588778..7abfdbe 100644 --- a/src/components/modal/label/Show.vue +++ b/src/components/modal/label/Show.vue @@ -220,6 +220,27 @@ export default { stylesHtml += node.outerHTML; } + // Add custom styles for label printing + const labelStyles = ``; + // Open the print window const WinPrint = window.open( "", @@ -227,20 +248,16 @@ export default { "left=0,top=0,width=800,height=900,toolbar=0,scrollbars=0,status=0" ); - WinPrint.document.write(` - - - ${stylesHtml} - - - ${prtHtml} - - `); + WinPrint.document.write(` ${stylesHtml} ${labelStyles} Print Label ${prtHtml} `); WinPrint.document.close(); WinPrint.focus(); - WinPrint.print(); - WinPrint.close(); + + // Delay print to ensure content is loaded + setTimeout(() => { + WinPrint.print(); + WinPrint.close(); + }, 500); } }, created() { diff --git a/src/components/modal/package/Show.vue b/src/components/modal/package/Show.vue index 750ccdf..e6a2616 100644 --- a/src/components/modal/package/Show.vue +++ b/src/components/modal/package/Show.vue @@ -80,8 +80,17 @@ Item Name:{{ item.name }} - + ({{ item.pivot.count }}) + + + + fas fa-search + DETAILS + + @@ -105,8 +114,9 @@ - - + + fas fa-edit Add Label diff --git a/src/views/Cycle/List.vue b/src/views/Cycle/List.vue index b36a886..826839e 100644 --- a/src/views/Cycle/List.vue +++ b/src/views/Cycle/List.vue @@ -39,14 +39,17 @@ Filter - + fas fa-share-square EXPORT @@ -249,9 +252,9 @@ export default { } }, async download() { - const result = await ApiService.get(urls.exportCycles()); + const result = await ApiService.get(urls.exportItems()); if (result && result.status == 200) { - window.open(result.download, '_blank'); + window.open(result.data.data.url, '_blank'); } }, }, diff --git a/src/views/Item/List.vue b/src/views/Item/List.vue index 708a2e3..6c613d9 100644 --- a/src/views/Item/List.vue +++ b/src/views/Item/List.vue @@ -12,6 +12,10 @@ + + + + + + + +