hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into nice_dev

Browse source 
# Conflicts:
#	src/modules/10_order/components/Main.vue
#	src/modules/10_order/components/step/step04.vue
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-09-22 10:50:43 +07:00
commit b2884c9b9c
7 changed files with 622 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/modules/10_order/components/step/step04.vue
View file

@ -469,6 +469,9 @@ const viewFileUpload = async (url: string) => {
v-close-popup
@click="downloadCover('pdf')"
>
<!-- type="a"
:href="orderCoverPdf"
target="_blank" -->
<q-item-section avatar
><q-icon color="red" name="mdi-file-pdf"
/></q-item-section>
@ -479,6 +482,9 @@ const viewFileUpload = async (url: string) => {
v-close-popup
@click="downloadCover('docx')"
>
<!-- type="a"
:href="orderCoverDocs"
target="_blank" -->
<q-item-section avatar
><q-icon color="blue" name="mdi-file-word"
/></q-item-section>
@ -520,6 +526,9 @@ const viewFileUpload = async (url: string) => {
v-close-popup
@click="downloadAttachment('pdf')"
>
<!-- type="a"
:href="orderAttachmentPdf"
target="_blank" -->
<q-item-section avatar
><q-icon color="red" name="mdi-file-pdf"
/></q-item-section>
@ -530,6 +539,9 @@ const viewFileUpload = async (url: string) => {
v-close-popup
@click="downloadAttachment('xlsx')"
>
<!-- type="a"
:href="orderAttachmentXlsx"
target="_blank" -->
<q-item-section avatar
><q-icon color="green-7" name="mdi-file-excel"
/></q-item-section>
@ -576,6 +588,7 @@ const viewFileUpload = async (url: string) => {
</div>
<div class="pdfWidth">
<VuePDF ref="vuePDFRef" :pdf="pdfSrc" :page="page" fit-parent />
<!-- <VuePdf :key="page" :src="pdfSrc" :page="page" /> -->
</div>
<div class="justify-between items-center align-center q-pt-sm row">
<q-btn
@ -968,6 +981,7 @@ const viewFileUpload = async (url: string) => {
fit-parent
:scale="0.1"
/>
<!-- <VuePdf :key="page" :src="pdfSrc" :page="page" /> -->
</div>
<div class="justify-between items-center align-center q-pt-sm row">
<q-btn
@ -1047,6 +1061,7 @@ const viewFileUpload = async (url: string) => {
fit-parent
:scale="0.1"
/>
<!-- <VuePdf :key="page" :src="pdfSrc" :page="page" /> -->
</div>
<div class="justify-between items-center align-center q-pt-sm row">
<q-btn