Merge branch 'warunee-dev' into develop

# Conflicts:
#	src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue

src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue

@@ -33,14 +33,14 @@ const formData = reactive<FormData>({
 });
 
 watch(props.data, async () => {
-  console.log("data==>", props.data);
+  // console.log("data==>", props.data)
-  formData.prefix = props.data.prefix;
+  formData.prefix = props.data.prefix
-  formData.firstname = props.data.firstname;
+  formData.firstname = props.data.firstname
-  formData.lastname = props.data.lastname;
+  formData.lastname = props.data.lastname
-  formData.position = props.data.position;
+  formData.position = props.data.position
-  formData.phone = props.data.phone;
+  formData.phone = props.data.phone
-  formData.responsibilities = props.data.responsibilities;
+  formData.responsibilities = props.data.responsibilities
-  formData.email = props.data.email;
+  formData.email = props.data.email
 });
 
 // เพิ่มบุคลากร
@@ -89,114 +89,54 @@ function onValidate() {
     <div class="col-12">
       <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">
+          <div class="col-6">
-            <q-input
+            <q-input dense outlined v-model="idCard" label="รหัสบัตรประชาชน" ref="idCardRef" for="idCardRef"
-              dense
+              :rules="[(val: string) => !!val || `${'กรุณากรอกรหัสบัตรประชาชน'}`]" />
-              outlined
-              v-model="idCard"
-              label="รหัสบัตรประชาชน"
-              ref="idCardRef"
-              :rules="[(val: string) => !!val || `${'กรุณากรอกรหัสบัตรประชาชน'}`]"
-            />
           </div>
-          <div class="col-md-2">
+          <div class="col-2">
-            <q-btn
+            <q-btn unelevated dense color="primary" class="q-px-md q-py-sm" @click="addEmployee" label="เพิ่มบุคลากร"
-              unelevated
+              id="addCustomer" />
-              dense
-              color="primary"
-              class="q-px-md q-py-sm"
-              @click="addEmployee"
-              label="เพิ่มบุคลากร"
-            />
           </div>
         </div>
 
         <div class="row q-px-md q-col-gutter-sm">
-          <div class="col-md-3">
+          <div class="col-3">
-            <q-input
+            <q-input dense outlined v-model="formData.prefix" label="คำนำหน้า" ref="prefixRef" for="prefixRef"
-              dense
+              :rules="[(val: string) => val !== null && val !== '' || `${'กรุณากรอกคำนำหน้า'}`]" />
-              outlined
-              v-model="formData.prefix"
-              label="คำนำหน้า"
-              ref="prefixRef"
-              :rules="[(val: string) => val !== null && val !== '' || `${'กรุณากรอกคำนำหน้า'}`]"
-            />
           </div>
-          <div class="col-md-3">
+          <div class="col-3">
-            <q-input
+            <q-input dense outlined v-model="formData.firstname" label="ชื่อ" ref="firstnameRef" for="firstnameRef"
-              dense
+              :rules="[(val: string) => val !== null && val !== '' || `${'กรุณากรอกชื่อ'}`]" />
-              outlined
-              v-model="formData.firstname"
-              label="ชื่อ"
-              ref="firstnameRef"
-              :rules="[(val: string) => val !== null && val !== '' || `${'กรุณากรอกชื่อ'}`]"
-            />
           </div>
-          <div class="col-md-3">
+          <div class="col-3">
-            <q-input
+            <q-input dense outlined v-model="formData.lastname" label="นามสกุล" ref="lastnameRef" for="lastnameRef"
-              dense
+              :rules="[(val: string) => !!val || `${'กรุณากรอกนามสกุล'}`]" />
-              outlined
-              v-model="formData.lastname"
-              label="นามสกุล"
-              ref="lastnameRef"
-              :rules="[(val: string) => !!val || `${'กรุณากรอกนามสกุล'}`]"
-            />
           </div>
-          <div class="col-md-3">
+          <div class="col-3">
-            <q-input
+            <q-input dense outlined v-model="formData.position" label="ตำแหน่ง" ref="positionRef" for="positionRef"
-              dense
+              :rules="[(val: string) => !!val || `${'กรุณากรอกตำแหน่ง'}`]" />
-              outlined
-              v-model="formData.position"
-              label="ตำแหน่ง"
-              ref="positionRef"
-              :rules="[(val: string) => !!val || `${'กรุณากรอกตำแหน่ง'}`]"
-            />
           </div>
-          <div class="col-md-3">
+          <div class="col-3">
-            <q-input
+            <q-input dense outlined v-model="formData.phone" label="เบอร์โทร" ref="phoneRef" for="phoneRef"
-              dense
+              :rules="[(val: string) => !!val || `${'กรุณากรอกเบอร์โทร'}`]" />
-              outlined
-              v-model="formData.phone"
-              label="เบอร์โทร"
-              ref="phoneRef"
-              :rules="[(val: string) => !!val || `${'กรุณากรอกเบอร์โทร'}`]"
-            />
           </div>
-          <div class="col-md-3">
+          <div class="col-3">
-            <q-input
+            <q-input dense outlined v-model="formData.responsibilities" label="หน้าที่" ref="responsibilitiesRef"
-              dense
+              for="responsibilitiesRef" :rules="[(val: string) => !!val || `${'กรุณากรอกหน้าที่'}`]" />
-              outlined
-              v-model="formData.responsibilities"
-              label="หน้าที่"
-              ref="responsibilitiesRef"
-              :rules="[(val: string) => !!val || `${'กรุณากรอกหน้าที่'}`]"
-            />
           </div>
-          <div class="col-md-3">
+          <div class="col-3">
-            <q-input
+            <q-input dense outlined v-model="formData.email" label="อีเมล" ref="emailRef" for="emailRef"
-              dense
+              :rules="[(val: string) => !!val || `${'กรุณากรอกอีเมล'}`]" />
-              outlined
-              v-model="formData.email"
-              label="อีเมล"
-              ref="emailRef"
-              :rules="[(val: string) => !!val || `${'กรุณากรอกอีเมล'}`]"
-            />
           </div>
         </div>
 
         <q-separator />
         <div class="row col-12 q-pa-sm">
           <q-space />
-          <q-btn
+          <q-btn type="submit" flat round color="public" icon="mdi-content-save-outline" id="formSubmit">
-            type="submit"
-            flat
-            round
-            color="public"
-            icon="mdi-content-save-outline"
-          >
             <q-tooltip>บันทึกข้อมูล</q-tooltip>
           </q-btn>
         </div>

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}`)">
+              <q-td v-for="col in props.cols" :key="col.name" :props="props"
-                <!-- <div v-if="col.name == 'phone'">
+                @click="$router.push(`/discipline/director/${props.row.no}`)">
-                      {{ props.rowIndex + 1 }}
+                <div v-if="col.name == 'no'">
-                    </div> -->
+                  {{ props.rowIndex + 1 }}
-                <div>
+                </div>
+                <div v-else>
                   {{ col.value }}
                 </div>
               </q-td>

src/modules/11_discipline/interface/response/director.ts

@@ -1,5 +1,4 @@
 interface DirectorRows {
-    no: number;
     name: string;
     position: string;
     responsibilities: string;