Merge branch 'develop' into devTee
This commit is contained in:
commit
621104c4a2
2 changed files with 22 additions and 6 deletions
|
|
@ -211,7 +211,7 @@ async function downloadReport() {
|
|||
data,
|
||||
"แบบรายงานผลการปฏิบัติราชการ " +
|
||||
store.dataEvaluation.prefix +
|
||||
store.dataEvaluation.fileName +
|
||||
store.dataEvaluation.firstName +
|
||||
" " +
|
||||
store.dataEvaluation.lastName
|
||||
);
|
||||
|
|
|
|||
|
|
@ -271,13 +271,13 @@ function onOpenReturn() {
|
|||
dialogReturn.value = true;
|
||||
}
|
||||
|
||||
function onDownload() {
|
||||
function onDownload(type: string) {
|
||||
showLoader();
|
||||
http
|
||||
.get(config.API.developmentScholarshipReport + `/${id.value}`)
|
||||
.then((res) => {
|
||||
const dataList = res.data.result;
|
||||
genReport(dataList, "ฟอร์มรายงานตัวกลับเข้ารับราชการ(ต้นแบบ)");
|
||||
genReport(dataList, "ฟอร์มรายงานตัวกลับเข้ารับราชการ(ต้นแบบ)", type);
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
|
|
@ -543,11 +543,27 @@ onMounted(async () => {
|
|||
</q-item-label>
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
<q-item clickable v-close-popup @click="onDownload">
|
||||
<q-item clickable v-close-popup @click="onDownload('docx')">
|
||||
<q-item-section>
|
||||
<q-item-label>
|
||||
<q-icon name="download" color="primary" size="18px" />
|
||||
ดาวน์โหลดฟอร์มต้นแบบ
|
||||
<q-icon
|
||||
name="mdi-file-word"
|
||||
color="blue"
|
||||
size="18px"
|
||||
/>
|
||||
ดาวน์โหลดฟอร์มต้นแบบ .docx
|
||||
</q-item-label>
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
<q-item clickable v-close-popup @click="onDownload('pdf')">
|
||||
<q-item-section>
|
||||
<q-item-label>
|
||||
<q-icon
|
||||
name="mdi-file-pdf-box"
|
||||
color="red"
|
||||
size="18px"
|
||||
/>
|
||||
ดาวน์โหลดฟอร์มต้นแบบ .pdf
|
||||
</q-item-label>
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue