ปรับเมนู & ปุ่ม dialog
This commit is contained in:
parent
7154051ff2
commit
3641dc492f
12 changed files with 126 additions and 151 deletions
|
|
@ -118,44 +118,40 @@
|
|||
<q-btn
|
||||
v-if="showEdit && edit"
|
||||
flat
|
||||
round
|
||||
outline
|
||||
color="red"
|
||||
@click="cancelClick()"
|
||||
icon="mdi-undo"
|
||||
>
|
||||
<q-tooltip>ยกเลิก</q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
v-if="edit"
|
||||
flat
|
||||
round
|
||||
color="public"
|
||||
icon="mdi-content-save-outline"
|
||||
type="submit"
|
||||
>
|
||||
<q-tooltip>บันทึก</q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
v-if="!edit"
|
||||
flat
|
||||
round
|
||||
color="primary"
|
||||
@click="editClick"
|
||||
icon="mdi-pencil-outline"
|
||||
>
|
||||
<q-tooltip>แก้ไขข้อมูล</q-tooltip>
|
||||
label="ยกเลิกแก้ไข"
|
||||
> <!-- icon="mdi-undo"
|
||||
<q-tooltip>ยกเลิก</q-tooltip> -->
|
||||
</q-btn>
|
||||
<q-btn
|
||||
v-if="showEdit && edit"
|
||||
flat
|
||||
round
|
||||
outline
|
||||
unelevated
|
||||
color="red"
|
||||
@click="deleteClick()"
|
||||
icon="mdi-delete"
|
||||
label="ลบวันหยุด"
|
||||
> <!-- icon="mdi-delete"
|
||||
<q-tooltip>ลบ</q-tooltip> -->
|
||||
</q-btn>
|
||||
<q-btn
|
||||
v-if="edit"
|
||||
unelevated
|
||||
color="public"
|
||||
label="บันทึก"
|
||||
type="submit"
|
||||
>
|
||||
<q-tooltip>ลบ</q-tooltip>
|
||||
<!-- icon="mdi-content-save-outline"
|
||||
<q-tooltip>บันทึก</q-tooltip> -->
|
||||
</q-btn>
|
||||
<q-btn
|
||||
v-if="!edit"
|
||||
outline
|
||||
color="primary"
|
||||
@click="editClick"
|
||||
label="แก้ไขข้อมูล"
|
||||
>
|
||||
<!-- icon="mdi-pencil-outline"
|
||||
<q-tooltip>แก้ไขข้อมูล</q-tooltip> -->
|
||||
</q-btn>
|
||||
</q-card-actions>
|
||||
</q-form>
|
||||
|
|
|
|||
|
|
@ -157,13 +157,13 @@
|
|||
<q-separator />
|
||||
<q-card-actions align="right" class="text-primary">
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
unelevated
|
||||
label="บันทึก"
|
||||
color="public"
|
||||
icon="mdi-content-save-outline"
|
||||
type="submit"
|
||||
>
|
||||
<q-tooltip>บันทึก</q-tooltip>
|
||||
|
||||
> <!-- icon="mdi-content-save-outline"
|
||||
<q-tooltip>บันทึก</q-tooltip> -->
|
||||
</q-btn>
|
||||
</q-card-actions>
|
||||
</q-form>
|
||||
|
|
|
|||
|
|
@ -218,13 +218,12 @@
|
|||
<q-separator />
|
||||
<q-card-actions align="right" class="text-primary">
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
unelevated
|
||||
label="บันทึก"
|
||||
color="public"
|
||||
icon="mdi-content-save-outline"
|
||||
type="submit"
|
||||
>
|
||||
<q-tooltip>บันทึก</q-tooltip>
|
||||
> <!-- icon="mdi-content-save-outline"
|
||||
<q-tooltip>บันทึก</q-tooltip> -->
|
||||
</q-btn>
|
||||
</q-card-actions>
|
||||
</q-form>
|
||||
|
|
@ -316,13 +315,12 @@
|
|||
<q-separator />
|
||||
<q-card-actions align="right" class="text-primary">
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
unelevated
|
||||
label="บันทึก"
|
||||
color="public"
|
||||
icon="mdi-content-save-outline"
|
||||
type="submit"
|
||||
>
|
||||
<q-tooltip>บันทึก</q-tooltip>
|
||||
> <!-- icon="mdi-content-save-outline"
|
||||
<q-tooltip>บันทึก</q-tooltip> -->
|
||||
</q-btn>
|
||||
</q-card-actions>
|
||||
</q-form>
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
<q-space />
|
||||
<q-btn
|
||||
v-if="!editvisible"
|
||||
flat
|
||||
round
|
||||
outline
|
||||
:disabled="editvisible"
|
||||
:color="editvisible ? 'grey-7' : 'primary'"
|
||||
@click="edit"
|
||||
icon="mdi-pencil-outline"
|
||||
>
|
||||
<q-tooltip>แก้ไขข้อมูล</q-tooltip>
|
||||
label="แก้ไขข้อมูล"
|
||||
|
||||
><!-- icon="mdi-pencil-outline"
|
||||
<q-tooltip>แก้ไขข้อมูล</q-tooltip> -->
|
||||
</q-btn>
|
||||
<div v-else>
|
||||
<!-- <q-btn
|
||||
|
|
@ -26,14 +26,14 @@
|
|||
<q-tooltip>ยกเลิก</q-tooltip>
|
||||
</q-btn> -->
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
unelevated
|
||||
label="บันทึก"
|
||||
:disabled="!editvisible"
|
||||
:color="!editvisible ? 'grey-7' : 'public'"
|
||||
@click="checkSave"
|
||||
icon="mdi-content-save-outline"
|
||||
>
|
||||
<q-tooltip>บันทึก</q-tooltip>
|
||||
|
||||
> <!-- icon="mdi-content-save-outline"
|
||||
<q-tooltip>บันทึก</q-tooltip> -->
|
||||
</q-btn>
|
||||
</div>
|
||||
</q-card-actions>
|
||||
|
|
|
|||
|
|
@ -607,14 +607,14 @@
|
|||
<q-card-actions align="right" class="text-primary q-py-sm">
|
||||
<!-- Save for Add Organizations & Positions -->
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
dense
|
||||
unelevated
|
||||
label="บันทึก"
|
||||
:color="'public'"
|
||||
@click="addStructure(rowClickTree)"
|
||||
icon="mdi-content-save-outline"
|
||||
|
||||
>
|
||||
<q-tooltip>บันทึก</q-tooltip>
|
||||
<!-- icon="mdi-content-save-outline"
|
||||
<q-tooltip>บันทึก</q-tooltip> -->
|
||||
</q-btn>
|
||||
</q-card-actions>
|
||||
</q-card>
|
||||
|
|
@ -651,14 +651,12 @@
|
|||
<q-card-actions align="right" class="text-primary q-py-sm">
|
||||
<!-- save Edit Selected Position -->
|
||||
<q-btn
|
||||
flat
|
||||
dense
|
||||
round
|
||||
unelevated
|
||||
label="บันทึก"
|
||||
:color="'public'"
|
||||
@click="editPositionStructure(rowClickTree)"
|
||||
icon="mdi-content-save-outline"
|
||||
>
|
||||
<q-tooltip>บันทึก</q-tooltip>
|
||||
> <!-- icon="mdi-content-save-outline"
|
||||
<q-tooltip>บันทึก</q-tooltip> -->
|
||||
</q-btn>
|
||||
</q-card-actions>
|
||||
</q-card>
|
||||
|
|
@ -694,14 +692,12 @@
|
|||
<q-card-actions align="right" class="text-primary q-py-sm">
|
||||
<!-- save Edit Selected Organization -->
|
||||
<q-btn
|
||||
flat
|
||||
dense
|
||||
round
|
||||
unelevated
|
||||
label="บันทึก"
|
||||
:color="'public'"
|
||||
@click="editOrgStructure(rowClickTree)"
|
||||
icon="mdi-content-save-outline"
|
||||
>
|
||||
<q-tooltip>บันทึก</q-tooltip>
|
||||
><!-- icon="mdi-content-save-outline"
|
||||
<q-tooltip>บันทึก</q-tooltip> -->
|
||||
</q-btn>
|
||||
</q-card-actions>
|
||||
</q-card>
|
||||
|
|
|
|||
|
|
@ -557,13 +557,12 @@
|
|||
<q-card-actions class="q-py-sm">
|
||||
<q-space />
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
unelevated
|
||||
color="public"
|
||||
icon="mdi-content-save-outline"
|
||||
label="บันทึก"
|
||||
@click="checkSave"
|
||||
>
|
||||
<q-tooltip>บันทึก</q-tooltip>
|
||||
> <!-- icon="mdi-content-save-outline"
|
||||
<q-tooltip>บันทึก</q-tooltip> -->
|
||||
</q-btn>
|
||||
</q-card-actions>
|
||||
</q-form>
|
||||
|
|
|
|||
|
|
@ -22,25 +22,24 @@
|
|||
<div v-if="editData">
|
||||
<q-btn
|
||||
v-if="!editvisible"
|
||||
flat
|
||||
round
|
||||
outline
|
||||
:disabled="editvisible"
|
||||
:color="editvisible ? 'grey-7' : 'primary'"
|
||||
@click="edit"
|
||||
icon="mdi-pencil-outline"
|
||||
>
|
||||
<q-tooltip>แก้ไขข้อมูล</q-tooltip>
|
||||
label="แก้ไขข้อมูล"
|
||||
> <!-- icon="mdi-pencil-outline"
|
||||
<q-tooltip>แก้ไขข้อมูล</q-tooltip> -->
|
||||
</q-btn>
|
||||
<div v-else>
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
unelevated
|
||||
label="บันทึก"
|
||||
:disabled="!editvisible"
|
||||
:color="!editvisible ? 'grey-7' : 'public'"
|
||||
@click="checkSave"
|
||||
icon="mdi-content-save-outline"
|
||||
>
|
||||
<q-tooltip>บันทึก</q-tooltip>
|
||||
|
||||
> <!-- icon="mdi-content-save-outline"
|
||||
<q-tooltip>บันทึก</q-tooltip> -->
|
||||
</q-btn>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -260,13 +260,12 @@
|
|||
<q-card-actions class="text-primary q-py-sm">
|
||||
<q-space />
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
unelevated
|
||||
label="บันทึก"
|
||||
color="public"
|
||||
@click="checkSave"
|
||||
icon="mdi-content-save-outline"
|
||||
>
|
||||
<q-tooltip>บันทึก</q-tooltip>
|
||||
> <!-- icon="mdi-content-save-outline"
|
||||
<q-tooltip>บันทึก</q-tooltip> -->
|
||||
</q-btn>
|
||||
</q-card-actions>
|
||||
</q-form>
|
||||
|
|
@ -300,13 +299,12 @@
|
|||
<q-card-actions class="text-primary q-py-sm">
|
||||
<q-space />
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
unelevated
|
||||
label="บันทึก"
|
||||
color="public"
|
||||
@click="checkSaveScore"
|
||||
icon="mdi-content-save-outline"
|
||||
>
|
||||
<q-tooltip>บันทึก</q-tooltip>
|
||||
> <!-- icon="mdi-content-save-outline"
|
||||
<q-tooltip>บันทึก</q-tooltip> -->
|
||||
</q-btn>
|
||||
</q-card-actions>
|
||||
</q-form>
|
||||
|
|
@ -340,13 +338,13 @@
|
|||
<q-card-actions class="text-primary q-py-sm">
|
||||
<q-space />
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
unelevated
|
||||
label="บันทึก"
|
||||
color="public"
|
||||
@click="checkSaveCandidate"
|
||||
icon="mdi-content-save-outline"
|
||||
>
|
||||
<q-tooltip>บันทึก</q-tooltip>
|
||||
|
||||
> <!-- icon="mdi-content-save-outline"
|
||||
<q-tooltip>บันทึก</q-tooltip> -->
|
||||
</q-btn>
|
||||
</q-card-actions>
|
||||
</q-form>
|
||||
|
|
|
|||
|
|
@ -260,13 +260,12 @@
|
|||
<q-card-actions class="text-primary q-py-sm">
|
||||
<q-space />
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
unelevated
|
||||
label="บันทึก"
|
||||
color="public"
|
||||
@click="checkSave"
|
||||
icon="mdi-content-save-outline"
|
||||
>
|
||||
<q-tooltip>บันทึก</q-tooltip>
|
||||
><!-- icon="mdi-content-save-outline"
|
||||
<q-tooltip>บันทึก</q-tooltip> -->
|
||||
</q-btn>
|
||||
</q-card-actions>
|
||||
</q-form>
|
||||
|
|
@ -300,13 +299,12 @@
|
|||
<q-card-actions class="text-primary q-py-sm">
|
||||
<q-space />
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
unelevated
|
||||
label="บันทึก"
|
||||
color="public"
|
||||
@click="checkSaveScore"
|
||||
icon="mdi-content-save-outline"
|
||||
>
|
||||
<q-tooltip>บันทึก</q-tooltip>
|
||||
> <!-- icon="mdi-content-save-outline"
|
||||
<q-tooltip>บันทึก</q-tooltip> -->
|
||||
</q-btn>
|
||||
</q-card-actions>
|
||||
</q-form>
|
||||
|
|
@ -343,13 +341,12 @@
|
|||
<q-card-actions class="text-primary q-py-sm">
|
||||
<q-space />
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
unelevated
|
||||
label="บันทึก"
|
||||
color="public"
|
||||
@click="checkSaveCandidate"
|
||||
icon="mdi-content-save-outline"
|
||||
>
|
||||
<q-tooltip>บันทึก</q-tooltip>
|
||||
><!-- icon="mdi-content-save-outline"
|
||||
<q-tooltip>บันทึก</q-tooltip> -->
|
||||
</q-btn>
|
||||
</q-card-actions>
|
||||
</q-form>
|
||||
|
|
|
|||
|
|
@ -493,60 +493,55 @@
|
|||
<q-space />
|
||||
<q-btn
|
||||
v-if="!editvisible"
|
||||
flat
|
||||
round
|
||||
unelevated
|
||||
label="ลบข้อมูล"
|
||||
:disabled="editvisible"
|
||||
:color="editvisible ? 'grey-7' : 'red'"
|
||||
@click="saveDelete()"
|
||||
icon="mdi-delete-outline"
|
||||
>
|
||||
<q-tooltip>ลบข้อมูล</q-tooltip>
|
||||
><!-- icon="mdi-delete-outline"
|
||||
<q-tooltip>ลบข้อมูล</q-tooltip> -->
|
||||
</q-btn>
|
||||
<q-btn
|
||||
v-if="!editvisible"
|
||||
flat
|
||||
round
|
||||
label="แก้ไขข้อมูล"
|
||||
outline
|
||||
:disabled="editvisible"
|
||||
:color="editvisible ? 'grey-7' : 'primary'"
|
||||
@click="editDialog()"
|
||||
icon="mdi-pencil-outline"
|
||||
>
|
||||
<q-tooltip>แก้ไขข้อมูล</q-tooltip>
|
||||
><!-- icon="mdi-pencil-outline"
|
||||
<q-tooltip>แก้ไขข้อมูล</q-tooltip> -->
|
||||
</q-btn>
|
||||
<div v-else>
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
label="ยกเลิกแก้ไข"
|
||||
:disabled="!editvisible"
|
||||
:outline="!editvisible"
|
||||
:color="!editvisible ? 'grey-7' : 'red'"
|
||||
@click="editDialog()"
|
||||
icon="mdi-undo"
|
||||
>
|
||||
<q-tooltip>ยกเลิก</q-tooltip>
|
||||
><!-- icon="mdi-undo"
|
||||
<q-tooltip>ยกเลิก</q-tooltip> -->
|
||||
</q-btn>
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
unelevated
|
||||
label="บันทึก"
|
||||
:disabled="!editvisible"
|
||||
:color="!editvisible ? 'grey-7' : 'public'"
|
||||
@click="saveEdit"
|
||||
icon="mdi-content-save-outline"
|
||||
>
|
||||
<q-tooltip>บันทึก</q-tooltip>
|
||||
><!-- icon="mdi-content-save-outline"
|
||||
<q-tooltip>บันทึก</q-tooltip> -->
|
||||
</q-btn>
|
||||
</div>
|
||||
</q-card-actions>
|
||||
<q-card-actions class="text-primary q-py-sm" v-else>
|
||||
<q-space />
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
unelevated
|
||||
label="บันทึก"
|
||||
color="public"
|
||||
@click="saveAdd"
|
||||
icon="mdi-content-save-outline"
|
||||
>
|
||||
<q-tooltip>บันทึก</q-tooltip>
|
||||
><!-- icon="mdi-content-save-outline"
|
||||
<q-tooltip>บันทึก</q-tooltip> -->
|
||||
</q-btn>
|
||||
</q-card-actions>
|
||||
</q-card>
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@
|
|||
<div class="dialog-card-contain">
|
||||
<q-card-section class="q-pa-md">
|
||||
<div class="row col-12 q-col-gutter-sm">
|
||||
<div class="col-xs-12 col-sm-3">
|
||||
<div :class=" $q.screen.lt.md ? ' row col-12 q-col-gutter-xs' : 'no-wrap row col-12 q-col-gutter-xs'">
|
||||
<selector
|
||||
hide-bottom-space
|
||||
:rules="[(val:string) => !!val || `${'กรุณาเลือก ประเภท'}`]"
|
||||
|
|
@ -137,11 +137,9 @@
|
|||
input-debounce="0"
|
||||
@update:model-value="updateEmployeeClass"
|
||||
/>
|
||||
</div>
|
||||
<!-- @filter="(inputValue:any,
|
||||
doneFn:Function) => filterSelector(inputValue, doneFn,'employeeTypeOps'
|
||||
) " -->
|
||||
<div class="col-xs-12 col-sm-2">
|
||||
<q-input
|
||||
clearable
|
||||
dense
|
||||
|
|
@ -153,8 +151,6 @@
|
|||
@update:model-value="updateProfileId"
|
||||
type="number"
|
||||
/>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-3">
|
||||
<q-input
|
||||
clearable
|
||||
dense
|
||||
|
|
@ -165,8 +161,6 @@
|
|||
label="ชื่อ-นามสกุล"
|
||||
@update:model-value="updateFullname"
|
||||
/>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-2">
|
||||
<datepicker
|
||||
menu-class-name="modalfix"
|
||||
:model-value="retireYear"
|
||||
|
|
@ -207,8 +201,6 @@
|
|||
</q-input>
|
||||
</template>
|
||||
</datepicker>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-2">
|
||||
<q-input
|
||||
clearable
|
||||
dense
|
||||
|
|
@ -221,12 +213,13 @@
|
|||
@update:model-value="updateGovAge"
|
||||
/>
|
||||
</div>
|
||||
<div class="col-12 row items-center q-col-gutter-md">
|
||||
<div class="col-12 row items-center">
|
||||
<q-toggle
|
||||
dense
|
||||
:model-value="isShowRetire"
|
||||
color="primary"
|
||||
@update:model-value="updateIsShowRetire"
|
||||
class="q-pr-md"
|
||||
>
|
||||
แสดงข้อมูลผู้พ้นจากราชการ
|
||||
</q-toggle>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue