history ข้อมูลครอบครัว

src/modules/04_registry/components/Information/Family.vue

@@ -548,6 +548,7 @@
       </div>
     </q-form>
   </q-card>
+
   <DialogHistory
     v-model:modal="modal"
     v-model:fix="fix"
@@ -586,7 +587,90 @@
             :disable="true"
           />
         </div>
-        <div class="col-xs-6 col-sm-2 col-md-2">
+        <div class="row col-12">
+          <div class="col-3">
+            <q-input
+              :class="getClass(false)"
+              hide-bottom-space
+              :outlined="false"
+              dense
+              lazy-rules
+              :readonly="true"
+              :borderless="true"
+              v-model="familyDataHistory[indexRow].fatherCitizenId"
+              :label="`${'เลขที่บัตรประชาชน'}`"
+              maxlength="13"
+              mask="#############"
+            />
+          </div>
+          <div class="col-2">
+            <selector
+              :hide-dropdown-icon="true"
+              hide-bottom-space
+              :class="getClass(false)"
+              :readonly="true"
+              :borderless="true"
+              :rules="[(val:string) => !!val || `${'กรุณาเลือก คำนำหน้าชื่อ'}`]"
+              :outlined="false"
+              dense
+              lazy-rules
+              v-model="familyDataHistory[indexRow].fatherPrefixId"
+              emit-value
+              map-options
+              option-label="name"
+              :options="Ops.prefixOps"
+              option-value="id"
+              :label="`${'คำนำหน้าชื่อ'}`"
+              input-debounce="0"
+              @filter="(inputValue:any,
+                      doneFn:Function) => filterSelector(inputValue, doneFn,'prefixOps'
+                      ) "
+            />
+          </div>
+          <div class="col">
+            <q-input
+              :class="getClass(false)"
+              hide-bottom-space
+              :outlined="false"
+              dense
+              lazy-rules
+              :readonly="true"
+              :borderless="true"
+              v-model="familyDataHistory[indexRow].fatherFirstName"
+              :rules="[(val:string) => !!val || `${'กรุณากรอก ชื่อ'}`]"
+              :label="`${'ชื่อ'}`"
+            />
+          </div>
+          <div class="col">
+            <q-input
+              :class="getClass(false)"
+              hide-bottom-space
+              :outlined="false"
+              dense
+              lazy-rules
+              :readonly="true"
+              :borderless="true"
+              v-model="familyDataHistory[indexRow].fatherLastName"
+              :rules="[(val:string) => !!val || `${'กรุณากรอก นามสกุล'}`]"
+              :label="`${'นามสกุล'}`"
+            />
+          </div>
+          <div class="col">
+            <q-input
+              :class="getClass(false)"
+              hide-bottom-space
+              :outlined="false"
+              dense
+              lazy-rules
+              :readonly="true"
+              :borderless="true"
+              v-model="familyDataHistory[indexRow].fatherCareer"
+              :label="`${'อาชีพ'}`"
+            />
+          </div>
+        </div>
+
+        <!-- <div class="col-xs-6 col-sm-2 col-md-2">
           <q-input
             :class="getClass(false)"
             hide-bottom-space
@@ -626,7 +710,6 @@
                       ) "
           />
         </div>
-
         <div class="col-xs-6 col-sm-3 col-md-3">
           <q-input
             :class="getClass(false)"
@@ -667,7 +750,7 @@
             v-model="familyDataHistory[indexRow].fatherCareer"
             :label="`${'อาชีพ'}`"
           />
-        </div>
+        </div> -->
 
         <div class="col-12 q-pt-md q-pb-sm"><q-separator /></div>
         <div class="col-xs-12 text-weight-bold">
@@ -691,7 +774,89 @@
             :disable="true"
           />
         </div>
-        <div class="col-xs-6 col-sm-2 col-md-2">
+        <div class="row col-12">
+          <div class="col-3">
+            <q-input
+              :class="getClass(false)"
+              hide-bottom-space
+              :outlined="false"
+              dense
+              lazy-rules
+              :readonly="true"
+              :borderless="true"
+              v-model="familyDataHistory[indexRow].motherCitizenId"
+              :label="`${'เลขที่บัตรประชาชน'}`"
+              maxlength="13"
+              mask="#############"
+            />
+          </div>
+          <div class="col-2">
+            <selector
+              :hide-dropdown-icon="true"
+              hide-bottom-space
+              :class="getClass(false)"
+              :readonly="true"
+              :borderless="true"
+              :rules="[(val:string) => !!val || `${'กรุณาเลือก คำนำหน้าชื่อ'}`]"
+              :outlined="false"
+              dense
+              lazy-rules
+              v-model="familyDataHistory[indexRow].motherPrefixId"
+              emit-value
+              map-options
+              option-label="name"
+              :options="Ops.prefixOps"
+              option-value="id"
+              :label="`${'คำนำหน้าชื่อ'}`"
+              input-debounce="0"
+              @filter="(inputValue:any,
+                      doneFn:Function) => filterSelector(inputValue, doneFn,'prefixOps'
+                      ) "
+            />
+          </div>
+          <div class="col">
+            <q-input
+              :class="getClass(false)"
+              hide-bottom-space
+              :outlined="false"
+              dense
+              lazy-rules
+              :readonly="true"
+              :borderless="true"
+              v-model="familyDataHistory[indexRow].motherFirstName"
+              :rules="[(val:string) => !!val || `${'กรุณากรอก ชื่อ'}`]"
+              :label="`${'ชื่อ'}`"
+            />
+          </div>
+          <div class="col">
+            <q-input
+              :class="getClass(false)"
+              hide-bottom-space
+              :outlined="false"
+              dense
+              lazy-rules
+              :readonly="true"
+              :borderless="true"
+              v-model="familyDataHistory[indexRow].motherLastName"
+              :rules="[(val:string) => !!val || `${'กรุณากรอก นามสกุล'}`]"
+              :label="`${'นามสกุล'}`"
+            />
+          </div>
+          <div class="col">
+            <q-input
+              :class="getClass(false)"
+              hide-bottom-space
+              :outlined="false"
+              dense
+              lazy-rules
+              :readonly="true"
+              :borderless="true"
+              v-model="familyDataHistory[indexRow].motherCareer"
+              :label="`${'อาชีพ'}`"
+            />
+          </div>
+        </div>
+        <!-- <div class="col-xs-6 col-sm-2 col-md-2">
           <q-input
             :class="getClass(false)"
             hide-bottom-space
@@ -772,7 +937,7 @@
             v-model="familyDataHistory[indexRow].motherCareer"
             :label="`${'อาชีพ'}`"
           />
-        </div>
+        </div> -->
         <div class="col-12 q-pt-md q-pb-sm"><q-separator /></div>
         <div class="col-xs-12 q-gutter-sm items-center flex q-my-sm">
           <label class="text-weight-bold">• คู่สมรส</label>
@@ -827,7 +992,107 @@
             />
           </div>
         </div>
+
         <div
+          class="row col-12"
+          v-if="familyDataHistory[indexRow].couple == '1'"
+        >
+          <div class="col-3">
+            <q-input
+              :class="getClass(false)"
+              hide-bottom-space
+              :outlined="false"
+              dense
+              lazy-rules
+              :readonly="true"
+              :borderless="true"
+              v-model="familyDataHistory[indexRow].coupleCitizenId"
+              :label="`${'เลขที่บัตรประชาชน'}`"
+              maxlength="13"
+              mask="#############"
+            />
+          </div>
+          <div class="col-2">
+            <selector
+              :hide-dropdown-icon="true"
+              hide-bottom-space
+              :class="getClass(false)"
+              :readonly="true"
+              :borderless="true"
+              :rules="[(val:string) => !!val || `${'กรุณาเลือก คำนำหน้าชื่อ'}`]"
+              :outlined="false"
+              dense
+              lazy-rules
+              v-model="familyDataHistory[indexRow].couplePrefixId"
+              emit-value
+              map-options
+              option-label="name"
+              :options="Ops.prefixOps"
+              option-value="id"
+              :label="`${'คำนำหน้าชื่อ'}`"
+              input-debounce="0"
+              @filter="(inputValue:any,
+                      doneFn:Function) => filterSelector(inputValue, doneFn,'prefixOps'
+                      ) "
+            />
+          </div>
+          <div class="col">
+            <q-input
+              :class="getClass(false)"
+              hide-bottom-space
+              :outlined="false"
+              dense
+              lazy-rules
+              :readonly="true"
+              :borderless="true"
+              v-model="familyDataHistory[indexRow].coupleFirstName"
+              :rules="[(val:string) => !!val || `${'กรุณากรอก ชื่อ'}`]"
+              :label="`${'ชื่อ'}`"
+            />
+          </div>
+          <div class="col">
+            <q-input
+              :class="getClass(false)"
+              hide-bottom-space
+              :outlined="false"
+              dense
+              lazy-rules
+              :readonly="true"
+              :borderless="true"
+              v-model="familyDataHistory[indexRow].coupleLastName"
+              :rules="[(val:string) => !!val || `${'กรุณากรอก นามสกุล'}`]"
+              :label="`${'นามสกุล'}`"
+            />
+          </div>
+          <div class="col">
+            <q-input
+              :class="getClass(false)"
+              hide-bottom-space
+              :outlined="false"
+              dense
+              lazy-rules
+              :readonly="true"
+              :borderless="true"
+              v-model="familyDataHistory[indexRow].coupleLastNameOld"
+              :rules="[(val:string) => !!val || `${'กรุณากรอก นามสกุล(เดิม)'}`]"
+              :label="`${'นามสกุล(เดิม)'}`"
+            />
+          </div>
+          <div class="col">
+            <q-input
+              :class="getClass(false)"
+              hide-bottom-space
+              :outlined="false"
+              dense
+              lazy-rules
+              :readonly="true"
+              :borderless="true"
+              v-model="familyDataHistory[indexRow].coupleCareer"
+              :label="`${'อาชีพ'}`"
+            />
+          </div>
+        </div>
+        <!-- <div
           class="col-xs-6 col-sm-2 col-md-2"
           v-if="familyDataHistory[indexRow].couple == '1'"
         >
@@ -876,7 +1141,7 @@
         </div>
 
         <div
-          class="col-xs-6 col-sm-3 col-md-3"
+          class="col-xs-6 col-sm-2 col-md-2"
           v-if="familyDataHistory[indexRow].couple == '1'"
         >
           <q-input
@@ -893,7 +1158,7 @@
           />
         </div>
         <div
-          class="col-xs-6 col-sm-3 col-md-3"
+          class="col-xs-6 col-sm-2 col-md-2"
           v-if="familyDataHistory[indexRow].couple == '1'"
         >
           <q-input
@@ -941,7 +1206,7 @@
             v-model="familyDataHistory[indexRow].coupleCareer"
             :label="`${'อาชีพ'}`"
           />
-        </div>
+        </div> -->
 
         <div class="col-12 q-pt-md q-pb-sm"><q-separator /></div>
       </div>
@@ -977,7 +1242,89 @@
               :disable="true"
             />
           </div>
-          <div class="col-xs-6 col-sm-2 col-md-2">
+          <div class="row col-12">
+            <div class="col-3">
+              <q-input
+                :class="getClass(false)"
+                hide-bottom-space
+                :outlined="false"
+                dense
+                lazy-rules
+                :readonly="true"
+                :borderless="true"
+                v-model="items.childrenCitizenId"
+                :label="`${'เลขที่บัตรประชาชน'}`"
+                maxlength="13"
+                mask="#############"
+              />
+            </div>
+            <div class="col-2">
+              <selector
+                :hide-dropdown-icon="true"
+                hide-bottom-space
+                :class="getClass(false)"
+                :readonly="true"
+                :borderless="true"
+                :rules="[(val:string) => !!val || `${'กรุณาเลือก คำนำหน้าชื่อ'}`]"
+                :outlined="false"
+                dense
+                lazy-rules
+                v-model="items.childrenPrefixId"
+                emit-value
+                map-options
+                option-label="name"
+                :options="Ops.prefixOps"
+                option-value="id"
+                :label="`${'คำนำหน้าชื่อ'}`"
+                input-debounce="0"
+                @filter="(inputValue:any,
+                      doneFn:Function) => filterSelector(inputValue, doneFn,'prefixOps'
+                      ) "
+              />
+            </div>
+            <div class="col">
+              <q-input
+              :class="getClass(false)"
+              hide-bottom-space
+              :outlined="false"
+              dense
+              lazy-rules
+              :readonly="true"
+              :borderless="true"
+              v-model="items.childrenFirstName"
+              :rules="[(val:string) => !!val || `${'กรุณากรอก ชื่อ'}`]"
+              :label="`${'ชื่อ'}`"
+            />
+            </div>
+            <div class="col">
+              <q-input
+                :class="getClass(false)"
+                hide-bottom-space
+                :outlined="false"
+                dense
+                lazy-rules
+                :readonly="true"
+                :borderless="true"
+                v-model="items.childrenLastName"
+                :rules="[(val:string) => !!val || `${'กรุณากรอก นามสกุล'}`]"
+                :label="`${'นามสกุล'}`"
+              />
+            </div>
+            <div class="col">
+              <q-input
+                :class="getClass(false)"
+                hide-bottom-space
+                :outlined="false"
+                dense
+                lazy-rules
+                :readonly="true"
+                :borderless="true"
+                v-model="items.childrenCareer"
+                :label="`${'อาชีพ'}`"
+              />
+            </div>
+          </div>
+          <!-- <div class="col-xs-6 col-sm-2 col-md-2">
             <q-input
               :class="getClass(false)"
               hide-bottom-space
@@ -1057,7 +1404,7 @@
               v-model="items.childrenCareer"
               :label="`${'อาชีพ'}`"
             />
-          </div>
+          </div> -->
         </div>
       </div>
     </template>

src/modules/06_retirement/components/ListRetirement/AddList.vue

@@ -193,7 +193,7 @@ const clickAdd = (props: any) => {
       // console.log("เพิ่มข้อมูล");
       await http
         .put(config.API.profileRetire(retireld.value), { profileId: data })
-        .then((res) => {
+        .then(() => {
           success($q, "เพิ่มข้อมูลสำเร็จ");
           updateListData(retireld.value, data);
         })
@@ -239,10 +239,9 @@ const paginationLabel = (start: number, end: number, total: number) => {
   >
 
   <q-dialog v-model="modal">
-    <q-card style="width: 850px; max-width: 80vw" class="q-pb-md">
+    <q-card style="width: 900px; max-width: 80vw" class="q-pb-md">
       <q-toolbar class="q-py-md">
-        <q-toolbar-title class="text-h6">เพิ่มรายชื่อ
+        <q-toolbar-title class="text-h6">เพิ่มรายชื่อ </q-toolbar-title>
-        </q-toolbar-title>
         <q-btn
           icon="close"
           unelevated

src/modules/08_registryEmployee/views/Information/Family.vue

@@ -586,7 +586,8 @@
             :disable="true"
           />
         </div>
-        <div class="col-xs-6 col-sm-2 col-md-2">
+        <div class="row col-12">
+          <div class="col-3">
             <q-input
               :class="getClass(false)"
               hide-bottom-space
@@ -601,7 +602,7 @@
               mask="#############"
             />
           </div>
-        <div class="col-xs-12 col-sm-2 col-md-2">
+          <div class="col-2">
             <selector
               :hide-dropdown-icon="true"
               hide-bottom-space
@@ -619,15 +620,13 @@
               :options="Ops.prefixOps"
               option-value="id"
               :label="`${'คำนำหน้าชื่อ'}`"
-            use-input
               input-debounce="0"
               @filter="(inputValue:any,
                       doneFn:Function) => filterSelector(inputValue, doneFn,'prefixOps'
                       ) "
             />
           </div>
-
+          <div class="col">
-        <div class="col-xs-6 col-sm-3 col-md-3">
             <q-input
               :class="getClass(false)"
               hide-bottom-space
@@ -641,7 +640,7 @@
               :label="`${'ชื่อ'}`"
             />
           </div>
-        <div class="col-xs-6 col-sm-3 col-md-3">
+          <div class="col">
             <q-input
               :class="getClass(false)"
               hide-bottom-space
@@ -655,7 +654,7 @@
               :label="`${'นามสกุล'}`"
             />
           </div>
-        <div class="col-xs-12 col-sm-2 col-md-2">
+          <div class="col">
             <q-input
               :class="getClass(false)"
               hide-bottom-space
@@ -668,8 +667,9 @@
               :label="`${'อาชีพ'}`"
             />
           </div>
-
+        </div>
         <div class="col-12 q-pt-md q-pb-sm"><q-separator /></div>
+
         <div class="col-xs-12 text-weight-bold">
           • มารดา
           <q-radio
@@ -691,7 +691,8 @@
             :disable="true"
           />
         </div>
-        <div class="col-xs-6 col-sm-2 col-md-2">
+        <div class="row col-12">
+          <div class="col-3">
             <q-input
               :class="getClass(false)"
               hide-bottom-space
@@ -706,7 +707,7 @@
               mask="#############"
             />
           </div>
-        <div class="col-xs-12 col-sm-2 col-md-2">
+          <div class="col-2">
             <selector
               :hide-dropdown-icon="true"
               hide-bottom-space
@@ -724,15 +725,13 @@
               :options="Ops.prefixOps"
               option-value="id"
               :label="`${'คำนำหน้าชื่อ'}`"
-            use-input
               input-debounce="0"
               @filter="(inputValue:any,
                       doneFn:Function) => filterSelector(inputValue, doneFn,'prefixOps'
                       ) "
             />
           </div>
-
+          <div class="col">
-        <div class="col-xs-6 col-sm-3 col-md-3">
             <q-input
               :class="getClass(false)"
               hide-bottom-space
@@ -746,7 +745,7 @@
               :label="`${'ชื่อ'}`"
             />
           </div>
-        <div class="col-xs-6 col-sm-3 col-md-3">
+          <div class="col">
             <q-input
               :class="getClass(false)"
               hide-bottom-space
@@ -760,7 +759,7 @@
               :label="`${'นามสกุล'}`"
             />
           </div>
-        <div class="col-xs-12 col-sm-2 col-md-2">
+          <div class="col">
             <q-input
               :class="getClass(false)"
               hide-bottom-space
@@ -773,7 +772,9 @@
               :label="`${'อาชีพ'}`"
             />
           </div>
+        </div>
         <div class="col-12 q-pt-md q-pb-sm"><q-separator /></div>
+
         <div class="col-xs-12 q-gutter-sm items-center flex q-my-sm">
           <label class="text-weight-bold">• คู่สมรส</label>
           <q-radio
@@ -827,10 +828,12 @@
             />
           </div>
         </div>
+
         <div
-          class="col-xs-6 col-sm-2 col-md-2"
+          class="row col-12"
           v-if="familyDataHistory[indexRow].couple == '1'"
         >
+          <div class="col-3">
             <q-input
               :class="getClass(false)"
               hide-bottom-space
@@ -845,11 +848,7 @@
               mask="#############"
             />
           </div>
-
+          <div class="col-2">
-        <div
-          class="col-xs-12 col-sm-2 col-md-2"
-          v-if="familyDataHistory[indexRow].couple == '1'"
-        >
             <selector
               :hide-dropdown-icon="true"
               hide-bottom-space
@@ -867,18 +866,13 @@
               :options="Ops.prefixOps"
               option-value="id"
               :label="`${'คำนำหน้าชื่อ'}`"
-            use-input
               input-debounce="0"
               @filter="(inputValue:any,
                       doneFn:Function) => filterSelector(inputValue, doneFn,'prefixOps'
                       ) "
             />
           </div>
-
+          <div class="col">
-        <div
-          class="col-xs-6 col-sm-3 col-md-3"
-          v-if="familyDataHistory[indexRow].couple == '1'"
-        >
             <q-input
               :class="getClass(false)"
               hide-bottom-space
@@ -892,10 +886,7 @@
               :label="`${'ชื่อ'}`"
             />
           </div>
-        <div
+          <div class="col">
-          class="col-xs-6 col-sm-3 col-md-3"
-          v-if="familyDataHistory[indexRow].couple == '1'"
-        >
             <q-input
               :class="getClass(false)"
               hide-bottom-space
@@ -909,10 +900,7 @@
               :label="`${'นามสกุล'}`"
             />
           </div>
-        <div
+          <div class="col">
-          class="col-xs-6 col-sm-2 col-md-2"
-          v-if="familyDataHistory[indexRow].couple == '1'"
-        >
             <q-input
               :class="getClass(false)"
               hide-bottom-space
@@ -926,10 +914,7 @@
               :label="`${'นามสกุล(เดิม)'}`"
             />
           </div>
-        <div
+          <div class="col">
-          class="col-xs-12 col-sm-2 col-md-2"
-          v-if="familyDataHistory[indexRow].couple == '1'"
-        >
             <q-input
               :class="getClass(false)"
               hide-bottom-space
@@ -942,6 +927,7 @@
               :label="`${'อาชีพ'}`"
             />
           </div>
+        </div>
 
         <div class="col-12 q-pt-md q-pb-sm"><q-separator /></div>
       </div>
@@ -977,7 +963,8 @@
               :disable="true"
             />
           </div>
-          <div class="col-xs-6 col-sm-2 col-md-2">
+          <div class="row col-12">
+            <div class="col-3">
               <q-input
                 :class="getClass(false)"
                 hide-bottom-space
@@ -992,7 +979,7 @@
                 mask="#############"
               />
             </div>
-          <div class="col-xs-6 col-sm-2 col-md-2">
+            <div class="col-2">
               <selector
                 :hide-dropdown-icon="true"
                 hide-bottom-space
@@ -1010,14 +997,13 @@
                 :options="Ops.prefixOps"
                 option-value="id"
                 :label="`${'คำนำหน้าชื่อ'}`"
-              use-input
                 input-debounce="0"
                 @filter="(inputValue:any,
                       doneFn:Function) => filterSelector(inputValue, doneFn,'prefixOps'
                       ) "
               />
             </div>
-          <div class="col-xs-6 col-sm-3 col-md-3">
+            <div class="col">
               <q-input
                 :class="getClass(false)"
                 hide-bottom-space
@@ -1031,7 +1017,7 @@
                 :label="`${'ชื่อ'}`"
               />
             </div>
-          <div class="col-xs-6 col-sm-3 col-md-3">
+            <div class="col">
               <q-input
                 :class="getClass(false)"
                 hide-bottom-space
@@ -1045,7 +1031,7 @@
                 :label="`${'นามสกุล'}`"
               />
             </div>
-          <div class="col-xs-12 col-sm-2 col-md-2">
+            <div class="col">
               <q-input
                 :class="getClass(false)"
                 hide-bottom-space
@@ -1060,6 +1046,7 @@
             </div>
           </div>
         </div>
+      </div>
     </template>
     <template v-slot:footer>
       <q-btn
@@ -1126,7 +1113,14 @@ const route = useRoute();
 const $q = useQuasar();
 
 const mixin = useCounterMixin();
-const { date2Thai, success, messageError, showLoader, hideLoader ,dialogConfirm} = mixin;
+const {
+  date2Thai,
+  success,
+  messageError,
+  showLoader,
+  hideLoader,
+  dialogConfirm,
+} = mixin;
 const edit = ref<boolean>(false);
 const fix = ref<boolean>(true);
 const myform = ref<QForm | null>(null);
@@ -1456,9 +1450,9 @@ const addData = async () => {
   //       await changeBirth(informaData.value.birthDate ?? new Date());
   //     });
 };
-const saveData = () =>{
+const saveData = () => {
-  dialogConfirm($q,() => Datasave())
+  dialogConfirm($q, () => Datasave());
-}
+};
 const Datasave = async () => {
   await myform.value?.validate().then(async (success: boolean) => {
     if (success) {