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

Merge branch 'develop'

Browse source
This commit is contained in:
Warunee Tamkoo 2025-05-29 15:30:06 +07:00
commit 1119db1374
37 changed files with 377 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/api/org/api.org.ts
View file

@ -169,6 +169,7 @@ export default {
* workflow
*/
workflow: `${workflow}/`,
commanderPosexe: (type:string)=>`${workflow}/commander-posexe/${type}`,
keycloakLogSSO: `${org}/keycloak/log/sso`,

1
src/interface/Main.ts
View file

@ -12,6 +12,7 @@ interface ProfileData {
citizenId?: string;
salary?: number|null;
birthDate?: string;
keycloakId?: string;
org?: string;
dateStart?: string;
dateRetireLaw?: string;

2
src/modules/02_transfer/views/Main.vue
View file

@ -219,7 +219,7 @@ onMounted(async () => {
debounce="300"
placeholder="ค้นหา"
style="max-width: 200px"
@keydown.enter="onSearch"
@keydown.enter.prevent="onSearch"
>
<template v-slot:append>
<q-icon name="search" />

9
src/modules/03_retire/store.ts
View file

@ -18,11 +18,13 @@ export const useRestDataStore = defineStore("Rest", () => {
case "DONE":
return "ออกคำสั่งเสร็จสิ้น";
case "DONECANCEL":
return "ยกเลิกการลาออก";
return "ยกเลิกการลาออกสำเร็จ";
case "CANCEL":
return "ยกเลิกการลาออก";
return "ยกเลิกการลาออกสำเร็จ";
case "DONEREJECT":
return "ออกคำสั่งยกเลิกลาออกเสร็จแล้ว";
case "CANCELING":
return "กำลังดำเนิดการยกเลิกการ";
default:
return "-";
}
@ -39,9 +41,8 @@ export const useRestDataStore = defineStore("Rest", () => {
}
}
return {
statusText,
convertStatusText
convertStatusText,
};
});

4
src/modules/03_retire/views/DialogRetire.vue
View file

@ -45,8 +45,8 @@ function onSubmit() {
.put(config.API.cancelResignByType(link.value, id.value), {
reason: reason.value,
})
.then(() => {
props.fectData?.(id.value);
.then(async () => {
await props.fectData?.(id.value);
success($q, "ยกเลิกการลาออกสำเร็จ");
})
.catch((err) => {

1
src/modules/03_retire/views/addRetire.vue
View file

@ -303,6 +303,7 @@ onMounted(async () => {
v-if="
dataDetail.statusMain !== 'CANCEL' &&
dataDetail.statusMain !== 'DONECANCEL' &&
dataDetail.statusMain !== 'CANCELING' &&
checkCancleLeave
"
unelevated

1
src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue
View file

@ -160,6 +160,7 @@ function onValidate() {
formData.append("leaveTotal", formDataOrdination.leaveTotal);
formData.append("leaveRange", formDataOrdination.leaveRange);
formData.append("leaveRangeEnd", formDataOrdination.leaveRangeEnd);
formData.append("hajj", "false");
props.onSubmit(formData, isLeave.value);
}
}

1
src/modules/05_leave/components/FormLeave/07_HajjForm.vue
View file

@ -122,6 +122,7 @@ function onValidate() {
formData.append("leaveTotal", formDataHaji.leaveTotal);
formData.append("leaveRange", formDataHaji.leaveRange);
formData.append("leaveRangeEnd", formDataHaji.leaveRangeEnd);
formData.append("hajj", 'true');
props.onSubmit(formData, isLeave.value);
}
}

287
src/modules/05_leave/components/FormLeave/Form.vue
View file

@ -1,13 +1,21 @@
<script setup lang="ts">
import { onMounted } from "vue";
import { onMounted, ref, watch } from "vue";
import http from "@/plugins/http";
import config from "@/app.config";
import { useCounterMixin } from "@/stores/mixin";
import { useLeaveStore } from "@/modules/05_leave/store";
import { useDataStore } from "@/stores/data";
import DialogHeader from "@/components/DialogHeader.vue";
import { useQuasar, type QTableProps } from "quasar";
const mixin = useCounterMixin();
const dataStore = useLeaveStore();
const { date2Thai } = mixin;
const storeData = useDataStore();
const { date2Thai, showLoader, hideLoader, messageError } = mixin;
const modal = ref<boolean>(false);
/** รับ props มาจากหน้าหลัก */
const props = defineProps({
model: {
@ -16,6 +24,110 @@ const props = defineProps({
},
});
const $q = useQuasar();
const isAct = ref<boolean>(false);
const search = ref<string>("");
const total = ref<number>(0);
const totalList = ref<number>(1);
const pagination = ref({
sortBy: "createdAt",
descending: true,
page: 1,
rowsPerPage: 10,
});
const selected = ref<any[]>([]);
const rows = ref<any[]>([]);
const columns = ref<QTableProps["columns"]>([
{
name: "posNo",
align: "left",
label: "เลขที่ตำแหน่ง",
sortable: true,
field: "posNo",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "fullName",
align: "left",
label: "ชื่อ-นามสกุล",
sortable: true,
field: "fullName",
format(val, row) {
return `${row.prefix}${row.firstName} ${row.lastName}`;
},
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "posExecutiveNameOrg",
align: "left",
label: "ตำแหน่งทางการบริหาร",
sortable: true,
field: "posExecutiveNameOrg",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
]);
function onPerson() {
modal.value = true;
getCommander();
}
function onSubmit() {
modal.value = false;
dataStore.dear = selected.value[0].firstName
? `${selected.value[0].prefix}${selected.value[0].firstName} ${selected.value[0].lastName}`
: "";
dataStore.commanderPosition = selected.value[0].posExecutiveNameOrg;
}
function closeDialog() {
modal.value = false;
}
function getCommander() {
showLoader();
http
.put(config.API.commanderPosexe("operate"), {
isAct: isAct.value,
keyword: search.value,
page: pagination.value.page,
pageSize: pagination.value.rowsPerPage,
keycloakId: storeData.formData.keycloakId,
})
.then((res) => {
rows.value = res.data.result.data;
})
.catch((e) => {
messageError($q, e);
hideLoader();
})
.finally(() => {
hideLoader();
});
}
function updatePagination(newPagination: any) {
pagination.value.page = 1;
pagination.value.rowsPerPage = newPagination.rowsPerPage;
}
function getSearch() {
pagination.value.page = 1;
getCommander();
}
watch(
() => pagination.value.rowsPerPage,
async () => {
getSearch();
}
);
/**Hook */
onMounted(() => {
dataStore.typeLeave = "";
@ -24,9 +136,37 @@ onMounted(() => {
<template>
<q-card bordered class="q-pa-md bg-grey-1">
<div class="col-12 row q-pa-sm q-col-gutter-sm items-center">
<q-input
v-model="dataStore.dear"
dense
outlined
bg-color="white"
label="เรียน (ชื่อ - นามสกุล)"
class="col-4"
></q-input>
<q-input
v-model="dataStore.commanderPosition"
dense
outlined
bg-color="white"
label="เรียน (ตำแหน่ง)"
class="col-4"
></q-input>
<div class="col-4">
<q-btn
class="bg-secondary text-white"
icon="add"
unelevated
@click="onPerson"
><q-tooltip>เพิ่มรายชื่อ</q-tooltip></q-btn
>
</div>
</div>
<div class="col-12"><q-separator /></div>
<div class="col-12 row q-pa-sm q-col-gutter-sm">
<datepicker
class="col-12 col-sm-4"
class="col-12 col-sm-6"
menu-class-name="modalfix"
v-model="dataStore.dateSendLeave"
:locale="'th'"
@ -70,7 +210,7 @@ onMounted(() => {
</template>
</datepicker>
<q-input
class="col-12 col-sm-4"
class="col-12 col-sm-6"
dense
bg-color="white"
outlined
@ -78,7 +218,7 @@ onMounted(() => {
v-model="dataStore.typeLeave"
label="เรื่อง"
/>
<q-input
<!-- <q-input
class="col-12 col-sm-4"
dense
outlined
@ -86,7 +226,7 @@ onMounted(() => {
bg-color="white"
v-model="dataStore.commanderPosition"
label="เรียน"
/>
/> -->
<q-input
class="col-12 col-sm-4"
@ -155,4 +295,139 @@ onMounted(() => {
/>
</div>
</q-card>
<q-dialog v-model="modal" persistent>
<q-card class="col-12" style="width: 80%">
<q-form greedy @submit.prevent @validation-success="onSubmit">
<DialogHeader :tittle="`เลือกผู้บังคับบัญชา`" :close="closeDialog" />
<q-separator />
<q-card-section>
<div class="row q-col-gutter-sm">
<div class="col-12">
<div class="row q-col-gutter-md items-start">
<div class="col-12 col-sm-4 col-md-4">
<q-input
v-model="search"
outlined
hide-bottom-space
dense
label="คำค้น"
/>
</div>
<q-checkbox
keep-color
v-model="isAct"
label="แสดงเฉพาะรักษาการแทน"
color="primary"
>
<q-tooltip>แสดงเฉพาะรักษาการแทน </q-tooltip>
</q-checkbox>
<q-space />
<div class="col-12 col-sm-6 col-md-3">
<q-btn
color="primary"
icon="search"
label="ค้นหา"
class="full-width q-pa-sm"
outline
@click.prevent="getCommander"
>
</q-btn>
</div>
</div>
</div>
<div class="col-12">
<d-table
ref="table"
:columns="columns"
:rows="rows"
row-key="key"
flat
bordered
:paging="true"
dense
:rows-per-page-options="[10, 25, 50, 100]"
selection="single"
@update:pagination="updatePagination"
v-model:selected="selected"
>
<template v-slot:pagination="scope">
ทั้งหมด {{ total }} รายการ
<q-pagination
v-model="pagination.page"
active-color="primary"
color="dark"
:max="Number(totalList)"
size="sm"
boundary-links
direction-links
:max-pages="5"
@update:model-value="getSearch"
></q-pagination>
</template>
<template v-slot:header-selection="scope">
<q-checkbox
keep-color
color="primary"
dense
v-model="scope.checkBox"
/>
</template>
<template v-slot:header="props">
<q-tr :props="props">
<q-th auto-width />
<q-th
v-for="col in props.cols"
:key="col.name"
:props="props"
>
<span class="text-weight-medium">{{ col.label }}</span>
</q-th>
</q-tr>
</template>
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<q-td>
<q-checkbox
keep-color
color="primary"
dense
v-model="props.selected"
/>
</q-td>
<q-td
v-for="col in props.cols"
:key="col.name"
:props="props"
>
<div v-if="col.name == 'no'">
{{
(pagination.page - 1) * pagination.rowsPerPage +
props.rowIndex +
1
}}
</div>
<div v-else>
{{ col.value ? col.value : "-" }}
</div>
</q-td>
</q-tr>
</template>
</d-table>
</div>
</div>
</q-card-section>
<q-separator />
<q-card-actions align="right">
<q-btn label="บันทึก" color="secondary" type="submit"
><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
>
</q-card-actions>
</q-form>
</q-card>
</q-dialog>
</template>

2
src/modules/05_leave/store.ts
View file

@ -316,8 +316,6 @@ export const useLeaveStore = defineStore("Leave", () => {
const data = res.data.result;
dateSendLeave.value = data.dateSendLeave;
leaveTypeName.value = data.leaveTypeName;
dear.value = data.dear;
commanderPosition.value = data.commanderPosition;
fullName.value = data.fullName;
positionName.value = data.positionName;
positionLevelName.value = data.positionLevelName;

50
src/modules/05_leave/views/AddPage.vue
View file

@ -36,6 +36,7 @@ const {
showLoader,
hideLoader,
convertDateToAPI,
dialogMessageNotify,
} = mixin;
const model = ref<string>("");
@ -58,29 +59,34 @@ async function fectOptionType() {
function onSubmit(postData: FormData, isLeave: boolean = true) {
if (isLeave) {
dialogConfirm($q, async () => {
showLoader();
if (model.value === "LV-006" || model.value === "LV-008") {
postData.append("leaveSubTypeName", modelSpecific.value);
}
if (postData.get("leaveEndDate") === postData.get("leaveStartDate")) {
postData.set("leaveRangeEnd", postData.get("leaveRange") as string);
}
if (dataStore.commanderPosition !== "" && dataStore.dear !== "") {
dialogConfirm($q, async () => {
showLoader();
if (model.value === "LV-006" || model.value === "LV-008") {
postData.append("leaveSubTypeName", modelSpecific.value);
}
if (postData.get("leaveEndDate") === postData.get("leaveStartDate")) {
postData.set("leaveRangeEnd", postData.get("leaveRange") as string);
}
postData.append("commanderPosition", dataStore.commanderPosition);
postData.append("dear", dataStore.dear);
await http
.post(config.API.leaveUser(), postData)
await http
.post(config.API.leaveUser(), postData)
.then((res) => {
router.push(`/leave/edit/${res.data.result.id}`);
success($q, "บันทึกสำเร็จ");
})
.catch((e: any) => {
messageError($q, e);
})
.finally(() => {
hideLoader();
});
});
.then((res) => {
router.push(`/leave/edit/${res.data.result.id}`);
success($q, "บันทึกสำเร็จ");
})
.catch((e: any) => {
messageError($q, e);
})
.finally(() => {
hideLoader();
});
});
} else {
dialogMessageNotify($q, "กรุณาเพิ่มรายชื่อ ผู้บังคับบัญชา");
}
} else {
messageError($q, "", "ไม่มีสิทธิ์ลา");
}

51
src/modules/05_leave/views/EditPage.vue
View file

@ -38,6 +38,7 @@ const {
success,
date2Thai,
dialogRemove,
dialogMessageNotify,
} = mixin;
const titleName = ref<string>("");
@ -221,27 +222,33 @@ async function fetchDataDetail(id: string) {
*/
function onSubmit(formData: any, isLeave: boolean = true) {
if (isLeave) {
dialogConfirm($q, async () => {
showLoader();
if (model.value === "LV-006" || model.value === "LV-008") {
formData.append("leaveSubTypeName", modelSpecific.value);
}
if (formData.get("leaveEndDate") === formData.get("leaveStartDate")) {
formData.set("leaveRangeEnd", formData.get("leaveRange") as string);
}
await http
.put(config.API.leaveUserId(personalId.value), formData)
.then(async () => {
await fetchDataDetail(personalId.value);
success($q, "บันทึกสำเร็จ");
})
.catch((e: any) => {
messageError($q, e);
})
.finally(() => {
hideLoader();
});
});
if (dataStore.commanderPosition !== "" && dataStore.dear !== "") {
dialogConfirm($q, async () => {
showLoader();
if (model.value === "LV-006" || model.value === "LV-008") {
formData.append("leaveSubTypeName", modelSpecific.value);
}
if (formData.get("leaveEndDate") === formData.get("leaveStartDate")) {
formData.set("leaveRangeEnd", formData.get("leaveRange") as string);
}
formData.append("commanderPosition", dataStore.commanderPosition);
formData.append("dear", dataStore.dear);
await http
.put(config.API.leaveUserId(personalId.value), formData)
.then(async () => {
await fetchDataDetail(personalId.value);
success($q, "บันทึกสำเร็จ");
})
.catch((e: any) => {
messageError($q, e);
})
.finally(() => {
hideLoader();
});
});
} else {
dialogMessageNotify($q, "กรุณาเพิ่มรายชื่อ ผู้บังคับบัญชา");
}
} else {
messageError($q, "", "ไม่มีสิทธิ์ลา");
}
@ -426,7 +433,7 @@ onMounted(async () => {
:on-confirm="onConfirm"
:click-delete="clickDelete"
/>
<HelpWifeBirthForm
<HelpWifeBirthForm5
v-if="model === 'LV-004'"
:data="formData"
:on-submit="onSubmit"

2
src/modules/08_KPI/components/Tab/02_Evaluator.vue
View file

@ -175,7 +175,7 @@ onMounted(() => {
debounce="300"
v-model="filterKeyword"
placeholder="ค้นหา"
@keydown.enter="onSearch"
@keydown.enter.prevent="onSearch"
>
<template v-slot:append>
<q-icon name="search" />

2
src/modules/10_registry/01_Information/02_ChangeName.vue
View file

@ -279,7 +279,7 @@ onMounted(async () => {
v-model="filter"
label="ค้นหา"
style="max-width: 200px"
@keydown.enter="onSearch"
@keydown.enter.prevent="onSearch"
>
<template v-slot:append>
<q-icon name="search" />

2
src/modules/10_registry/01_Information/05_Educations.vue
View file

@ -581,7 +581,7 @@ onMounted(async () => {
v-model="filter"
label="ค้นหา"
style="max-width: 200px"
@keydown.enter="onSearch"
@keydown.enter.prevent="onSearch"
>
<template v-slot:append>
<q-icon name="search" />

2
src/modules/10_registry/01_Information/06_Ability.vue
View file

@ -287,7 +287,7 @@ onMounted(async () => {
v-model="filter"
label="ค้นหา"
style="max-width: 200px"
@keydown.enter="onSearch"
@keydown.enter.prevent="onSearch"
>
<template v-slot:append>
<q-icon name="search" />

2
src/modules/10_registry/02_Government/02_Discipline.vue
View file

@ -215,7 +215,7 @@ onMounted(async () => {
v-model="filter"
label="ค้นหา"
style="max-width: 200px"
@keydown.enter.pervent="onSearch"
@keydown.enter.prevent="onSearch"
>
<template v-slot:append>
<q-icon name="search" />

2
src/modules/10_registry/02_Government/03_Leave.vue
View file

@ -361,7 +361,7 @@ onMounted(async () => {
v-model="filter"
label="ค้นหา"
style="max-width: 200px"
@keydown.enter="onSearch"
@keydown.enter.prevent="onSearch"
>
<template v-slot:append>
<q-icon name="search" />

2
src/modules/10_registry/02_Government/04_Duty.vue
View file

@ -320,7 +320,7 @@ onMounted(async () => {
v-model="filter"
label="ค้นหา"
style="max-width: 200px"
@keydown.enter="onSearch"
@keydown.enter.prevent="onSearch"
>
<template v-slot:append>
<q-icon name="search" />

2
src/modules/10_registry/02_Government/05_Actposition.vue
View file

@ -260,7 +260,7 @@ onMounted(async () => {
v-model="filter"
label="ค้นหา"
style="max-width: 200px"
@keydown.enter="onSearch"
@keydown.enter.prevent="onSearch"
>
<template v-slot:append>
<q-icon name="search" />

2
src/modules/10_registry/02_Government/06_Assistance.vue
View file

@ -337,7 +337,7 @@ onMounted(async () => {
v-model="filter"
label="ค้นหา"
style="max-width: 200px"
@keydown.enter="onSearch"
@keydown.enter.prevent="onSearch"
>
<template v-slot:append>
<q-icon name="search" />

2
src/modules/10_registry/02_Government/07_Position.vue
View file

@ -501,7 +501,7 @@ onMounted(async () => {
v-model="filter"
label="ค้นหา"
style="max-width: 200px"
@keydown.enter="onSearch"
@keydown.enter.prevent="onSearch"
>
<template v-slot:append>
<q-icon name="search" />

2
src/modules/10_registry/03_Salary/01_Salary.vue
View file

@ -703,7 +703,7 @@ onMounted(async () => {
v-model="filter"
label="ค้นหา"
style="max-width: 200px"
@keydown.enter="onSearch"
@keydown.enter.prevent="onSearch"
>
<template v-slot:append>
<q-icon name="search" />

2
src/modules/10_registry/03_Salary/02_Nopaid.vue
View file

@ -301,7 +301,7 @@ onMounted(async () => {
v-model="filter"
label="ค้นหา"
style="max-width: 200px"
@keydown.enter="onSearch"
@keydown.enter.prevent="onSearch"
>
<template v-slot:append>
<q-icon name="search" />

2
src/modules/10_registry/04_Achievement/01_Certificate.vue
View file

@ -302,7 +302,7 @@ onMounted(async () => {
v-model="filter"
label="ค้นหา"
style="max-width: 200px"
@keydown.enter="onSearch"
@keydown.enter.prevent="onSearch"
>
<template v-slot:append>
<q-icon name="search" />

2
src/modules/10_registry/04_Achievement/02_Training.vue
View file

@ -419,7 +419,7 @@ onMounted(async () => {
v-model="filter"
label="ค้นหา"
style="max-width: 200px"
@keydown.enter="onSearch"
@keydown.enter.prevent="onSearch"
>
<template v-slot:append>
<q-icon name="search" />

2
src/modules/10_registry/04_Achievement/03_Insignia.vue
View file

@ -517,7 +517,7 @@ onMounted(async () => {
v-model="filter"
label="ค้นหา"
style="max-width: 200px"
@keydown.enter="onSearch"
@keydown.enter.prevent="onSearch"
>
<template v-slot:append>
<q-icon name="search" />

2
src/modules/10_registry/04_Achievement/04_Honor.vue
View file

@ -301,7 +301,7 @@ onMounted(async () => {
v-model="filter"
label="ค้นหา"
style="max-width: 200px"
@keydown.enter="onSearch"
@keydown.enter.prevent="onSearch"
>
<template v-slot:append>
<q-icon name="search" />

2
src/modules/10_registry/04_Achievement/06_DevelopmentPlan.vue
View file

@ -225,7 +225,7 @@ onMounted(async () => {
v-model="filter"
label="ค้นหา"
style="max-width: 200px"
@keydown.enter="onSearch"
@keydown.enter.prevent="onSearch"
>
<template v-slot:append>
<q-icon name="search" />

2
src/modules/10_registry/05_Other/01_Other.vue
View file

@ -205,7 +205,7 @@ onMounted(async () => {
v-model="filter"
label="ค้นหา"
style="max-width: 200px"
@keydown.enter="onSearch"
@keydown.enter.prevent="onSearch"
>
<template v-slot:append>
<q-icon name="search" />

2
src/modules/10_registry/Dialog/DialogHistory.vue
View file

@ -88,7 +88,7 @@ watch(
dense
v-model="filter"
label="ค้นหา"
@keydown.enter="onSearch"
@keydown.enter.prevent="onSearch"
>
<template v-slot:append>
<q-icon name="search" />

2
src/modules/10_registry/views/requestEditMain.vue
View file

@ -360,7 +360,7 @@ onMounted(async () => {
clearable
dense
label="ค้นหา"
@keydown.enter="updateStatusValue()"
@keydown.enter.prevent="updateStatusValue()"
>
</q-input>
</div>

2
src/modules/11_probation/views/main.vue
View file

@ -301,7 +301,7 @@ onMounted(async () => {
v-model="filter"
label="ค้นหา"
:style="mode ? `max-width: 200px` : `max-width: 150px`"
@keydown.enter="onSearch"
@keydown.enter.prevent="onSearch"
>
<template v-slot:append>
<q-icon name="search" />

2
src/modules/11_probation/views/mainDetail.vue
View file

@ -337,7 +337,7 @@ onMounted(async () => {
v-model="filter"
label="ค้นหา"
:style="mode ? `max-width: 200px` : `max-width: 150px`"
@keydown.enter="onSearch"
@keydown.enter.prevent="onSearch"
>
<template v-slot:append>
<q-icon name="search" />

2
src/modules/13_portfolio/views/Main.vue
View file

@ -173,7 +173,7 @@ onMounted(async () => {
debounce="300"
placeholder="ค้นหา"
style="max-width: 200px"
@keydown.enter="onSearch"
@keydown.enter.prevent="onSearch"
>
<template v-slot:append>
<q-icon name="search" />

2
src/modules/14_IDP/views/main.vue
View file

@ -346,7 +346,7 @@ onMounted(async () => {
outlined
dense
label="ค้นหา"
@keydown.enter="getSerach()"
@keydown.enter.prevent="getSerach()"
style="width: 200px"
>
<template v-slot:append>

2
src/stores/data.ts
View file

@ -28,6 +28,7 @@ export const useDataStore = defineStore("dataMain", () => {
posLevelName: "",
salary: null,
birthDate: "",
keycloakId: "",
posNo: "",
org: "",
dateStart: "",
@ -108,6 +109,7 @@ export const useDataStore = defineStore("dataMain", () => {
formData.lastName = data.lastName;
formData.position = data.position;
formData.salary = data.salary;
formData.keycloakId = data.keycloak;
formData.citizenId = data.citizenId;
formData.birthDate = data.birthDate;
formData.posTypeName = data.posTypeName;