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

Merge branch 'develop' into NiceDev

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-01-18 11:36:51 +07:00
commit 4c392a9b67
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -630,7 +630,7 @@ onMounted(async () => {
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-9 q-pa-md " v-if="showLoadStatus"> <div class="col-xs-12 col-sm-9 q-pa-md" v-if="showLoadStatus">
<div class="col-12 row items-center"> <div class="col-12 row items-center">
<div class="toptitle2"> <div class="toptitle2">
{{ store.step }}.{{ store.title[store.step - 1] }} {{ store.step }}.{{ store.title[store.step - 1] }}

5
src/modules/06_evaluate/components/viewstep/viewStep3.vue
View file

@ -20,8 +20,8 @@ const tabPanels = store.tabPanels
</script> </script>
<template> <template>
<q-card bordered class="col-12 row shadow-0" :style="$q.screen.lt.sm ? '' : 'height: 60vh; overflow: scroll;' "> <q-card bordered class="col-12 row shadow-0" >
<div class="col-12 row items-center q-px-sm "> <div class="col-12 row items-center q-pa-sm ">
<div class="q-pl-sm text-weight-medium" >เอกสารที่อัปโหลด</div> <div class="q-pl-sm text-weight-medium" >เอกสารที่อัปโหลด</div>
<q-space /> <q-space />
<q-btn <q-btn
@ -44,6 +44,7 @@ const tabPanels = store.tabPanels
><q-tooltip>ดูเต็มจอ</q-tooltip></q-btn ><q-tooltip>ดูเต็มจอ</q-tooltip></q-btn
> >
</div> </div>
<div class="col-12"><q-separator /></div>
<q-tab-panels v-model="store.tabPanels" animated swipeable vertical class="col-12 row"> <q-tab-panels v-model="store.tabPanels" animated swipeable vertical class="col-12 row">
<q-tab-panel name="1"> <q-tab-panel name="1">

10
src/modules/06_evaluate/components/viewstep/viewStep7.vue
View file

@ -16,8 +16,8 @@ const modalPerview = ref<boolean>(false);
</script> </script>
<template> <template>
<q-card bordered class="col-12 row shadow-0" :style="$q.screen.lt.sm ? '' : 'height: 60vh; overflow: scroll;' "> <q-card bordered class="col-12 row shadow-0" >
<div class="col-12 row items-center q-px-sm"> <div class="col-12 row items-center q-pa-sm ">
<div class="q-pl-sm text-weight-medium" >เอกสารที่อัปโหลด</div> <div class="q-pl-sm text-weight-medium" >เอกสารที่อัปโหลด</div>
<q-space /> <q-space />
<q-btn <q-btn
@ -35,11 +35,15 @@ const modalPerview = ref<boolean>(false);
color="primary" color="primary"
icon="mdi-fullscreen" icon="mdi-fullscreen"
dense dense
class="q-ml-sm"
@click="modalPerview = true" @click="modalPerview = true"
><q-tooltip>ดูเต็มจอ</q-tooltip></q-btn ><q-tooltip>ดูเต็มจอ</q-tooltip></q-btn
> >
</div> </div>
<ViewPDF :pdfSrc="props.pdfSrc" class="col-12" /> <div class="col-12"><q-separator /></div>
<div class="row col-12">
<ViewPDF :pdfSrc="props.pdfSrc" class="col-12" />
</div>
</q-card> </q-card>
<q-dialog v-model="modalPerview" full-width fullHeight> <q-dialog v-model="modalPerview" full-width fullHeight>