Merge branch 'develop' into warunee-dev

# Conflicts:
#	src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore copy.vue
#	src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue

src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue

@@ -76,6 +76,7 @@ const edit = () => {
 
 const cancel = () => {
   status.value = false;
+  fecthAssign()
 };
 
 const props = defineProps({
@@ -94,8 +95,7 @@ const fecthAssign = async () => {
   showLoader();
   await http
     .get(config.API.evaluateCreate(assignId.value))
-    .then(async (res: any) => {
-      console.log(res);
+    .then(async (res) => {
       if (props.action == "add") {
         person.value = res.data.data.person;
         commander.value = res.data.data.commander;

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>("");

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 () => {

src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAddCommander.vue

@@ -235,8 +235,6 @@ const savaForm = () => {
         alerts[index + 11].value = true;
       }
     });
-    console.log(evaluate_expenct_level.value);
-
     dialogMessageNotify($q, "กรุณากรอกข้อมูลให้ครบ");
   } else {
     putformData();
@@ -311,13 +309,13 @@ ArrayCountbotton.forEach((variable, index) => {
 });
 watch(lengthevaluate_expenct_level, (newLength) => {
   if (newLength === evaluate_expenct_level.value.length) {
-    console.log(true);
+    
     alerts[0].value = false;
   }
 });
 watch(lengthevaluate_ouptut, (newLength) => {
   if (newLength === evaluate_ouptut.value.length) {
-    console.log(true);
+
     alerts[1].value = false;
   }
 });

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 () => {

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"

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">