From 1da216ccec645e2995c99bdac82f4da704fa266c Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Tue, 20 Aug 2024 16:53:37 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=8A=E0=B9=87=E0=B8=84=20?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=B1=E0=B8=9B=E0=B9=82=E0=B8=AB=E0=B8=A5=E0=B8=94?=
 =?UTF-8?q?=E0=B9=84=E0=B8=9F=E0=B8=A5=E0=B9=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/11_discipline/components/1_Complaint/Form.vue    | 4 ++--
 .../11_discipline/components/2_InvestigateFacts/Form.vue     | 3 +--
 src/modules/11_discipline/components/4_Result/Form.vue       | 5 ++---
 .../11_discipline/components/8_AppealComplain/Form.vue       | 2 +-
 src/modules/11_discipline/components/UploadFile.vue          | 2 +-
 src/modules/14_KPI/views/round.vue                           | 2 +-
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/modules/11_discipline/components/1_Complaint/Form.vue b/src/modules/11_discipline/components/1_Complaint/Form.vue
index dd21dc4a1..18ed7e429 100644
--- a/src/modules/11_discipline/components/1_Complaint/Form.vue
+++ b/src/modules/11_discipline/components/1_Complaint/Form.vue
@@ -233,16 +233,16 @@ function upLoadFileDoc() {
   http
     .put(config.API.complaintFileUpload(formData.id), Data)
     .then((res) => {
-      success($q, "อัพโหลดไฟล์สำเร็จ");
       countNum.value = 2;
+      formData.documentFile = null;
       props.getData();
+      success($q, "อัพโหลดไฟล์สำเร็จ");
     })
     .catch((e) => {
       messageError($q, e);
     })
     .finally(async () => {
       hideLoader();
-      formData.documentFile = null;
     });
 }
 
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
index efc6b9941..e86b5d07f 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@@ -329,10 +329,9 @@ function uploadFileRelevant() {
   http
     .put(config.API.investigateRelevantUploadFile(formData.id), Data)
     .then((res) => {
-      success($q, "อัปโหลดไฟล์สำเร็จ");
       countNum.value = 2;
       props.getData();
-      // router.push(`/discipline/complaints`);
+      success($q, "อัปโหลดไฟล์สำเร็จ");
     })
     .catch((e) => {
       messageError($q, e);
diff --git a/src/modules/11_discipline/components/4_Result/Form.vue b/src/modules/11_discipline/components/4_Result/Form.vue
index 3b4402f33..0329cc77d 100644
--- a/src/modules/11_discipline/components/4_Result/Form.vue
+++ b/src/modules/11_discipline/components/4_Result/Form.vue
@@ -208,10 +208,9 @@ function uploadFile() {
   http
     .put(config.API.upLoadFileResult(id.value), Data)
     .then((res) => {
-      success($q, "อัปโหลดไฟล์สำเร็จ");
-      countNum.value = 2;
       props.fetchData();
-      // router.push(`/discipline/complaints`);
+      countNum.value = 2;
+      success($q, "อัปโหลดไฟล์สำเร็จ");
     })
     .catch((e) => {
       messageError($q, e);
diff --git a/src/modules/11_discipline/components/8_AppealComplain/Form.vue b/src/modules/11_discipline/components/8_AppealComplain/Form.vue
index de998c029..bfbd62912 100644
--- a/src/modules/11_discipline/components/8_AppealComplain/Form.vue
+++ b/src/modules/11_discipline/components/8_AppealComplain/Form.vue
@@ -223,8 +223,8 @@ function uploadFile() {
   http
     .put(config.API.appealUpLoadFile(formData.id), Data)
     .then((res) => {
-      success($q, "อัปโหลดไฟล์สำเร็จ");
       props.getData();
+      success($q, "อัปโหลดไฟล์สำเร็จ");
     })
     .catch((e) => {
       messageError($q, e);
diff --git a/src/modules/11_discipline/components/UploadFile.vue b/src/modules/11_discipline/components/UploadFile.vue
index 5d414c2bd..0702bf926 100644
--- a/src/modules/11_discipline/components/UploadFile.vue
+++ b/src/modules/11_discipline/components/UploadFile.vue
@@ -78,8 +78,8 @@ async function uploadFile() {
     .put(config.API.disciplineDoc(props.type, props.id), Data)
     .then(() => {
       file.value = null;
-      success($q, "บันทึกข้อมูลสำเร็จ");
       props.fetchData();
+      success($q, "บันทึกข้อมูลสำเร็จ");
     })
     .catch((e) => {
       messageError($q, e);
diff --git a/src/modules/14_KPI/views/round.vue b/src/modules/14_KPI/views/round.vue
index 57ab68f6c..ca597053d 100644
--- a/src/modules/14_KPI/views/round.vue
+++ b/src/modules/14_KPI/views/round.vue
@@ -503,7 +503,7 @@ onMounted(() => {
           </q-tr>
         </template>
         <template v-slot:body="props">
-          <q-tr :props="props" class="cursor-pointer">
+          <q-tr :props="props">
             <q-td>
               <q-btn
                 v-if="