From a3905a84b6dca638071e839d5cc3c779dd341c51 Mon Sep 17 00:00:00 2001
From: Thanit Konmek <thanit@frappet.com>
Date: Fri, 7 Jul 2023 15:53:30 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=20type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/04_registry/components/Document.vue |  2 +-
 .../components/Information/Information.vue      | 11 +++++++++--
 .../components/OrderPlacement/step/step02.vue   | 13 ++++++++++---
 .../components/OrderPlacement/step/step03.vue   | 17 ++++++++++++-----
 src/modules/08_registryEmployee/views/Main.vue  |  1 -
 5 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/modules/04_registry/components/Document.vue b/src/modules/04_registry/components/Document.vue
index 12d9671b1..0a9e74270 100644
--- a/src/modules/04_registry/components/Document.vue
+++ b/src/modules/04_registry/components/Document.vue
@@ -205,7 +205,7 @@ const defaultAdd = () => {
   if (props.statusAdd) {
     edit.value = props.statusAdd;
     name.value = "";
-    if (uploader.value !== null) {
+    if (uploader.value) {
       uploader.value.reset();
     }
   }
diff --git a/src/modules/04_registry/components/Information/Information.vue b/src/modules/04_registry/components/Information/Information.vue
index a73bf477b..94e30b6b2 100644
--- a/src/modules/04_registry/components/Information/Information.vue
+++ b/src/modules/04_registry/components/Information/Information.vue
@@ -116,7 +116,11 @@
                 lazy-rules
                 :readonly="!edit"
                 :borderless="!edit"
-                :model-value="date2Thai(informaData.birthDate)"
+                :model-value="
+                  informaData.birthDate == null
+                    ? ''
+                    : date2Thai(informaData.birthDate)
+                "
                 :rules="[(val:string) => !!val || `${'กรุณาเลือก วัน/เดือน/ปี เกิด'}`]"
                 :label="`${'วัน/เดือน/ปี เกิด'}`"
               >
@@ -1051,7 +1055,10 @@ const editData = async () => {
     nationality: informaData.value.nationality,
     race: informaData.value.ethnicity,
     religionId: informaData.value.religionId,
-    birthDate: dateToISO(informaData.value.birthDate) ?? dateToISO(new Date()),
+    birthDate:
+      informaData.value.birthDate == null
+        ? dateToISO(new Date())
+        : dateToISO(informaData.value.birthDate),
     bloodGroupId: informaData.value.bloodId,
     relationshipId: informaData.value.statusId,
     telephoneNumber: informaData.value.tel,
diff --git a/src/modules/05_placement/components/OrderPlacement/step/step02.vue b/src/modules/05_placement/components/OrderPlacement/step/step02.vue
index afdb01b09..99ebb26cc 100644
--- a/src/modules/05_placement/components/OrderPlacement/step/step02.vue
+++ b/src/modules/05_placement/components/OrderPlacement/step/step02.vue
@@ -70,7 +70,7 @@
         </template>
 
         <template v-slot:body-selection="scope">
-          <q-checkbox
+          <!-- <q-checkbox
             keep-color
             color="primary"
             dense
@@ -83,6 +83,12 @@
                 );
               }
             "
+          /> -->
+          <q-checkbox
+            keep-color
+            color="primary"
+            dense
+            v-model="scope.selected"
           />
         </template>
 
@@ -175,6 +181,7 @@ import { ref } from "vue";
 import { useQuasar } from "quasar";
 import type { QInput } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
+import type { QTableProps } from "quasar";
 
 const props = defineProps({
   next: {
@@ -197,7 +204,7 @@ const $q = useQuasar();
 const filterRef = ref<QInput>();
 const filter = ref<string>("");
 const visibleColumns = ref<String[]>(["no", "idcard", "name", "educate"]);
-const columns = [
+const columns = ref<QTableProps["columns"]>([
   { name: "no", align: "left", label: "ลำดับ", field: "no", sortable: true },
   {
     name: "idcard",
@@ -220,7 +227,7 @@ const columns = [
     field: "educate",
     sortable: true,
   },
-];
+]);
 
 const rows = [
   {
diff --git a/src/modules/05_placement/components/OrderPlacement/step/step03.vue b/src/modules/05_placement/components/OrderPlacement/step/step03.vue
index 96a1ec94d..4c6568450 100644
--- a/src/modules/05_placement/components/OrderPlacement/step/step03.vue
+++ b/src/modules/05_placement/components/OrderPlacement/step/step03.vue
@@ -270,7 +270,7 @@
                 </template>
 
                 <template v-slot:body-selection="scope">
-                  <q-checkbox
+                  <!-- <q-checkbox
                     keep-color
                     color="primary"
                     dense
@@ -283,6 +283,12 @@
                         );
                       }
                     "
+                  /> -->
+                  <q-checkbox
+                    keep-color
+                    color="primary"
+                    dense
+                    v-model="scope.selected"
                   />
                 </template>
 
@@ -337,6 +343,7 @@ import type { QInput, QForm } from "quasar";
 import type { treeTab } from "@/modules/05_placement/interface/index/Main";
 import http from "@/plugins/http";
 import config from "@/app.config";
+import type { QTableProps } from "quasar";
 
 const props = defineProps({
   next: {
@@ -370,7 +377,7 @@ const selectedModal = ref([]);
 const test = ref([]);
 const filterModal = ref<string>("");
 const visibleColumnsModal = ref<String[]>(["no", "idcard", "name"]);
-const columnsModal = [
+const columnsModal = ref<QTableProps["columns"]>([
   { name: "no", align: "left", label: "ลำดับ", field: "no", sortable: true },
   {
     name: "idcard",
@@ -386,7 +393,7 @@ const columnsModal = [
     field: "name",
     sortable: true,
   },
-];
+]);
 
 const rowsModal = [
   {
@@ -482,7 +489,7 @@ const visibleColumns = ref<String[]>([
   "agency",
   "send",
 ]);
-const columns = [
+const columns = ref<QTableProps["columns"]>([
   { name: "no", align: "left", label: "ลำดับ", field: "no", sortable: true },
   {
     name: "idcard",
@@ -519,7 +526,7 @@ const columns = [
     field: "send",
     sortable: true,
   },
-];
+]);
 
 const rows = ref([
   {
diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue
index 271f6f2df..fd930f818 100644
--- a/src/modules/08_registryEmployee/views/Main.vue
+++ b/src/modules/08_registryEmployee/views/Main.vue
@@ -166,7 +166,6 @@
 </template>
 <script setup lang="ts">
 import { ref, onMounted } from "vue";
-import router from "@/router";
 import { useQuasar } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import type { QInput, QForm } from "quasar";