Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me

src/modules/08_registryEmployee/router.ts

@@ -47,7 +47,7 @@ export default [
     },
   },
   {
-    path: "/registryEmployee/edit/:Id",
+    path: "/registryEmployee/edit/:id",
     name: "registryEmployeeEdit",
     component: EditDetail,
     meta: {

src/modules/08_registryEmployee/views/EditDetail.vue

@@ -137,11 +137,9 @@
         <div class="row items-center text-dark q-ml-md">
           <div class="column">
             <div class="text-bold q-pb-xs text-name">
-              {{ "แก้ไข้ข้อมูลทะเบียนประวัติลูกจ้างชั่วคราว" }}
-            </div>
-            <div class="text-bold q-pb-xs text-sub">
-              {{ "ลูกจ้างชั่วคราว" }}
+              {{ fullname }}{{ leaveReason }}
             </div>
+            <div>{{ position }}</div>
           </div>
         </div>
         <q-space />

src/modules/08_registryEmployee/views/Main.vue

@@ -231,7 +231,7 @@
                     <q-item
                       clickable
                       v-close-popup
-                      @click="clickDelete('test')"
+                      @click="clickDelete(props.row.id)"
                     >
                       <q-item-section
                         style="min-width: 0px"
@@ -1354,8 +1354,8 @@ const clickAdd = () => {
 };
 
 // ดูรายการแก้ไขรายชื่อ
-const redirectToPage = (profileId?: string) => {
-  router.push(`/registryEmployee/edit/${profileId}`);
+const redirectToPage = (id?: string) => {
+  router.push(`/registryEmployee/edit/${id}`);
 };
 const editDetail = async (row: any) => {
   await getPosition(row.id);
@@ -1429,7 +1429,7 @@ const showEmployeeTemp = async () => {
   if (selected.value == null || selected.value == "") return;
   showLoader();
   await http
-    .post(config.API.searchProfileByOcId(selected.value, "all"), {
+    .post(config.API.searchProfileTemp("all"), {
       criterias: cirteria,
     })
     .then((res) => {
@@ -1489,7 +1489,7 @@ const showEmployeeTempOrder = async () => {
   if (selected.value == null || selected.value == "") return;
   showLoader();
   await http
-    .post(config.API.searchProfileByOcId(selected.value, "all"), {
+    .post(config.API.searchProfileTemp("all"), {
       criterias: cirteria,
     })
     .then((res) => {

src/modules/08_registryEmployee/views/information.vue

@@ -117,7 +117,11 @@
                 lazy-rules
                 :readonly="!edit"
                 :borderless="!edit"
-                :model-value="date2Thai(informaData.birthDate)"
+                :model-value="
+                  informaData.birthDate == null
+                    ? null
+                    : date2Thai(informaData.birthDate)
+                "
                 :rules="[(val:string) => !!val || `${'กรุณาเลือก วัน/เดือน/ปี เกิด'}`]"
                 :label="`${'วัน/เดือน/ปี เกิด'}`"
               >
@@ -692,7 +696,7 @@ const defaultAdd = () => {
     prefixId: null,
     firstname: null,
     lastname: null,
-    birthDate: new Date(),
+    birthDate: null,
     genderId: null,
     bloodId: null,
     nationality: null,