From 47ce78e31c6e7717c1e440aa06873e5c0bae243a Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Thu, 19 Oct 2023 17:10:40 +0700
Subject: [PATCH] update layout & remove no

---
 .../6_BasicInformation/Director/Form.vue      | 43 ++++++++++---------
 .../6_BasicInformation/Director/MainPage.vue  | 15 +++----
 .../interface/response/director.ts            |  1 -
 3 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
index 00f82acc0..54d3bbbed 100644
--- a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
+++ b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
@@ -30,7 +30,7 @@ const formData = reactive<FormData>({
 });
 
 watch(props.data, async () => {
-  console.log("data==>", props.data)
+  // console.log("data==>", props.data)
   formData.prefix = props.data.prefix
   formData.firstname = props.data.firstname
   formData.lastname = props.data.lastname
@@ -88,45 +88,46 @@ function onValidate() {
       <q-card bordered>
 
         <div class="row q-pa-md q-col-gutter-sm">
-          <div class="col-md-3 row q-pa-md text-bold">
+          <div class="col-3 row q-pa-md text-bold">
             <label>ค้นหาบุคคลากรที่อยู่ในระบบ</label>
           </div>
-          <div class="col-md-6">
-            <q-input dense outlined v-model="idCard" label="รหัสบัตรประชาชน" ref="idCardRef"
+          <div class="col-6">
+            <q-input dense outlined v-model="idCard" label="รหัสบัตรประชาชน" ref="idCardRef" for="idCardRef"
               :rules="[(val: string) => !!val || `${'กรุณากรอกรหัสบัตรประชาชน'}`]" />
           </div>
-          <div class="col-md-2">
-            <q-btn unelevated dense color="primary" class="q-px-md q-py-sm" @click="addEmployee" label="เพิ่มบุคลากร" />
+          <div class="col-2">
+            <q-btn unelevated dense color="primary" class="q-px-md q-py-sm" @click="addEmployee" label="เพิ่มบุคลากร"
+              id="addCustomer" />
           </div>
         </div>
 
         <div class="row q-px-md q-col-gutter-sm">
-          <div class="col-md-3">
-            <q-input dense outlined v-model="formData.prefix" label="คำนำหน้า" ref="prefixRef"
+          <div class="col-3">
+            <q-input dense outlined v-model="formData.prefix" label="คำนำหน้า" ref="prefixRef" for="prefixRef"
               :rules="[(val: string) => val !== null && val !== '' || `${'กรุณากรอกคำนำหน้า'}`]" />
           </div>
-          <div class="col-md-3">
-            <q-input dense outlined v-model="formData.firstname" label="ชื่อ" ref="firstnameRef"
+          <div class="col-3">
+            <q-input dense outlined v-model="formData.firstname" label="ชื่อ" ref="firstnameRef" for="firstnameRef"
               :rules="[(val: string) => val !== null && val !== '' || `${'กรุณากรอกชื่อ'}`]" />
           </div>
-          <div class="col-md-3">
-            <q-input dense outlined v-model="formData.lastname" label="นามสกุล" ref="lastnameRef"
+          <div class="col-3">
+            <q-input dense outlined v-model="formData.lastname" label="นามสกุล" ref="lastnameRef" for="lastnameRef"
               :rules="[(val: string) => !!val || `${'กรุณากรอกนามสกุล'}`]" />
           </div>
-          <div class="col-md-3">
-            <q-input dense outlined v-model="formData.position" label="ตำแหน่ง" ref="positionRef"
+          <div class="col-3">
+            <q-input dense outlined v-model="formData.position" label="ตำแหน่ง" ref="positionRef" for="positionRef"
               :rules="[(val: string) => !!val || `${'กรุณากรอกตำแหน่ง'}`]" />
           </div>
-          <div class="col-md-3">
-            <q-input dense outlined v-model="formData.phone" label="เบอร์โทร" ref="phoneRef"
+          <div class="col-3">
+            <q-input dense outlined v-model="formData.phone" label="เบอร์โทร" ref="phoneRef" for="phoneRef"
               :rules="[(val: string) => !!val || `${'กรุณากรอกเบอร์โทร'}`]" />
           </div>
-          <div class="col-md-3">
+          <div class="col-3">
             <q-input dense outlined v-model="formData.responsibilities" label="หน้าที่" ref="responsibilitiesRef"
-              :rules="[(val: string) => !!val || `${'กรุณากรอกหน้าที่'}`]" />
+              for="responsibilitiesRef" :rules="[(val: string) => !!val || `${'กรุณากรอกหน้าที่'}`]" />
           </div>
-          <div class="col-md-3">
-            <q-input dense outlined v-model="formData.email" label="อีเมล" ref="emailRef"
+          <div class="col-3">
+            <q-input dense outlined v-model="formData.email" label="อีเมล" ref="emailRef" for="emailRef"
               :rules="[(val: string) => !!val || `${'กรุณากรอกอีเมล'}`]" />
           </div>
         </div>
@@ -134,7 +135,7 @@ function onValidate() {
         <q-separator />
         <div class="row col-12 q-pa-sm">
           <q-space />
-          <q-btn type="submit" flat round color="public" icon="mdi-content-save-outline">
+          <q-btn type="submit" flat round color="public" icon="mdi-content-save-outline" id="formSubmit">
             <q-tooltip>บันทึกข้อมูล</q-tooltip>
           </q-btn>
         </div>
diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue
index 8135d00a3..670372a62 100644
--- a/src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue
+++ b/src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue
@@ -13,8 +13,6 @@ const $q = useQuasar();
 const dataStore = useDisciplineDirectorDataStore()
 const mixin = useCounterMixin();
 const {
-  date2Thai,
-  success,
   messageError,
   showLoader,
   hideLoader,
@@ -26,7 +24,6 @@ onMounted(() => {
   // get ข้อมูลแล้วโยนใส่ store
   dataStore.fetchData([
     {
-      no: 1,
       name: "นางเกสินี เจียรสุมัย",
       position: "ครู",
       responsibilities: "ประธาน",
@@ -34,7 +31,6 @@ onMounted(() => {
       phone: "0800808080",
     },
     {
-      no: 2,
       name: "นายสรวิชญ์ พลสิทธิ์",
       position: "ทดลองงาน",
       responsibilities: "เลขานุการ",
@@ -123,11 +119,12 @@ function clickDelete(id: string) {
           </template>
           <template v-slot:body="props">
             <q-tr :props="props" class="cursor-pointer">
-              <q-td v-for="col in props.cols" :key="col.name" :props="props" @click="$router.push(`/discipline/director/${props.row.no}`)">
-                <!-- <div v-if="col.name == 'phone'">
-                      {{ props.rowIndex + 1 }}
-                    </div> -->
-                <div>
+              <q-td v-for="col in props.cols" :key="col.name" :props="props"
+                @click="$router.push(`/discipline/director/${props.row.no}`)">
+                <div v-if="col.name == 'no'">
+                  {{ props.rowIndex + 1 }}
+                </div>
+                <div v-else>
                   {{ col.value }}
                 </div>
               </q-td>
diff --git a/src/modules/11_discipline/interface/response/director.ts b/src/modules/11_discipline/interface/response/director.ts
index 33d3e6a37..d967fede6 100644
--- a/src/modules/11_discipline/interface/response/director.ts
+++ b/src/modules/11_discipline/interface/response/director.ts
@@ -1,5 +1,4 @@
 interface DirectorRows {
-    no: number;
     name: string;
     position: string;
     responsibilities: string;