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 () => {
+ @click="cancel()" />
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()"
/>
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();
const evaluate_id = ref("");
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"
>
{
:key="item.no"
>
-
-