ปรับแก้ วินัย อีกนิด

src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue

@@ -339,7 +339,7 @@ async function fetchDatadetail() {
       email: item.email,
       phone: item.phone,
       duty: item.duty,
-      check: 'props',
+      check: "props",
     }));
 
     rows.value = dataMap;
@@ -467,8 +467,8 @@ async function selectComplainant(val: string) {
 /** ฟังก์ชั่นเช็คการแก้ไขฟอร์มแล้วไม่ได้กดบันทึก */
 function changeFormData() {
   isSave.value = true;
-  if(formData.disciplinaryFaultLevel !== 'อื่นๆ'){
+  if (formData.disciplinaryFaultLevel !== "อื่นๆ") {
-    formData.disciplinaryFaultLevelOther = ''
+    formData.disciplinaryFaultLevelOther = "";
   }
 }
 
@@ -1065,8 +1065,7 @@ onMounted(async () => {
 
                             <div class="col-3">
                               <datepicker
-                              :class="
+                                :class="isReadonly ? '' : dateEndInputStyle"
-                                isReadonly ? '' : dateEndInputStyle "
                                 menu-class-name="modalfix"
                                 v-model="formData.disciplinaryDateEnd"
                                 :readonly="
@@ -1323,7 +1322,9 @@ onMounted(async () => {
                             <q-td class="text-right">
                               <!-- แก้ไขกรรมการ -->
                               <q-btn
-                                v-if="!isReadonly && props.row.check ==='props'"
+                                v-if="
+                                  !isReadonly && props.row.check === 'props'
+                                "
                                 dense
                                 size="12px"
                                 flat
@@ -1366,7 +1367,7 @@ onMounted(async () => {
                     </div>
                   </q-card>
                 </div>
-
+                <div class="row col-12 q-col-gutter-sm">
                   <div class="col-xs-12 col-sm-3">
                     <q-input
                       :class="inputEdit(isReadonly)"
@@ -1427,7 +1428,18 @@ onMounted(async () => {
                     >
                     </q-select>
                   </div>
-
+                  <div
+                    class="col-3"
+                    v-if="formData.disciplinaryFaultLevel === 'อื่นๆ'"
+                  >
+                    <q-input
+                      :class="inputEdit(isReadonly)"
+                      outlined
+                      dense
+                      label="ระดับโทษความผิดอื่นๆ"
+                      v-model="formData.disciplinaryFaultLevelOther"
+                    />
+                  </div>
                   <div class="col-xs-12 col-sm-3">
                     <q-input
                       :class="inputEdit(isReadonly)"
@@ -1446,15 +1458,8 @@ onMounted(async () => {
                       @update:model-value="changeFormData()"
                     />
                   </div>
-                <div class="col-12" v-if="formData.disciplinaryFaultLevel === 'อื่นๆ'">
-                  <q-input
-                    :class="inputEdit(isReadonly)"
-                    outlined
-                    dense
-                    label="ระดับโทษความผิดอื่นๆ"
-                    v-model="formData.disciplinaryFaultLevelOther"
-                  />
                 </div>
+
                 <div class="col-xs-12 col-sm-6">
                   <q-input
                     :readonly="isReadonly"

src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue

@@ -72,7 +72,7 @@ const saveOrder = () => {
 async function Ordersave(){
   const persons = selected.value.map((r) => r.id);
 
-  if (props.title == "ส่งไปออกคำสั่งลงโทษทางวินัย") {
+  // if (props.title == "ส่งไปออกคำสั่งลงโทษทางวินัย") {
     const body = {
       persons,
     };
@@ -90,25 +90,25 @@ async function Ordersave(){
         props.getData?.();
         hideLoader();
       });
-  } else if (props.title == "ส่งไปออกคำสั่งงดโทษ/เพิ่มโทษ") {
+  // } else if (props.title == "ส่งไปออกคำสั่งงดโทษ/เพิ่มโทษ") {
-    const body = {
+  //   const body = {
-      persons,
+  //     persons,
-    };
+  //   };
-    showLoader();
+  //   showLoader();
-    await http
+  //   await http
-      .put(config.API.discardResult(idPath.value, type.value as string), body)
+  //     .put(config.API.discardResult(idPath.value, type.value as string), body)
-      .then((res: any) => {
+  //     .then((res: any) => {
-        success($q, `${props.title}สำเร็จ`);
+  //       success($q, `${props.title}สำเร็จ`);
-        props.closeModal?.();
+  //       props.closeModal?.();
-      })
+  //     })
-      .catch((e) => {
+  //     .catch((e) => {
-        messageError($q, e);
+  //       messageError($q, e);
-      })
+  //     })
-      .finally(async () => {
+  //     .finally(async () => {
-        props.getData?.();
+  //       props.getData?.();
-        hideLoader();
+  //       hideLoader();
-      });
+  //     });
-  }
+  // }
 };
 
 const emit = defineEmits([
@@ -193,6 +193,7 @@ watch(
         <div class="row justify-between">
           <div class="col-5">
             <q-toolbar style="padding: 0">
+
               <q-select
                 outlined
                 dense