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

แก้ ที่อยู่ รับโอน component ทะเบียนบ้างส่วนประวัติ

Browse source
This commit is contained in:
Thanit Konmek 2023-08-03 14:49:17 +07:00
parent e64b68c017
commit 8c1a5d9b23
17 changed files with 5864 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/03_recruiting/views/03_editor/index.vue
View file

@ -1062,7 +1062,7 @@ const fetchProvince = async () => {
};
const fetchDistrict = async (id: string | null) => {
if (id !== null) {
if (id !== null && id != "") {
loaderPage(true);
await http
.get(config.API.listDistrict(id))
@ -1084,7 +1084,7 @@ const fetchDistrict = async (id: string | null) => {
};
const fetchSubDistrict = async (id: string | null) => {
if (id !== null) {
if (id !== null && id != "") {
loaderPage(true);
await http
.get(config.API.listSubDistrict(id))

6
src/modules/04_registry/components/Information/Address.vue
View file

@ -626,8 +626,6 @@ const getNewData = async () => {
await fetchDistrict(addressData.value.provinceIdC, "2");
await fetchSubDistrict(addressData.value.districtId, "1");
await fetchSubDistrict(addressData.value.districtIdC, "2");
await selectSubDistrict(addressData.value.subdistrictId, "1");
await selectSubDistrict(addressData.value.subdistrictIdC, "2");
};
const fetchData = async () => {
@ -797,7 +795,7 @@ const fetchProvince = async () => {
};
const fetchDistrict = async (id: string | null, position: string) => {
if (id != null) {
if (id != null && id != "") {
loaderPage(true);
await http
.get(config.API.listDistrict(id))
@ -825,7 +823,7 @@ const fetchDistrict = async (id: string | null, position: string) => {
};
const fetchSubDistrict = async (id: string | null, position: string) => {
if (id != null) {
if (id != null && id != "") {
loaderPage(true);
await http
.get(config.API.listSubDistrict(id))

4
src/modules/04_registry/components/Profile.vue
View file

@ -155,10 +155,6 @@
<q-space />
<q-btn round flat color="pink-5" icon="mdi-file-document">
<!-- <q-tooltip>{{
reasonStatus ? "การกลับเข้ารับราชการ" : "การออกจากราชการ"
}}</q-tooltip> -->
<q-menu transition-show="jump-down" transition-hide="jump-up">
<q-list dense style="min-width: 160px">
<q-item clickable v-close-popup @click="clickPassaway">

6
src/modules/05_placement/components/PersonalDetail/Information/Address.vue
View file

@ -123,8 +123,6 @@ const getNewData = async () => {
await fetchDistrict(addressData.value.currentProvinceId, "2");
await fetchSubDistrict(addressData.value.registDistrictId, "1");
await fetchSubDistrict(addressData.value.currentDistrictId, "2");
await selectSubDistrict(addressData.value.registSubDistrictId, "1");
await selectSubDistrict(addressData.value.currentSubDistrictId, "2");
};
const editData = async () => {
@ -247,7 +245,7 @@ const fetchProvince = async () => {
};
const fetchDistrict = async (id: string | null, position: string) => {
if (id != null) {
if (id != null && id != "") {
showLoader();
await http
.get(config.API.listDistrict(id))
@ -275,7 +273,7 @@ const fetchDistrict = async (id: string | null, position: string) => {
};
const fetchSubDistrict = async (id: string | null, position: string) => {
if (id != null) {
if (id != null && id != "") {
showLoader();
await http
.get(config.API.listSubDistrict(id))

39
src/modules/05_placement/components/Receive/receiveDetail.vue Normal file
View file

@ -0,0 +1,39 @@
<template>
<div class="col-12 row">
<div class="row col-12" style="padding-top: 80px">
<div id="information" name="1" class="row col-12 information">
<Information v-model:statusEdit="statusEdit" :statusAdd="false" />
</div>
<div id="government" name="16" class="row col-12 q-mt-md">
<Government v-model:statusEdit="statusEdit" :statusAdd="false" />
</div>
<div id="address" name="17" class="row col-12 q-mt-md">
<Address v-model:statusEdit="statusEdit" :statusAdd="false" />
</div>
<div id="family" name="18" class="row col-12 q-mt-md">
<Family v-model:statusEdit="statusEdit" :statusAdd="false" />
</div>
<div id="certicate" name="15" class="row col-12 q-mt-md">
<Certicate />
</div>
</div>
<Image />
</div>
</template>
<script setup lang="ts">
import { ref } from "vue";
import Image from "@/components/information/Image.vue";
import Information from "@/components/information/Information.vue";
import Government from "@/components/information/Government.vue";
import Address from "@/components/information/Address.vue";
import Family from "@/components/information/Family.vue";
import Certicate from "@/components/information/Certicate.vue";
const statusEdit = ref<boolean>(false);
</script>
<style lang="scss" scoped>
.information:target {
padding-top: 84px;
}
</style>
>

46
src/modules/05_placement/components/Receive/receiveMain.vue
View file

@ -292,6 +292,10 @@ const closeModalTree = async () => {
// await getTable();
modalTree.value = false;
};
const nextPage = (id: string) => {
router.push(`/receive/${id}`);
};
</script>
<template>
<div class="toptitle text-dark col-12 row items-center">รายการรับโอน</div>
@ -367,25 +371,53 @@ const closeModalTree = async () => {
</template>
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<q-td key="no" :props="props">
<q-td
key="no"
:props="props"
@click="nextPage(props.row.personalId)"
>
{{ props.rowIndex + 1 }}
</q-td>
<q-td key="fullname" :props="props">
<q-td
key="fullname"
:props="props"
@click="nextPage(props.row.personalId)"
>
{{ props.row.fullname }}
</q-td>
<q-td key="position" :props="props">
<q-td
key="position"
:props="props"
@click="nextPage(props.row.personalId)"
>
{{ props.row.position }}
</q-td>
<q-td key="positionLevel" :props="props">
<q-td
key="positionLevel"
:props="props"
@click="nextPage(props.row.personalId)"
>
{{ props.row.positionLevel }}
</q-td>
<q-td key="oc" :props="props">
<q-td
key="oc"
:props="props"
@click="nextPage(props.row.personalId)"
>
{{ props.row.oc }}
</q-td>
<q-td key="agency" :props="props">
<q-td
key="agency"
:props="props"
@click="nextPage(props.row.personalId)"
>
{{ props.row.agency }}
</q-td>
<q-td key="status" :props="props">
<q-td
key="status"
:props="props"
@click="nextPage(props.row.personalId)"
>
{{ props.row.status }}
</q-td>
<q-td auto-width>

13
src/modules/05_placement/router.ts
View file

@ -50,6 +50,9 @@ const RepatriationOrderAdd = () =>
const receiveMain = () =>
import("@/modules/05_placement/components/Receive/receiveMain.vue");
const receiveDetail = () =>
import("@/modules/05_placement/components/Receive/receiveDetail.vue");
export default [
{
path: "/placement",
@ -221,4 +224,14 @@ export default [
Role: "placement",
},
},
{
path: "/receive/:id",
name: "receiveDetail",
component: receiveDetail,
meta: {
Auth: true,
Key: [6.3],
Role: "placement",
},
},
];

6
src/modules/08_registryEmployee/views/Information/Address.vue
View file

@ -626,8 +626,6 @@ const getNewData = async () => {
await fetchDistrict(addressData.value.provinceIdC, "2");
await fetchSubDistrict(addressData.value.districtId, "1");
await fetchSubDistrict(addressData.value.districtIdC, "2");
await selectSubDistrict(addressData.value.subdistrictId, "1");
await selectSubDistrict(addressData.value.subdistrictIdC, "2");
};
const fetchData = async () => {
@ -797,7 +795,7 @@ const fetchProvince = async () => {
};
const fetchDistrict = async (id: string | null, position: string) => {
if (id != null) {
if (id != null && id != "") {
loaderPage(true);
await http
.get(config.API.listDistrict(id))
@ -825,7 +823,7 @@ const fetchDistrict = async (id: string | null, position: string) => {
};
const fetchSubDistrict = async (id: string | null, position: string) => {
if (id != null) {
if (id != null && id != "") {
loaderPage(true);
await http
.get(config.API.listSubDistrict(id))