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

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
STW_TTTY\stwtt 2024-05-15 12:53:58 +07:00
commit df0d9f9131
2 changed files with 68 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

69
src/modules/04_registryNew/components/detail/GovernmentInformation/01_Info.vue
View file

@ -406,7 +406,8 @@ function getData() {
formMain.containDate = data.dateAppoint; formMain.containDate = data.dateAppoint;
formMain.workDate = data.dateStart; formMain.workDate = data.dateStart;
formMain.reasonSameDate = data.reasonSameDate; formMain.reasonSameDate = data.reasonSameDate;
formMain.retireDate = data.retireDate; formMain.retireDate = data.dateRetire;
formMain.dateRetireLaw = data.dateRetireLaw;
formMain.ageAll = data.govAge; formMain.ageAll = data.govAge;
formMain.absent = data.govAgeAbsent; formMain.absent = data.govAgeAbsent;
formMain.age = data.govAgePlus; formMain.age = data.govAgePlus;
@ -440,7 +441,8 @@ function getDataHistory() {
positionExecutiveSide: e.positionExecutiveSide, positionExecutiveSide: e.positionExecutiveSide,
dateAppoint: new Date(e.dateAppoint), dateAppoint: new Date(e.dateAppoint),
dateStart: new Date(e.dateStart), dateStart: new Date(e.dateStart),
retireDate: e.retireDate, dateRetire: e.dateRetire,
dateRetireLaw: e.dateRetireLaw,
govAge: e.govAge, govAge: e.govAge,
govAgeAbsent: e.govAgeAbsent, govAgeAbsent: e.govAgeAbsent,
govAgePlus: e.govAgePlus, govAgePlus: e.govAgePlus,
@ -454,7 +456,7 @@ function getDataHistory() {
}) })
.catch((e) => { .catch((e) => {
messageError($q, e); messageError($q, e);
modalHistory.value = false modalHistory.value = false;
}) })
.finally(() => { .finally(() => {
hideLoader(); hideLoader();
@ -508,12 +510,12 @@ onMounted(() => {
v-for="(field, index) in Object.keys(fieldLabels).slice(0, 5)" v-for="(field, index) in Object.keys(fieldLabels).slice(0, 5)"
:key="index" :key="index"
> >
<div class="col-12 col-sm-12 col-md-4"> <div class="col-12 col-sm-12 col-md-5">
<span class="text-grey-6 text-weight-medium">{{ <span class="text-grey-6 text-weight-medium">{{
fieldLabels[field as keyof typeof fieldLabels] fieldLabels[field as keyof typeof fieldLabels]
}}</span> }}</span>
</div> </div>
<div class="col-12 col-sm-12 col-md-8"> <div class="col-12 col-sm-12 col-md-7">
<span>{{ formMain[field] ? formMain[field] : "-" }}</span> <span>{{ formMain[field] ? formMain[field] : "-" }}</span>
</div> </div>
</div> </div>
@ -524,12 +526,12 @@ onMounted(() => {
v-for="(field, index) in Object.keys(fieldLabels).slice(5, 9)" v-for="(field, index) in Object.keys(fieldLabels).slice(5, 9)"
:key="index" :key="index"
> >
<div class="col-12 col-sm-12 col-md-4"> <div class="col-12 col-sm-12 col-md-5">
<span class="text-grey-6 text-weight-medium">{{ <span class="text-grey-6 text-weight-medium">{{
fieldLabels[field as keyof typeof fieldLabels] fieldLabels[field as keyof typeof fieldLabels]
}}</span> }}</span>
</div> </div>
<div class="col-12 col-sm-12 col-md-8"> <div class="col-12 col-sm-12 col-md-7">
<span>{{ formMain[field] ? formMain[field] : "-" }}</span> <span>{{ formMain[field] ? formMain[field] : "-" }}</span>
</div> </div>
</div> </div>
@ -540,12 +542,12 @@ onMounted(() => {
<div class="col-12 col-sm-6 col-md-6 q-gutter-y-sm"> <div class="col-12 col-sm-6 col-md-6 q-gutter-y-sm">
<div class="col-12 col-sm-6 col-md-6"> <div class="col-12 col-sm-6 col-md-6">
<div class="row"> <div class="row">
<div class="col-12 col-sm-12 col-md-4"> <div class="col-12 col-sm-12 col-md-5">
<span class="text-grey-6 text-weight-medium" <span class="text-grey-6 text-weight-medium"
>วันที่สั่งบรรจุ</span >วันที่สั่งบรรจุ</span
> >
</div> </div>
<div class="col-12 col-sm-12 col-md-8"> <div class="col-12 col-sm-12 col-md-7">
<span>{{ <span>{{
formMain.containDate ? date2Thai(formMain.containDate) : "-" formMain.containDate ? date2Thai(formMain.containDate) : "-"
}}</span> }}</span>
@ -554,12 +556,12 @@ onMounted(() => {
</div> </div>
<div class="col-12 col-sm-6 col-md-6"> <div class="col-12 col-sm-6 col-md-6">
<div class="row"> <div class="row">
<div class="col-12 col-sm-12 col-md-4"> <div class="col-12 col-sm-12 col-md-5">
<span class="text-grey-6 text-weight-medium" <span class="text-grey-6 text-weight-medium"
>วันที่เริ่มปฏิบัติราชการ</span >วันที่เริ่มปฏิบัติราชการ</span
> >
</div> </div>
<div class="col-12 col-sm-12 col-md-8"> <div class="col-12 col-sm-12 col-md-7">
<span>{{ <span>{{
formMain.workDate !== null formMain.workDate !== null
? date2Thai(formMain.workDate as Date) ? date2Thai(formMain.workDate as Date)
@ -573,12 +575,12 @@ onMounted(() => {
class="col-12 col-sm-6 col-md-6" class="col-12 col-sm-6 col-md-6"
> >
<div class="row"> <div class="row">
<div class="col-12 col-sm-12 col-md-4"> <div class="col-12 col-sm-12 col-md-5">
<span class="text-grey-6 text-weight-medium" <span class="text-grey-6 text-weight-medium"
>เหตุผลที่วันที่ไม่ตรงกัน</span >เหตุผลที่วันที่ไม่ตรงกัน</span
> >
</div> </div>
<div class="col-12 col-sm-12 col-md-8"> <div class="col-12 col-sm-12 col-md-7">
<span>{{ <span>{{
formMain.reasonSameDate !== "" ? formMain.reasonSameDate : "-" formMain.reasonSameDate !== "" ? formMain.reasonSameDate : "-"
}}</span> }}</span>
@ -587,26 +589,29 @@ onMounted(() => {
</div> </div>
<div class="col-12 col-sm-6 col-md-6"> <div class="col-12 col-sm-6 col-md-6">
<div class="row"> <div class="row">
<div class="col-12 col-sm-12 col-md-4"> <div class="col-12 col-sm-12 col-md-5">
<span class="text-grey-6 text-weight-medium">วันเกษียณอายุ</span> <span class="text-grey-6 text-weight-medium"
>วันครบเกษียณอายุ</span
>
</div> </div>
<div class="col-12 col-sm-12 col-md-8"> <div class="col-12 col-sm-12 col-md-7">
<span>{{ <span>{{
formMain.retireDate formMain.dateRetire
? date2Thai(formMain.retireDate as Date) ? date2Thai(formMain.dateRetire as Date)
: "-" : "-"
}}</span> }}</span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-12 col-sm-6 col-md-6 q-gutter-y-sm"> <div class="col-12 col-sm-6 col-md-6 q-gutter-y-sm">
<div class="col-12 col-sm-6 col-md-6"> <div class="col-12 col-sm-6 col-md-6">
<div class="row"> <div class="row">
<div class="col-12 col-sm-12 col-md-4"> <div class="col-12 col-sm-12 col-md-5">
<span class="text-grey-6 text-weight-medium">อายุราชการ</span> <span class="text-grey-6 text-weight-medium">อายุราชการ</span>
</div> </div>
<div class="col-12 col-sm-12 col-md-8"> <div class="col-12 col-sm-12 col-md-7">
<span>{{ <span>{{
formMain.ageAll formMain.ageAll
? `${formMain.ageAll.day} วัน ${formMain.ageAll.month} เดือน ${formMain.ageAll.year} ปี` ? `${formMain.ageAll.day} วัน ${formMain.ageAll.month} เดือน ${formMain.ageAll.year} ปี`
@ -617,26 +622,42 @@ onMounted(() => {
</div> </div>
<div class="col-12 col-sm-6 col-md-6"> <div class="col-12 col-sm-6 col-md-6">
<div class="row"> <div class="row">
<div class="col-12 col-sm-12 col-md-4"> <div class="col-12 col-sm-12 col-md-5">
<span class="text-grey-6 text-weight-medium">ขาดราชการ</span> <span class="text-grey-6 text-weight-medium">ขาดราชการ</span>
</div> </div>
<div class="col-12 col-sm-12 col-md-8"> <div class="col-12 col-sm-12 col-md-7">
<span>{{ formMain.absent ? formMain.absent : 0 }}</span> <span>{{ formMain.absent ? formMain.absent : 0 }}</span>
</div> </div>
</div> </div>
</div> </div>
<div class="col-12 col-sm-6 col-md-6"> <div class="col-12 col-sm-6 col-md-6">
<div class="row"> <div class="row">
<div class="col-12 col-sm-12 col-md-4"> <div class="col-12 col-sm-12 col-md-5">
<span class="text-grey-6 text-weight-medium" <span class="text-grey-6 text-weight-medium"
>อายุราชการเกื้อกูล</span >อายุราชการเกื้อกูล</span
> >
</div> </div>
<div class="col-12 col-sm-12 col-md-8"> <div class="col-12 col-sm-12 col-md-7">
<span>{{ formMain.age ? formMain.age : 0 }}</span> <span>{{ formMain.age ? formMain.age : 0 }}</span>
</div> </div>
</div> </div>
</div> </div>
<div class="col-12 col-sm-6 col-md-6">
<div class="row">
<div class="col-12 col-sm-12 col-md-5">
<span class="text-grey-6 text-weight-medium"
>วันที่เกษียณอายุราชการตามกฏหมาย</span
>
</div>
<div class="col-12 col-sm-12 col-md-7">
<span>{{
formMain.dateRetireLaw
? date2Thai(formMain.dateRetireLaw as Date)
: "-"
}}</span>
</div>
</div>
</div>
</div> </div>
</div> </div>
</q-card> </q-card>

45
src/modules/04_registryNew/interface/index/government.ts
View file

@ -1,27 +1,27 @@
interface FormMain { interface FormMain {
ocId: string ocId: string;
positionId: string positionId: string;
positionLine: string positionLine: string;
positionLevel: string positionLevel: string;
numberId: string numberId: string;
positionExecutive: string positionExecutive: string;
positionExecutiveSide: string positionExecutiveSide: string;
positionType: string positionType: string;
positionPathSide: string positionPathSide: string;
containDate: any containDate: any;
workDate: any workDate: any;
reasonSameDate: string reasonSameDate: string;
retireDate: any retireDate: any;
ageAll: GovAgeForm ageAll: GovAgeForm;
absent: number absent: number;
age: number age: number;
[key: string]: any; [key: string]: any;
} }
interface GovAgeForm { interface GovAgeForm {
year: number, year: number;
month: number, month: number;
day: number day: number;
} }
interface MyObjectRef { interface MyObjectRef {
@ -32,8 +32,8 @@ interface MyObjectRef {
} }
interface RequestItemsHistoryObject { interface RequestItemsHistoryObject {
lastUpdatedAt: Date, lastUpdatedAt: Date;
lastUpdateFullName: string, lastUpdateFullName: string;
oc: string | null; oc: string | null;
position: string | null; position: string | null;
positionPathSide: string | null; positionPathSide: string | null;
@ -45,7 +45,8 @@ interface RequestItemsHistoryObject {
positionExecutiveSide: string | null; positionExecutiveSide: string | null;
dateAppoint: Date; dateAppoint: Date;
dateStart: Date; dateStart: Date;
retireDate: string | null; dateRetire: string | null;
dateRetireLaw: string | null;
govAge: string | null; govAge: string | null;
govAgeAbsent: string | null; govAgeAbsent: string | null;
govAgePlus: string | null; govAgePlus: string | null;