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

Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into develop

Browse source
This commit is contained in:
Warunee Tamkoo 2023-11-22 16:16:57 +07:00
commit 4583438b95
2 changed files with 63 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
View file

@ -586,7 +586,7 @@ watch(props.data, async () => {
<div <div
class="col-xs-12 col-sm-12 text-weight-medium bg-grey-1 q-py-xs q-px-md" class="col-xs-12 col-sm-12 text-weight-medium bg-grey-1 q-py-xs q-px-md"
> >
อัปโหลดหลักฐานสนับสนุนข้อกล่าวหา อัปโหลดไฟล์เอกสารหลักฐาน
</div> </div>
<div class="col-12"><q-separator /></div> <div class="col-12"><q-separator /></div>
<div class="col-xs-12 q-pa-sm row"> <div class="col-xs-12 q-pa-sm row">
@ -606,9 +606,18 @@ watch(props.data, async () => {
<q-icon name="attach_file" color="primary" /> <q-icon name="attach_file" color="primary" />
</template> </template>
</q-file> </q-file>
<q-btn class="col q-mt-sm" flat round color="primary" icon="upload"> <div class="col-1 self-center" v-if="formData.evidenceFiles">
<q-tooltip>อัปโหลดเอกสารหลักฐาน</q-tooltip></q-btn <q-btn
> size="14px"
flat
round
dense
color="add"
class="q-ml-sm q-mt-sm"
icon="mdi-upload"
><q-tooltip>อัปโหลดไฟล์</q-tooltip></q-btn
>
</div>
</div> </div>
<div class="col-xs-12 q-pa-sm row"> <div class="col-xs-12 q-pa-sm row">
<q-list bordered separator class="full-width"> <q-list bordered separator class="full-width">

85
src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
View file

@ -704,15 +704,18 @@ onMounted(async () => {
<q-icon name="attach_file" /> <q-icon name="attach_file" />
</template> </template>
</q-file> </q-file>
<q-btn <div class="col-1 self-center" v-if="formData.filesEvidence">
class="col q-mt-sm" <q-btn
flat size="14px"
round flat
color="primary" round
icon="upload" dense
> color="add"
<q-tooltip>อัปโหลดเอกสารหลักฐาน</q-tooltip></q-btn class="q-ml-sm q-mt-sm"
> icon="mdi-upload"
><q-tooltip>อัปโหลดไฟล์</q-tooltip></q-btn
>
</div>
</div> </div>
<div class="col-xs-12 q-pa-sm row"> <div class="col-xs-12 q-pa-sm row">
<q-list bordered separator class="full-width"> <q-list bordered separator class="full-width">
@ -788,15 +791,21 @@ onMounted(async () => {
<q-icon name="attach_file" /> <q-icon name="attach_file" />
</template> </template>
</q-file> </q-file>
<q-btn <div
class="col q-mt-sm" class="col-1 self-center"
flat v-if="formData.filesRecordAccuser"
round
color="primary"
icon="upload"
>
<q-tooltip>อัปโหลดเอกสารหลักฐาน</q-tooltip></q-btn
> >
<q-btn
size="14px"
flat
round
dense
color="add"
class="q-ml-sm q-mt-sm"
icon="mdi-upload"
><q-tooltip>อัปโหลดไฟล์</q-tooltip></q-btn
>
</div>
</div> </div>
<div class="col-xs-12 q-pa-sm row"> <div class="col-xs-12 q-pa-sm row">
<q-list bordered separator class="full-width"> <q-list bordered separator class="full-width">
@ -872,15 +881,18 @@ onMounted(async () => {
<q-icon name="attach_file" /> <q-icon name="attach_file" />
</template> </template>
</q-file> </q-file>
<q-btn <div class="col-1 self-center" v-if="formData.filesWitnesses">
class="col q-mt-sm" <q-btn
flat size="14px"
round flat
color="primary" round
icon="upload" dense
> color="add"
<q-tooltip>อัปโหลดเอกสารหลักฐาน</q-tooltip></q-btn class="q-ml-sm q-mt-sm"
> icon="mdi-upload"
><q-tooltip>อัปโหลดไฟล์</q-tooltip></q-btn
>
</div>
</div> </div>
<div class="col-xs-12 q-pa-sm row"> <div class="col-xs-12 q-pa-sm row">
<q-list bordered separator class="full-width"> <q-list bordered separator class="full-width">
@ -956,15 +968,18 @@ onMounted(async () => {
<q-icon name="attach_file" /> <q-icon name="attach_file" />
</template> </template>
</q-file> </q-file>
<q-btn <div class="col-1 self-center" v-if="formData.filesEtc">
class="col q-mt-sm" <q-btn
flat size="14px"
round flat
color="primary" round
icon="upload" dense
> color="add"
<q-tooltip>อัปโหลดเอกสารหลักฐาน</q-tooltip></q-btn class="q-ml-sm q-mt-sm"
> icon="mdi-upload"
><q-tooltip>อัปโหลดไฟล์</q-tooltip></q-btn
>
</div>
</div> </div>
<div class="col-xs-12 q-pa-sm row"> <div class="col-xs-12 q-pa-sm row">
<q-list bordered separator class="full-width"> <q-list bordered separator class="full-width">