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

Merge branch 'working' into develop

Browse source
This commit is contained in:
Tanyalak 2023-08-16 17:17:59 +07:00
commit a0e3007221
5 changed files with 17 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/modules/04_registry/components/TableProfile.vue
View file

@ -117,17 +117,10 @@
</div>
<q-separator color="blue-1" />
<div class="dialog-card-contain">
<q-card-section class="q-pa-md">
<div class="row col-12 q-col-gutter-sm">
<div
:class="
$q.screen.lt.md
? ' row col-12 q-col-gutter-xs'
: 'no-wrap row col-12 q-col-gutter-xs'
"
>
<q-card-section class="q-pa-sm">
<div class="row col-12 q-col-gutter-xs">
<selector
class="col-3"
class="col-4"
hide-bottom-space
:rules="[(val:string) => !!val || `${'กรุณาเลือก ประเภท'}`]"
outlined
@ -160,7 +153,7 @@
type="number"
/>
<q-input
class="col-2"
class="col-3"
clearable
dense
outlined
@ -187,7 +180,7 @@
}}</template>
<template #trigger>
<q-input
class="inputgreen cursor-pointer q-mb-sm"
class="inputgreen cursor-pointer"
hide-bottom-space
outlined
dense
@ -223,15 +216,6 @@
type="number"
@update:model-value="updateGovAge"
/>
</div>
<div
:class="
$q.screen.lt.md
? ' row col-12 q-col-gutter-xs'
: 'no-wrap row col-12 q-col-gutter-xs'
"
>
<q-input
v-if="employeeClass == 'officer'"
clearable
@ -266,7 +250,7 @@
hide-bottom-space
label="ตำแหน่งทางการบริหาร"
@update:model-value="updatePositionExecutive"
class="col-3"
class="col-4"
/>
<q-input
v-if="employeeClass != 'officer'"
@ -290,7 +274,7 @@
hide-bottom-space
label="ระดับชั้นงาน"
@update:model-value="updateEmployeeLevel"
class="col-3"
class="col-4"
/>
<q-input
clearable
@ -303,14 +287,6 @@
@update:model-value="updatePosNo"
class="col-3"
/>
</div>
<div
:class="
$q.screen.lt.md
? ' row col-12 q-col-gutter-xs'
: 'no-wrap row col-12 q-col-gutter-xs'
"
>
<datepicker
class="col-2"
menu-class-name="modalfix"
@ -372,10 +348,9 @@
hide-bottom-space
label="ประเภทคำสั่ง"
@update:model-value="updateReportType"
class="col-3"
class="col-4"
/>
</div>
<div class="col-12 row items-center">
<q-toggle
dense
:model-value="isShowRetire"
@ -437,7 +412,6 @@
/>
</div>
</div> -->
</div>
</q-card-section>
</div>
</div>

5
src/modules/06_retirement/components/ListRetirement/AddList.vue
View file

@ -239,10 +239,9 @@ const paginationLabel = (start: number, end: number, total: number) => {
>
<q-dialog v-model="modal">
<q-card style="width: 850px; max-width: 80vw" class="q-px-sm q-pb-md">
<q-card style="width: 850px; max-width: 80vw" class="q-pb-md">
<q-toolbar class="q-py-md">
<q-toolbar-title class="header-text text-weight-bolder"
>เพิ่มรายชื่อ
<q-toolbar-title class="text-h6">เพิ่มรายชื่อ
</q-toolbar-title>
<q-btn
icon="close"

2
src/modules/08_registryEmployee/router.ts
View file

@ -22,7 +22,7 @@ export default [
component: Main,
meta: {
Auth: true,
Key: [9],
Key: [11],
Role: "registryEmployee",
},
},

4
src/modules/08_registryEmployee/views/EditDetail.vue
View file

@ -991,12 +991,12 @@ const Retire = async () => {
}
.text-name {
font-size: 1.5em;
font-size: 1.3em;
overflow: hidden;
}
.text-sub {
font-size: 1.5em;
font-size: 1.3em;
overflow: hidden;
color: var(--q-primary);
}

9
src/modules/08_registryEmployee/views/information.vue
View file

@ -11,8 +11,7 @@
:historyClick="clickHistory"
:addEmployee="statusAdd()"
/>
<q-separator />
<q-form ref="myform" class="col-12">
<q-form ref="myform" class="col-12 q-pt-md">
<div class="row col-12 items-center q-col-gutter-x-sm q-col-gutter-y-sm">
<div class="col-xs-6 col-sm-3 col-md-3">
<q-input
@ -346,10 +345,9 @@
) "
/>
</div>
<div class="col-12 q-pt-md q-pb-sm"><q-separator /></div>
</div>
</q-form>
<div class="col-12 q-pt-md q-pb-sm"><q-separator /></div>
<HistoryTable
:rows="rowsHistory"
:columns="columnsHistory"
@ -376,7 +374,7 @@
</q-tr>
</template>
</HistoryTable>
<div class="row col-12 q-pa-sm">
<div class="row col-12">
<q-space />
<q-btn
unelevated
@ -387,7 +385,6 @@
@click="saveData"
/>
</div>
<q-separator />
</q-card>
</template>
<script setup lang="ts">