เเก้ วินัย

src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue

@@ -139,7 +139,7 @@ function getData() {
     .get(config.API.investigateById(id.value))
     .then((res) => {
       const dataList = res.data.result;
-      console.log(dataList)
+      console.log(dataList);
       data.id = dataList.id;
       data.idComplaint = dataList.idComplaint;
       data.respondentType = dataList.respondentType;
@@ -160,7 +160,7 @@ function getData() {
       data.investigationStatusResult = dataList.investigationStatusResult;
       data.investigationExtendStatus = dataList.investigationExtendStatus;
       data.investigationDaysExtend = dataList.investigationDaysExtend;
-      console.log(dataList)
+      console.log(dataList);
     })
     .catch((e) => {
       messageError($q, e);
@@ -222,7 +222,7 @@ function sentConfirmNoPerson() {
     .finally(() => {
       hideLoader();
       getData();
-      router.push(`/discipline/investigatefacts`)
+      router.push(`/discipline/investigatefacts`);
     });
 }
 
@@ -261,13 +261,12 @@ function confirmEndInvestigate() {
   http
     .get(config.API.investigateReject(id.value))
     .then((res) => {
-
+      success($q, "ยุติเรื่องสำเร็จ");
     })
     .catch((e) => {
       messageError($q, e);
     })
     .finally(async () => {
-      success($q, "ยุติเรื่องสำเร็จ");
       await getData();
     });
 }
@@ -407,4 +406,4 @@ watch(
   padding: 0;
   background-color: #f0f3f3;
 }
-</style>
+</style>

src/modules/11_discipline/components/2_InvestigateFacts/Form.vue

@@ -765,7 +765,7 @@ onMounted(async () => {
                               for="#date"
                               class="full-width cursor-pointer"
                               ref="dateRef"
-                              :input-style="isReadonly ? { color: 'teal' }:{color:'black'}"
+                              :input-style="isReadonly ? { color: 'black' }:{color:'teal'}"
                               :readonly="isReadonly"
                               outlined
                               dense
@@ -852,7 +852,7 @@ onMounted(async () => {
                           <template #trigger>
                             <q-input
                               for="#dateEnd"
-                              :input-style="isReadonly ? { color: 'teal' }:{color:'black'}"
+                              :input-style="isReadonly ? { color: 'black' }:{color:'teal'}"
                               ref="dateEndRef"
                               class="full-width cursor-pointer"
                               :readonly="isReadonly"