แก้ไข get เเละ put temp-information

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,

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="`${'ประเภทบุคคล'}`"
           />
         </div>
         <div class="col-xs-6 col-sm-3 col-md-3">
           <CurrencyInput
-            v-model="employeeWage"
+            v-model="informaTempData.employeeWage"
             :edit="edit"
             :options="{
               currency: 'THB',
@@ -121,7 +121,7 @@
         </div>
         <div class="col-xs-6 col-sm-3 col-md-3">
           <CurrencyInput
-            v-model="employeeMoneyIncrease"
+            v-model="informaTempData.employeeMoneyIncrease"
             :edit="edit"
             :options="{
               currency: 'THB',
@@ -131,7 +131,7 @@
         </div>
         <div class="col-xs-6 col-sm-3 col-md-3">
           <CurrencyInput
-            v-model="employeeMoneyAllowance"
+            v-model="informaTempData.employeeMoneyAllowance"
             :edit="edit"
             :options="{
               currency: 'THB',
@@ -141,7 +141,7 @@
         </div>
         <div class="col-xs-6 col-sm-3 col-md-3">
           <CurrencyInput
-            v-model="employeeMoneyEmployee"
+            v-model="informaTempData.employeeMoneyEmployee"
             :edit="edit"
             :options="{
               currency: 'THB',
@@ -151,7 +151,7 @@
         </div>
         <div class="col-xs-6 col-sm-3 col-md-3">
           <CurrencyInput
-            v-model="employeeMoneyEmployer"
+            v-model="informaTempData.employeeMoneyEmployer"
             :edit="edit"
             :options="{
               currency: 'THB',
@@ -199,17 +199,11 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
-import type {
+import type { DataOption } from "@/modules/04_registry/components/profileType";
-  Address,
+import { defaultTempInformation } from "@/modules/04_registry/components/profileType";
-  DataOption,
-  zipCodeOption,
-} from "@/modules/04_registry/components/profileType";
-import { defaultAddress } from "@/modules/04_registry/components/profileType";
 import HeaderTop from "@/modules/04_registry/components/Information/top.vue";
-import type { ResponseObject } from "@/modules/04_registry/interface/response/Address";
 import HistoryTable from "@/components/TableHistory.vue";
 import { useRoute } from "vue-router";
-import type { AddressOps } from "@/modules/04_registry/interface/index/Main";
 import type { QTableProps } from "quasar";
 import CurrencyInput from "@/components/CurruncyInput.vue";
 
@@ -218,6 +212,10 @@ const props = defineProps({
     type: Boolean,
     required: true,
   },
+  fetchDataProfile: {
+    type: Function,
+    default: () => console.log("not function"),
+  },
   statusAdd: {
     type: Boolean,
     default: false,
@@ -254,6 +252,8 @@ const employeeMoneyIncrease = ref<number>(0);
 const employeeMoneyAllowance = ref<number>(0);
 const employeeMoneyEmployee = ref<number>(0);
 const employeeMoneyEmployer = ref<number>(0);
+
+const informaTempData = ref<any>(defaultTempInformation);
 const rowsHistory = ref<any[]>([]); //select data history
 const tittleHistory = ref<string>("ประวัติแก้ไขข้อมูลที่อยู่"); //
 const filterHistory = ref<string>(""); //search data table history
@@ -403,8 +403,6 @@ const visibleColumnsHistory = ref<String[]>([
   "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 = [];
+        informaTempData.value.employeeMoneyIncrease =
-        data.map((e: any) => {
+          data.employeeMoneyIncrease;
-          rows.value.push({
+        informaTempData.value.employeeMoneyAllowance =
-            EmployeeMoneyIncrease: e.employeeMoneyIncrease,
+          data.employeeMoneyAllowance;
-            EmployeeMoneyAllowance: e.employeeMoneyAllowance,
+        informaTempData.value.employeeMoneyEmployee =
-            EmployeeMoneyEmployee: e.employeeMoneyEmployee,
+          data.employeeMoneyEmployee;
-            EmployeeMoneyEmployer: e.employeeMoneyEmployer,
+        informaTempData.value.employeeMoneyEmployer =
-            PositionEmployeeGroupId: e.positionEmployeeGroupId,
+          data.employeeMoneyEmployer;
-            PositionEmployeePositionId: e.positionEmployeePositionId,
+        informaTempData.value.positionEmployeeGroupId =
-            PositionEmployeeLineId: e.positionEmployeeLineId,
+          data.positionEmployeeGroupId;
-            EmployeeTypeIndividual: e.employeeTypeIndividual,
+        informaTempData.value.positionEmployeePositionId =
-            EmployeeOc: e.employeeOc,
+          data.positionEmployeePositionId;
-            EmployeeWage: e.employeeWage,
+        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,
+    employeeMoneyIncrease: informaTempData.value.employeeMoneyIncrease,
-    employeeMoneyAllowance: employeeMoneyAllowance.value,
+    employeeMoneyAllowance: informaTempData.value.employeeMoneyAllowance,
-    employeeMoneyEmployee: employeeMoneyEmployee.value,
+    employeeMoneyEmployee: informaTempData.value.employeeMoneyEmployee,
-    employeeMoneyEmployer: employeeMoneyEmployer.value,
+    employeeMoneyEmployer: informaTempData.value.employeeMoneyEmployer,
-    positionEmployeeGroupId: positionEmployeeGroupId.value,
+    positionEmployeeGroupId: informaTempData.value.positionEmployeeGroupId,
-    positionEmployeePositionId: positionEmployeePositionId.value,
+    positionEmployeePositionId:
-    positionEmployeeLineId: positionEmployeeLineId.value,
+      informaTempData.value.positionEmployeePositionId,
-    employeeTypeIndividual: employeeTypeIndividual.value,
+    positionEmployeeLineId: informaTempData.value.positionEmployeeLineId,
-    employeeOc: employeeOc.value,
+    employeeTypeIndividual: informaTempData.value.employeeTypeIndividual,
-    employeeWage: employeeWage.value,
+    employeeOc: informaTempData.value.employeeOc,
+    employeeWage: informaTempData.value.employeeWage,
   };
   showLoader();
   await http