diff --git a/src/modules/04_registry/components/profileType.ts b/src/modules/04_registry/components/profileType.ts
index ab3b28b22..4ee2b6521 100644
--- a/src/modules/04_registry/components/profileType.ts
+++ b/src/modules/04_registry/components/profileType.ts
@@ -148,6 +148,19 @@ const defaultInformation: Information = {
profileType: null,
};
+const defaultTempInformation: any = {
+ employeeMoneyIncrease: null,
+ employeeMoneyAllowance: null,
+ employeeMoneyEmployee: null,
+ employeeMoneyEmployer: null,
+ positionEmployeeGroupId: null,
+ positionEmployeePositionId: null,
+ positionEmployeeLineId: null,
+ employeeTypeIndividual: null,
+ employeeOc: null,
+ employeeWage: null,
+};
+
const defaultFamily: Family = {
prefixC: null,
prefixIdC: null,
@@ -175,7 +188,13 @@ const defaultFamily: Family = {
childrens: [],
};
-export { defaultInformation, defaultFamily, defaultAddress, defaultGoverment };
+export {
+ defaultInformation,
+ defaultFamily,
+ defaultAddress,
+ defaultGoverment,
+ defaultTempInformation,
+};
export type {
ChangeActive,
Information,
diff --git a/src/modules/08_registryEmployee/views/Information/Tempinformation.vue b/src/modules/08_registryEmployee/views/Information/Tempinformation.vue
index 252825413..fdf3dcc25 100644
--- a/src/modules/08_registryEmployee/views/Information/Tempinformation.vue
+++ b/src/modules/08_registryEmployee/views/Information/Tempinformation.vue
@@ -22,7 +22,7 @@
lazy-rules
:readonly="!edit"
:borderless="!edit"
- v-model="positionEmployeeGroupId"
+ v-model="informaTempData.positionEmployeeGroupId"
:label="`${'กลุ่มงาน'}`"
@update:modelValue="!edit"
emit-value
@@ -44,7 +44,7 @@
lazy-rules
:readonly="!edit"
:borderless="!edit"
- v-model="positionEmployeeLineId"
+ v-model="informaTempData.positionEmployeeLineId"
:label="`${'สายงาน'}`"
@update:modelValue="!edit"
emit-value
@@ -66,7 +66,7 @@
lazy-rules
:readonly="!edit"
:borderless="!edit"
- v-model="positionEmployeePositionId"
+ v-model="informaTempData.positionEmployeePositionId"
:label="`${'ชื่อตำแหน่งทางสายงาน'}`"
@update:modelValue="!edit"
emit-value
@@ -89,7 +89,7 @@
lazy-rules
:readonly="!edit"
:borderless="!edit"
- v-model="employeeOc"
+ v-model="informaTempData.employeeOc"
:style="!edit ? '' : 'padding:0 12px;'"
:label="`${'สังกัด'}`"
/>
@@ -104,14 +104,14 @@
lazy-rules
:readonly="!edit"
:borderless="!edit"
- v-model="employeeTypeIndividual"
+ v-model="informaTempData.employeeTypeIndividual"
:style="!edit ? '' : 'padding:0 12px;'"
:label="`${'ประเภทบุคคล'}`"
/>
console.log("not function"),
+ },
statusAdd: {
type: Boolean,
default: false,
@@ -254,6 +252,8 @@ const employeeMoneyIncrease = ref(0);
const employeeMoneyAllowance = ref(0);
const employeeMoneyEmployee = ref(0);
const employeeMoneyEmployer = ref(0);
+
+const informaTempData = ref(defaultTempInformation);
const rowsHistory = ref([]); //select data history
const tittleHistory = ref("ประวัติแก้ไขข้อมูลที่อยู่"); //
const filterHistory = ref(""); //search data table history
@@ -403,8 +403,6 @@ const visibleColumnsHistory = ref([
"employeeTypeIndividual",
"employeeOc",
"employeeWage",
- "createdFullName",
- "createdAt",
]);
onMounted(async () => {
@@ -471,28 +469,49 @@ const fetchData = async () => {
await http
.get(config.API.profileEmployeeTempId(route.params.id.toString()))
.then((res) => {
+ // const data: any = res.data.result;
+ // rows.value = [];
+ // data.map((e: any) => {
+ // rows.value.push({
+ // employeeMoneyIncrease: e.employeeMoneyIncrease,
+ // employeeMoneyAllowance: e.employeeMoneyAllowance,
+ // employeeMoneyEmployee: e.employeeMoneyEmployee,
+ // employeeMoneyEmployer: e.employeeMoneyEmployer,
+ // positionEmployeeGroupId: e.positionEmployeeGroupId,
+ // positionEmployeePositionId: e.positionEmployeePositionId,
+ // positionEmployeeLineId: e.positionEmployeeLineId,
+ // employeeTypeIndividual: e.employeeTypeIndividual,
+ // employeeOc: e.employeeOc,
+ // employeeWage: e.employeeWage,
+ // });
+ // console.log(res);
+ // });
const data: any = res.data.result;
- rows.value = [];
- data.map((e: any) => {
- rows.value.push({
- EmployeeMoneyIncrease: e.employeeMoneyIncrease,
- EmployeeMoneyAllowance: e.employeeMoneyAllowance,
- EmployeeMoneyEmployee: e.employeeMoneyEmployee,
- EmployeeMoneyEmployer: e.employeeMoneyEmployer,
- PositionEmployeeGroupId: e.positionEmployeeGroupId,
- PositionEmployeePositionId: e.positionEmployeePositionId,
- PositionEmployeeLineId: e.positionEmployeeLineId,
- EmployeeTypeIndividual: e.employeeTypeIndividual,
- EmployeeOc: e.employeeOc,
- EmployeeWage: e.employeeWage,
- });
- });
+ informaTempData.value.employeeMoneyIncrease =
+ data.employeeMoneyIncrease;
+ informaTempData.value.employeeMoneyAllowance =
+ data.employeeMoneyAllowance;
+ informaTempData.value.employeeMoneyEmployee =
+ data.employeeMoneyEmployee;
+ informaTempData.value.employeeMoneyEmployer =
+ data.employeeMoneyEmployer;
+ informaTempData.value.positionEmployeeGroupId =
+ data.positionEmployeeGroupId;
+ informaTempData.value.positionEmployeePositionId =
+ data.positionEmployeePositionId;
+ informaTempData.value.positionEmployeeLineId =
+ data.positionEmployeeLineId;
+ informaTempData.value.employeeTypeIndividual =
+ data.employeeTypeIndividual;
+ informaTempData.value.employeeOc = data.employeeOc;
+ informaTempData.value.employeeWage = data.employeeWage;
})
.catch((e) => {
messageError($q, e);
})
- .finally(() => {
+ .finally(async () => {
hideLoader();
+ await props.fetchDataProfile();
});
}
};
@@ -553,16 +572,17 @@ const fetchPositionEmployeePosition = async () => {
const editData = async () => {
const body: any = {
- employeeMoneyIncrease: employeeMoneyIncrease.value,
- employeeMoneyAllowance: employeeMoneyAllowance.value,
- employeeMoneyEmployee: employeeMoneyEmployee.value,
- employeeMoneyEmployer: employeeMoneyEmployer.value,
- positionEmployeeGroupId: positionEmployeeGroupId.value,
- positionEmployeePositionId: positionEmployeePositionId.value,
- positionEmployeeLineId: positionEmployeeLineId.value,
- employeeTypeIndividual: employeeTypeIndividual.value,
- employeeOc: employeeOc.value,
- employeeWage: employeeWage.value,
+ employeeMoneyIncrease: informaTempData.value.employeeMoneyIncrease,
+ employeeMoneyAllowance: informaTempData.value.employeeMoneyAllowance,
+ employeeMoneyEmployee: informaTempData.value.employeeMoneyEmployee,
+ employeeMoneyEmployer: informaTempData.value.employeeMoneyEmployer,
+ positionEmployeeGroupId: informaTempData.value.positionEmployeeGroupId,
+ positionEmployeePositionId:
+ informaTempData.value.positionEmployeePositionId,
+ positionEmployeeLineId: informaTempData.value.positionEmployeeLineId,
+ employeeTypeIndividual: informaTempData.value.employeeTypeIndividual,
+ employeeOc: informaTempData.value.employeeOc,
+ employeeWage: informaTempData.value.employeeWage,
};
showLoader();
await http