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

รายการช่วยราชการ ส่งตัวกลับ ย้าย

Browse source
This commit is contained in:
setthawutttty 2023-08-15 17:21:26 +07:00
parent 314d7113bf
commit 077f12a34d
8 changed files with 290 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/api/05_placement/api.placement.ts
View file

@ -115,6 +115,7 @@ export default {
officerDetail: (id:string) => `${placement}/officer/${id}`,
officerMainDelete: (id:string) => `${placement}/officer/${id}`,
officerMainReport: () => `${placement}/officer/report`,
officerMainEdit: (id:string) => `${placemenHelpGov}/${id}`,
// ส่งตัวกลับ
placemenRepatriation,
@ -122,12 +123,15 @@ export default {
repatriationDetail: (id:string) => `${placement}/repatriation/${id}`,
repatriationMainDelete: (id:string) => `${placement}/repatriation/${id}`,
repatriationMainReport: () => `${placement}/repatriation/report`,
repatriationMainEdit: (id:string) => `${placemenRepatriation}/${id}`,
// ขอย้าย
placemenRelocation,
relocationMain: () => `${placement}/relocation`,
relocationDetail: (id:string) => `${placement}/relocation/${id}`,
relocationMainDelete: (id:string) => `${placement}/relocation/${id}`,
relocationMainReport: () => `${placement}/relocation/report`,
relocationMainPut: (id:string) => `${placement}/relocation/position/${id}`,
relocationMainEdit: (id:string) => `${placemenRelocation}/${id}`,
// อื่นๆ
placemenOther,
};

16
src/modules/05_placement/components/Relocation/RelocationMain.vue
View file

@ -23,13 +23,7 @@ const checkSelected = computed(() => {
return true;
}
});
const getSelectedString = computed(() => {
return selected.value.length === 0
? ''
: `${selected.value.length} record${
selected.value.length > 1 ? 's' : ''
} selected of ${rows.value.length}`;
});
const $q = useQuasar();
const router = useRouter();
const mixin = useCounterMixin();
@ -283,7 +277,6 @@ const openModalOrder = () => {
const openModalTree = (id: string) => {
personalId.value = id;
console.log(personalId.value);
personal.value = rows.value.filter((e: any) => e.id === id);
modalTree.value = true;
};
@ -645,7 +638,7 @@ onMounted(async () => {
:columns="columns2"
:rows="rows2"
:filter="filterKeyword2"
row-key="personalId"
row-key="id"
flat
:visible-columns="visibleColumns2"
selection="multiple"
@ -664,7 +657,6 @@ onMounted(async () => {
<q-tr :props="props" class="cursor-pointer">
<q-td>
<q-checkbox
:key="props.id"
keep-color
color="primary"
dense
@ -712,12 +704,12 @@ onMounted(async () => {
</q-card-actions>
</q-card>
</q-dialog>
<!-- <DialogOrgTree
<DialogOrgTree
v-model:modal="modalTree"
:close="closeModalTree"
:personal="personal"
:personalId="personalId"
/> -->
/>
<!-- :personalId="personalId" -->
</template>
<style scoped lang="scss"></style>

2
src/modules/05_placement/components/Relocation/RelocationModal.vue
View file

@ -178,7 +178,7 @@ const saveAppoint = async () => {
console.log("save appoint===>", dataAppoint);
showLoader();
await http
.put(config.API.receivePosition(id.value), dataAppoint)
.put(config.API.relocationMainPut(id.value), dataAppoint)
.then((res) => {
console.log("respone=>", res);
success($q, "บันทึกสำเร็จ");

523
src/modules/05_placement/components/Relocation/RelocationbyId.vue
View file

@ -37,19 +37,31 @@ const institution = ref<string>("ฝ่ายบริหารงานทั
const fullname = ref<string>("");
const id = ref<string>("");
const prefix = ref<string>("");
const firstName = ref<string>("");
const lastName = ref<string>("");
const prefixId = ref<string>("");
const firstname = ref<string>("");
const citizenId = ref<string>("")
const lastname = ref<string>("");
const position = ref<string>("");
const posNo = ref<string>("");
const positionLevel = ref<string>("");
const educationOld = ref<string>("");
const createdAt = ref<string>("");
const organization = ref<string>("");
const reason = ref<string>("");
const status = ref<string>("");
const date = ref<Date | null>(null);
const salary = ref<string>("");
const salaryNew = ref<string>("");
const positionTypeOld = ref<string>("");
const positionLevelOld = ref<string>("");
const dateOfBirth = ref<Date>()
const genderId = ref<string>("")
const nationality = ref<string>("")
const race = ref<string>("")
const religionId = ref<string>("")
const bloodGroupId = ref<string>("")
const relationshipId = ref<string>("")
const telephoneNumber = ref<string>("")
const positionNumberOld = ref<string>("");
const organizationPositionOld = ref<string>("");
const isActive = ref<string>("");
@ -104,10 +116,13 @@ const getData = async () => {
.get(config.API.relocationDetail(personId))
.then((res: any) => {
const data = res.data.result;
fullname.value = `${data.firstname} ${data.lastname}`
citizenId.value = data.citizenId
fullname.value = `${data.prefix}${data.firstname} ${data.lastname}`;
prefixId.value = data.prefixId;
prefix.value = data.prefix;
firstName.value = data.firstname;
lastName.value = data.lastname;
firstname.value = data.firstname;
lastname.value = data.lastname;
educationOld.value = data.educationOld;
position.value = data.position;
posNo.value = data.posNo;
positionLevel.value = data.positionLevel;
@ -121,6 +136,14 @@ const getData = async () => {
positionLevelOld.value = data.positionLevelOld;
positionNumberOld.value = data.positionNumberOld;
organizationPositionOld.value = data.organizationPositionOld;
dateOfBirth.value = data.dateOfBirth;
genderId.value = data.genderId;
nationality.value = data.nationality;
race.value = data.race;
religionId.value = data.religionId;
bloodGroupId.value = data.bloodGroupId;
relationshipId.value = data.relationshipId;
telephoneNumber.value = data.telephoneNumber;
isActive.value = data.isActive;
})
.catch((e) => {
@ -157,18 +180,29 @@ const conditionSave = async () => {
};
const saveData = async () => {
const body = {
organization: organization.value,
educationOld: educationOld.value,
prefixId:prefixId.value,
citizenId:citizenId.value,
firstname:firstname.value,
lastname:lastname.value,
reason: reason.value,
organizationPositionOld: organizationPositionOld.value,
date: date.value,
positionTypeOld: positionTypeOld.value,
positionLevelOld: positionLevelOld.value,
positionNumberOld: posNo.value,
positionNumberOld: positionNumberOld.value,
amountOld: salary.value,
dateOfBirth:dateOfBirth.value ,
genderId:genderId.value ,
nationality:nationality.value ,
race:race.value ,
religionId:religionId.value ,
bloodGroupId:bloodGroupId.value ,
relationshipId:relationshipId.value ,
telephoneNumber:telephoneNumber.value ,
};
showLoader();
await http
.put(config.API.transferId(personId.toString()), body)
.put(config.API.relocationMainEdit(personId.toString()), body)
.then((res: any) => {
// const data = res.data.result;
// console.log(data);
@ -218,199 +252,219 @@ onMounted(async () => {
});
</script>
<template>
<div class="toptitle text-dark col-12 row items-center">
<div class="toptitle text-dark col-12 row items-center">
<q-btn
icon="mdi-arrow-left"
unelevated
round
dense
flat
color="primary"
class="q-mr-sm"
@click="router.go(-1)"
/>
รายละเอียดการย้าย {{ fullname }}
</div>
<q-card bordered class="row col-12 text-dark">
<div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
<div class="q-pl-sm text-weight-bold text-subtitle2">{{ fullname }}</div>
<q-space />
<q-btn
icon="mdi-arrow-left"
unelevated
round
outline
color="blue"
dense
flat
color="primary"
class="q-mr-sm"
@click="router.go(-1)"
icon-right="mdi-open-in-new"
class="q-px-sm"
label="ดูข้อมูลทะเบียนประวัติ"
@click="router.push(`/registry/${personId}`)"
/>
รายละเอียดการส่งตัวกลับ {{ fullname }}
</div>
<q-card bordered class="row col-12 text-dark">
<div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
<div class="q-pl-sm text-weight-bold text-subtitle2">{{ fullname }}</div>
<q-space />
<div class="col-12"><q-separator /></div>
<div class="row col-12 q-pa-md">
<div class="col-12 row bg-white q-col-gutter-md">
<div class="col-xs-3 col-sm-2 col-md-1 row">
<q-img src="@/assets/avatar_user.jpg" />
</div>
<div class="col-xs-6 col-sm-3 row items-center">
<div class="col-12 q-pl-md">
<div class="col-12 text-top">ตำแหน่งในสายงาน</div>
<div class="col-12 text-detail">
{{ positionTypeOld }}
</div>
</div>
</div>
<div class="col-xs-6 col-sm-3 row items-center">
<div class="col-12">
<div class="col-12 text-top">ระดับ</div>
<div class="col-12 text-detail">
{{ positionLevelOld }}
</div>
</div>
</div>
<div class="col-xs-6 col-sm-3 row items-center">
<div class="col-12">
<div class="col-12 text-top">สังกัด</div>
<div class="col-12 text-detail">
{{ organizationPositionOld }}
</div>
</div>
</div>
</div>
</div>
</q-card>
<q-card bordered class="row col-12 text-dark q-mt-sm">
<div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
<div class="q-pl-sm text-weight-bold text-dark">
แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย
</div>
<q-space />
<div class="q-gutter-sm" v-if="!edit">
<q-btn
outline
color="blue"
color="primary"
dense
icon-right="mdi-open-in-new"
icon-right="mdi-file-edit-outline"
class="q-px-sm"
label="ดูข้อมูลทะเบียนประวัติ"
@click="router.push(`/registry/${personId}`)"
label="แก้ไข"
style="width: 80px"
@click="edit = !edit"
/>
</div>
<div class="col-12"><q-separator /></div>
<div class="q-gutter-sm" v-else>
<q-btn
outline
color="public"
dense
class="q-px-sm"
label="บันทึก"
style="width: 80px"
@click="conditionSave"
/>
<q-btn
outline
color="red"
dense
class="q-px-sm"
label="ยกเลิก"
style="width: 80px"
@click="edit = !edit"
/>
</div>
</div>
<div class="col-12"><q-separator /></div>
<q-form ref="myForm">
<div class="row col-12 q-pa-md">
<div class="col-12 row bg-white q-col-gutter-md">
<div class="col-xs-3 col-sm-2 col-md-1 row">
<q-img src="@/assets/avatar_user.jpg" />
</div>
<div class="col-xs-6 col-sm-3 row items-center">
<div class="col-12 q-pl-md">
<div class="col-12 text-top">ตำแหน่งในสายงาน</div>
<div class="col-12 text-detail">
{{ positionTypeOld }}
</div>
</div>
</div>
<div class="col-xs-6 col-sm-3 row items-center">
<div class="col-12">
<div class="col-12 text-top">ระดับ</div>
<div class="col-12 text-detail">
{{ positionLevelOld }}
</div>
</div>
</div>
<div class="col-xs-6 col-sm-3 row items-center">
<div class="col-12">
<div class="col-12 text-top">สังกัด</div>
<div class="col-12 text-detail">
{{ organizationPositionOld }}
</div>
</div>
</div>
</div>
</div>
</q-card>
<q-card bordered class="row col-12 text-dark q-mt-sm">
<div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
<div class="q-pl-sm text-weight-bold text-dark">
แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย
</div>
<q-space />
<div class="q-gutter-sm" v-if="!edit">
<q-btn
outline
color="primary"
dense
icon-right="mdi-file-edit-outline"
class="q-px-sm"
label="แก้ไข"
style="width: 80px"
@click="edit = !edit"
/>
</div>
<div class="q-gutter-sm" v-else>
<q-btn
outline
color="public"
dense
class="q-px-sm"
label="บันทึก"
style="width: 80px"
@click="conditionSave"
/>
<q-btn
outline
color="red"
dense
class="q-px-sm"
label="ยกเลิก"
style="width: 80px"
@click="edit = !edit"
/>
</div>
</div>
<div class="col-12"><q-separator /></div>
<q-form ref="myForm">
<div class="row col-12 q-pa-md">
<div class="col-12 row bg-white q-col-gutter-md">
<div class="col-xs-12 row items-center">
<div class="col-12">
<div class="text-weight-bold text-grey">
ตำแหน่งและหน่วยงานเดิม
<div class="text-weight-bold text-grey">วุฒิการศึกษา</div>
<div class="col-12">
<q-input
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:readonly="!edit"
:borderless="!edit"
v-model="educationOld"
:rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
hide-bottom-space
:label="`${'วุฒิ/สาขา'}`"
/>
</div>
</div>
<div class="col-12">
<q-input
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:readonly="!edit"
:borderless="!edit"
v-model="organizationPositionOld"
:rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง/สังกัด'}`]"
hide-bottom-space
:label="`${'ตำแหน่ง/สังกัด'}`"
type="textarea"
/>
<div class="col-xs-12 row items-center">
<div class="col-12 q-pb-sm"><q-separator /></div>
<div class="col-12">
<div class="text-weight-bold text-grey">
ตำแหน่งและหน่วยงานเดิม
</div>
</div>
<div class="col-xs-6 col-sm-3 row items-center">
<div class="col-12">
<q-input
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:readonly="!edit"
:borderless="!edit"
v-model="positionTypeOld"
:rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
hide-bottom-space
:label="`${'ตำแหน่งประเภท'}`"
/>
</div>
<div class="col-12">
<q-input
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:readonly="!edit"
:borderless="!edit"
v-model="organizationPositionOld"
:rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง/สังกัด'}`]"
hide-bottom-space
:label="`${'ตำแหน่ง/สังกัด'}`"
type="textarea"
/>
</div>
<div class="col-xs-6 col-sm-3 row items-center">
<div class="col-12">
<q-input
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:readonly="!edit"
:borderless="!edit"
v-model="positionLevelOld"
:rules="[(val) => !!val || `${'กรุณากรอกระดับ'}`]"
hide-bottom-space
:label="`${'ระดับ'}`"
/>
</div>
</div>
<div class="col-xs-6 col-sm-3 row items-center">
<div class="col-12">
<q-input
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:readonly="!edit"
:borderless="!edit"
v-model="positionTypeOld"
:rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
hide-bottom-space
:label="`${'ตำแหน่งประเภท'}`"
/>
</div>
<div class="col-xs-6 col-sm-3 row items-center">
<div class="col-12">
<q-input
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:readonly="!edit"
:borderless="!edit"
v-model="posNo"
:rules="[(val) => !!val || `${'กรุณากรอกเลขที่'}`]"
hide-bottom-space
:label="`${'เลขที่'}`"
/>
</div>
</div>
<div class="col-xs-6 col-sm-3 row items-center">
<div class="col-12">
<q-input
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:readonly="!edit"
:borderless="!edit"
v-model="positionLevelOld"
:rules="[(val) => !!val || `${'กรุณากรอกระดับ'}`]"
hide-bottom-space
:label="`${'ระดับ'}`"
/>
</div>
<div class="col-xs-6 col-sm-3 row items-center">
<div class="col-12">
<q-input
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:readonly="!edit"
:borderless="!edit"
v-model="salary"
:rules="[(val) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
hide-bottom-space
:label="`${'เงินเดือน'}`"
type="number"
/>
</div>
</div>
<div class="col-xs-6 col-sm-3 row items-center">
<div class="col-12">
<q-input
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:readonly="!edit"
:borderless="!edit"
v-model="positionNumberOld"
:rules="[(val) => !!val || `${'กรุณากรอกเลขที่'}`]"
hide-bottom-space
:label="`${'เลขที่'}`"
/>
</div>
<div class="col-12"><q-separator /></div>
<div class="col-xs-6 col-sm-6 row items-center">
</div>
<div class="col-xs-6 col-sm-3 row items-center">
<div class="col-12">
<q-input
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:readonly="!edit"
:borderless="!edit"
v-model="salary"
:rules="[(val) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
hide-bottom-space
:label="`${'เงินเดือน'}`"
type="number"
/>
</div>
</div>
<div class="col-12"><q-separator /></div>
<!-- <div class="col-xs-6 col-sm-6 row items-center">
<div class="col-12">
<q-input
:class="getClass(edit)"
@ -425,50 +479,10 @@ onMounted(async () => {
:label="`${'โอนไปสังกัด'}`"
/>
</div>
</div>
<div class="col-xs-6 col-sm-6 row items-center">
<div class="col-12">
<datepicker
menu-class-name="modalfix"
:readonly="!edit"
v-model="date"
:locale="'th'"
autoApply
:enableTimePicker="false"
week-start="0"
>
<template #year="{ year }">{{ year + 543 }}</template>
<template #year-overlay-value="{ value }">{{
parseInt(value + 543)
}}</template>
<template #trigger>
<q-input
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date !== null ? date2Thai(date) : null"
:rules="[(val) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`]"
hide-bottom-space
:label="`${'ตั้งแต่วัน'}`"
>
<template v-slot:prepend>
<q-icon
name="event"
class="cursor-pointer"
:style="
edit
? 'color: var(--q-primary)'
: 'color: var(--q-grey)'
"
>
</q-icon>
</template>
</q-input>
</template>
</datepicker>
</div>
</div> -->
<div class="col-xs-6 col-sm-3 row items-center">
<div class="text-weight-bold text-grey col-12">
เงินเดือนตำแหน่งและหน่วยงานที่รับโอน
</div>
<div class="col-12">
<q-input
@ -478,31 +492,46 @@ onMounted(async () => {
lazy-rules
:readonly="!edit"
:borderless="!edit"
v-model="reason"
:rules="[(val) => !!val || `${'กรุณากรอกหมายเหตุ '}`]"
v-model="salaryNew"
:rules="[(val) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
hide-bottom-space
:label="`${'หมายเหตุ '}`"
type="textarea"
:label="`${'เงินเดือน'}`"
type="number"
/>
</div>
</div>
<div class="col-12">
<q-input
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:readonly="!edit"
:borderless="!edit"
v-model="reason"
:rules="[(val) => !!val || `${'กรุณากรอกหมายเหตุ '}`]"
hide-bottom-space
:label="`${'หมายเหตุ '}`"
type="textarea"
/>
</div>
</div>
</q-form>
</q-card>
</template>
</div>
</q-form>
</q-card>
</template>
<style lang="scss" scope>
.q-img {
border-radius: 5px;
height: 70px;
}
.text-top {
color: gray;
font-weight: 400;
padding-bottom: 3px;
}
.text-detail {
font-weight: 500;
}
</style>
<style lang="scss" scope>
.q-img {
border-radius: 5px;
height: 70px;
}
.text-top {
color: gray;
font-weight: 400;
padding-bottom: 3px;
}
.text-detail {
font-weight: 500;
}
</style>

2
src/modules/05_placement/components/Repatriate/RepatriateMain.vue
View file

@ -534,7 +534,7 @@ onMounted(async () => {
:columns="columns2"
:rows="rows2"
:filter="filterKeyword2"
row-key="personalId"
row-key="id"
class="custom-header-table"
:visible-columns="visibleColumns2"
selection="multiple"

3
src/modules/05_placement/components/Repatriate/RepatriatebyId.vue
View file

@ -439,10 +439,11 @@
positionLevelOld: positionLevelOld.value,
positionNumberOld: posNo.value,
amountOld: salary.value,
};
showLoader();
await http
.put(config.API.transferId(personId.toString()), body)
.put(config.API.repatriationMainEdit(personId.toString()), body)
.then((res: any) => {
// const data = res.data.result;
// console.log(data);

2
src/modules/05_placement/components/helpgovernment/governmentDetail.vue
View file

@ -442,7 +442,7 @@ const saveData = async () => {
};
showLoader();
await http
.put(config.API.transferId(personId.toString()), body)
.put(config.API.officerMainEdit(personId.toString()), body)
.then((res: any) => {
// const data = res.data.result;
// console.log(data);

2
src/modules/05_placement/components/helpgovernment/mainHelp.vue
View file

@ -534,7 +534,7 @@ onMounted(async () => {
:columns="columns2"
:rows="rows2"
:filter="filterKeyword2"
row-key="personalId"
row-key="id"
class="custom-header-table"
:visible-columns="visibleColumns2"
selection="multiple"