From 5ae64b51f58889a74f8ce0790250ef6a4b0c6e8e Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Tue, 26 Sep 2023 15:23:57 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=20=E0=B8=81=E0=B8=A3=E0=B8=93=E0=B8=B5=20=E0=B9=81=E0=B8=81?=
 =?UTF-8?q?=E0=B9=89=E0=B9=84=E0=B8=82=20+=20=E0=B8=A2=E0=B8=81=E0=B9=80?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B4=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../05_placement/components/AppointMent/Detail.vue       | 7 ++++++-
 .../05_placement/components/Receive/receiveDetail2.vue   | 2 +-
 .../components/Transfer/transferRegistry.vue             | 7 +++++--
 .../05_placement/components/probation/FormAssign.vue     | 1 +
 .../components/probation/FormEvaluation/FormEvaluate.vue | 1 +
 .../probation/FormEvaluation/FormEvaluateScore.vue       | 1 +
 .../probation/FormEvaluation/FormSaveResult.vue          | 2 ++
 .../probation/FormEvaluation/FormSaveResultCommader.vue  | 2 ++
 .../components/probation/FormEvaluation/Template1.vue    | 1 +
 .../probation/FormEvaluation/Template1Commader.vue       | 9 +--------
 10 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/modules/05_placement/components/AppointMent/Detail.vue b/src/modules/05_placement/components/AppointMent/Detail.vue
index ca9dc62b9..bbfc18a7f 100644
--- a/src/modules/05_placement/components/AppointMent/Detail.vue
+++ b/src/modules/05_placement/components/AppointMent/Detail.vue
@@ -124,6 +124,11 @@ const putAppointment = async () => {
       edit.value = false;
     });
 };
+const cancel = () => {
+  edit.value = false
+  fecthappointmentByid()
+
+}
 const getClass = (val: boolean) => {
   return {
     "full-width inputgreen cursor-pointer": val,
@@ -200,7 +205,7 @@ onMounted(async () => {
           <q-btn outline color="public" dense class="q-px-sm" label="บันทึก"
             style="width: 80px" @click="clickSave" />
           <q-btn outline color="red" dense class="q-px-sm" label="ยกเลิก" style="width: 80px"
-            @click="edit = !edit" />
+            @click="cancel()" />
         </div>
       </div>
     </div>
diff --git a/src/modules/05_placement/components/Receive/receiveDetail2.vue b/src/modules/05_placement/components/Receive/receiveDetail2.vue
index 34a95c179..781d36267 100644
--- a/src/modules/05_placement/components/Receive/receiveDetail2.vue
+++ b/src/modules/05_placement/components/Receive/receiveDetail2.vue
@@ -636,10 +636,10 @@ onMounted(async () => {
                 hide-bottom-space
                 :outlined="edit"
                 dense
-                lazy-rules
                 :readonly="!edit"
                 :borderless="!edit"
                 v-model="informaData.lastname"
+                lazy-rules
                 :rules="[(val:string) => !!val || `${'กรุณากรอก นามสกุล'}`]"
                 :label="`${'นามสกุล'}`"
               />
diff --git a/src/modules/05_placement/components/Transfer/transferRegistry.vue b/src/modules/05_placement/components/Transfer/transferRegistry.vue
index 2ad3d424b..a11dff0d2 100644
--- a/src/modules/05_placement/components/Transfer/transferRegistry.vue
+++ b/src/modules/05_placement/components/Transfer/transferRegistry.vue
@@ -274,7 +274,10 @@ const saveData = async () => {
       hideLoader();
     });
 };
-
+const cancel = () => {
+  edit.value = false
+  getData()
+}
 const getClass = (val: boolean) => {
   return {
     "full-width inputgreen cursor-pointer": val,
@@ -523,7 +526,7 @@ onMounted(async () => {
           class="q-px-sm"
           label="ยกเลิก"
           style="width: 80px"
-          @click="edit = !edit"
+          @click="cancel()"
         />
       </div>
     </div>
diff --git a/src/modules/05_placement/components/probation/FormAssign.vue b/src/modules/05_placement/components/probation/FormAssign.vue
index 21e000567..1e9d564ef 100644
--- a/src/modules/05_placement/components/probation/FormAssign.vue
+++ b/src/modules/05_placement/components/probation/FormAssign.vue
@@ -108,6 +108,7 @@ const edit = () => {
 };
 const cancel = () => {
   status.value = false;
+  getAssign()
 };
 
 const filterData = (options: any[], excludedGroups: any[]) => {
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
index bacc25547..6e7decf63 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
@@ -76,6 +76,7 @@ const edit = () => {
 
 const cancel = () => {
   status.value = false;
+  fecthAssign()
 };
 
 const props = defineProps({
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
index 22b9d035f..38fcb3f63 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
@@ -36,6 +36,7 @@ const edit = () => {
 };
 const cancel = () => {
   status.value = false;
+  fecthAssign()
 };
 const evaluate_no = ref<number>();
 const evaluate_id = ref<string>("");
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
index 6c33d5b84..7a11f795e 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
@@ -76,11 +76,13 @@ const edit = () => {
 
 const cancel = () => {
   status.value = false;
+  props.fecthAssign?.(assignId.value)
 };
 const props = defineProps({
   tab: String,
   data: Object,
   action: String,
+  fecthAssign: Function,
 });
 
 const fecthFormdata = async () => {
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue
index 64d4e5947..886f760c3 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue
@@ -88,11 +88,13 @@ const edit = () => {
 
 const cancel = () => {
   status.value = false;
+  props.fecthAssign?.(assignId.value)
 };
 const props = defineProps({
   tab: String,
   data: Object,
   action: String,
+  fecthAssign: Function,
 });
 
 const fecthFormdata = async () => {
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue
index b7931c3b4..4b5d14d7a 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue
@@ -140,6 +140,7 @@ const addData = () => {
       :key="item.no"
     >
       <FormSaveResult
+        :fecthAssign="fecthAssign"
         :tab="tab"
         :data="probationStore.evaluate.find((x: any) => x.no === dataArrayNumber)"
         action="edit"
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template1Commader.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template1Commader.vue
index d40cbb3fc..a8c10fd77 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template1Commader.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template1Commader.vue
@@ -142,19 +142,12 @@ const addData = () => {
       :key="item.no"
     >
       <FormSaveResultCommader
+        :fecthAssign="fecthAssign"
         :tab="tab"
         :data="probationStore.evaluate.find((x: any) => x.no === dataArrayNumber)"
         action="edit"
       />
     </q-tab-panel>
-
-    <!-- <q-page-container>
-      <FormSaveResult
-        :tab="tab"
-        :data="probationStore.evaluate.find((x: any) => x.no === dataArrayNumber)"
-        action="edit"
-      />
-    </q-page-container> -->
   </q-tab-panels>
 
   <div class="q-gutter-md" v-else-if="probationStore.tabs.length == 0">