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

Merge branch 'develop' of https://github.com/Frappet/BMA-EHR-USER into develop

Browse source
This commit is contained in:
AnandaTon 2024-01-10 16:23:47 +07:00
commit 57e89f9574
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/modules/06_evaluate/components/EvaluateStepMain.vue
View file

@ -606,7 +606,16 @@ onMounted(async () => {
@click="onCilckNextStep()"
/>
<q-btn v-else-if="store.step >= store.currentStep && (store.step == 3 || store.step == 7)" unelevated label="ยื่นเอกการ" color="public" @click="onCilckNextStep()" />
<q-btn
v-else-if="
store.step >= store.currentStep &&
(store.step == 3 || store.step == 7)
"
unelevated
label="ยื่นเอกสาร"
color="public"
@click="onCilckNextStep()"
/>
<q-btn v-if="store.step >= store.currentStep && store.step == 2 && store.statusUpload" unelevated label="ดำเนินการต่อ" color="public" @click="onCilckNextStep()" />
<q-btn v-if="store.step >= store.currentStep && store.step == 6 && store.statusUpload" unelevated label="ดำเนินการต่อ" color="public" @click="onCilckNextStep()" />

4
src/modules/06_evaluate/components/step/step3.vue
View file

@ -57,6 +57,9 @@ async function fetchDocument(fileName: string) {
})
.catch((err) => {
messageError($q, err);
})
.finally(() => {
showLoader();
}));
}
@ -65,6 +68,7 @@ async function fetchDocument(fileName: string) {
* @param url ลิงก์ดาวน์โหลดไฟล์
*/
async function downloadFile(url: string) {
showLoader();
await axios
.get(url, {
responseType: "blob",