Merge branch 'nice_dev' into develop

src/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue

@@ -128,12 +128,12 @@ const fileUploadDoc = async (files: any) => {
 // เลือกระดับการพิจารณา
 function selectLevel(val: string) {
   let dayNum = 0;
-  if (val == "0") {
-    dayNum = 45; // ปกติ
+  if (val == "3") {
+    dayNum = 15; // ด่วนมาก
   } else if (val == "1") {
     dayNum = 30; // ด่วน
   } else {
-    dayNum = 15; // ด่วนมาก
+    dayNum = 45; // ปกติ
   }
   // วันแจ้งเตือนล่วงหน้า
   if (formData.dateconsideration) {
@@ -144,11 +144,6 @@ function selectLevel(val: string) {
     formData.datewarn = newDate;
   }
 }
-watch(formData, () => {
-  if (formData.considerationLevel !== "") {
-    selectLevel(formData.considerationLevel);
-  }
-});
 
 // validateForm
 const complainantTypeRef = ref<Object | null>(null);
@@ -233,7 +228,7 @@ function onSubmit() {
           <div
             class="col-xs-12 col-sm-12 row q-col-gutter-x-md q-col-gutter-y-xs"
           >
-            <div class="col-xs-12 col-sm-2" id="complainantType">
+            <div class="col-xs-12 col-sm-3" id="complainantType">
               <q-select
                 for="SelectcomplainantType"
                 ref="complainantTypeRef"
@@ -267,7 +262,7 @@ function onSubmit() {
             </div>
 
             <div
-              class="col-xs-12 col-sm-2"
+              class="col-xs-12 col-sm-3"
               id="complainant"
               v-if="formData.complainantType === '0'"
             >
@@ -299,7 +294,7 @@ function onSubmit() {
               </q-select>
             </div>
             <div
-              class="col-xs-12 col-sm-2"
+              class="col-xs-12 col-sm-3"
               v-if="formData.complainantType === '1'"
               id="office"
             >
@@ -315,7 +310,7 @@ function onSubmit() {
                 lazy-rules
               />
             </div>
-            <div class="col-xs-12 col-sm-2" id="agency">
+            <div class="col-xs-12 col-sm-3" id="agency">
               <q-select
                 ref="agencyRef"
                 for="selectAgency"
@@ -372,7 +367,7 @@ function onSubmit() {
                 rows="5"
               />
             </div>
-            <div class="col-xs-12 col-sm-2" id="datereceive">
+            <div class="col-xs-12 col-sm-3" id="datereceive">
               <datepicker
                 menu-class-name="modalfix"
                 v-model="formData.datereceive"
@@ -418,10 +413,47 @@ function onSubmit() {
                 </template>
               </datepicker>
             </div>
-            <div class="col-xs-12 col-sm-2" id="dateconsideration">
+
+            <div class="col-xs-12 col-sm-3" id="offenseDescription">
+              <q-select
+                for="selectOffenseDescription"
+                ref="offenseDescriptionRef"
+                dense
+                outlined
+                v-model="formData.offenseDescription"
+                :options="offenseDescriptiontoptions"
+                label="ลักษณะความผิด"
+                option-value="id"
+                option-label="name"
+                emit-value
+                map-options
+                :rules="[(val) => !!val || `${'กรุณาเลือกลักษณะความผิด'}`]"
+                lazy-rules
+              />
+            </div>
+            <div class="col-xs-12 col-sm-3" id="considerationLevel">
+              <q-select
+                for="selectConsiderationLevel"
+                ref="considerationLevelRef"
+                dense
+                outlined
+                v-model="formData.considerationLevel"
+                :options="considerationLeveltoptions"
+                label="ระดับการพิจารณา"
+                option-value="id"
+                option-label="name"
+                emit-value
+                map-options
+                :rules="[(val) => !!val || `${'กรุณาเลือกระดับการพิจารณา'}`]"
+                lazy-rules
+                @update:model-value="selectLevel(formData.considerationLevel)"
+              />
+            </div>
+            <div class="col-xs-12 col-sm-3" id="dateconsideration">
               <datepicker
                 menu-class-name="modalfix"
                 v-model="formData.dateconsideration"
+                @update:model-value="selectLevel(formData.considerationLevel)"
                 :locale="'th'"
                 autoApply
                 borderless
@@ -464,43 +496,7 @@ function onSubmit() {
                 </template>
               </datepicker>
             </div>
-            <div class="col-xs-12 col-sm-2" id="offenseDescription">
-              <q-select
-                for="selectOffenseDescription"
-                ref="offenseDescriptionRef"
-                dense
-                outlined
-                v-model="formData.offenseDescription"
-                :options="offenseDescriptiontoptions"
-                label="ลักษณะความผิด"
-                option-value="id"
-                option-label="name"
-                emit-value
-                map-options
-                :rules="[(val) => !!val || `${'กรุณาเลือกลักษณะความผิด'}`]"
-                lazy-rules
-              />
-            </div>
-            <div class="col-xs-12 col-sm-2" id="considerationLevel">
-              <q-select
-                for="selectConsiderationLevel"
-                ref="considerationLevelRef"
-                dense
-                outlined
-                v-model="formData.considerationLevel"
-                :options="considerationLeveltoptions"
-                label="ระดับการพิจารณา"
-                option-value="id"
-                option-label="name"
-                emit-value
-                map-options
-                :rules="[(val) => !!val || `${'กรุณาเลือกระดับการพิจารณา'}`]"
-                lazy-rules
-                @update:model-value="selectLevel(formData.considerationLevel)"
-              />
-            </div>
-            <div class="col-xs-12 col-sm-3"></div>
-            <div class="col-xs-12 col-sm-2" id="datewarn">
+            <div class="col-xs-12 col-sm-3" id="datewarn">
               <datepicker
                 menu-class-name="modalfix"
                 v-model="formData.datewarn"
@@ -547,7 +543,7 @@ function onSubmit() {
                 </template>
               </datepicker>
             </div>
-            <div class="col-xs-12 col-sm-2" id="receivecomplaints">
+            <div class="col-xs-12 col-sm-3" id="receivecomplaints">
               <q-select
                 for="selectReceivecomplaints"
                 ref="receivecomplaintsRef"
@@ -565,7 +561,7 @@ function onSubmit() {
               />
             </div>
             <div class="col-xs-12 col-sm-6"></div>
-            <div class="col-xs-12 col-sm-4" id="petitioner">
+            <div class="col-xs-12 col-sm-6" id="petitioner">
               <q-input
                 for="inputPetitioner"
                 ref="petitionerRef"
@@ -575,13 +571,15 @@ function onSubmit() {
                 label="ผู้ร้องเรียน"
                 :rules="[(val) => !!val || `${'กรุณากรอกข้อมูล'}`]"
                 lazy-rules
+                type="textarea"
+                rows="5"
               />
             </div>
-            <div class="col-xs-12 col-sm-4" id="files">
+            <div class="col-xs-12 col-sm-6"></div>
+            <div class="col-xs-12 col-sm-6" id="files">
               <q-file
                 for="inputFiles"
                 ref="filesRef"
-                class="col-xs-12 col-sm-10"
                 outlined
                 dense
                 v-model="formData.files"
@@ -606,10 +604,8 @@ function onSubmit() {
           <q-btn
             for="ButtonOnSubmit"
             id="onSubmit"
-            flat
-            round
             color="secondary"
-            icon="mdi-content-save-outline"
+            label="บันทึก"
             type="submit"
             ><q-tooltip>บับทึกข้อมูล</q-tooltip></q-btn
           >