diff --git a/src/modules/05_placement/components/probation/FormAssign.vue b/src/modules/05_placement/components/probation/FormAssign.vue
index 2242da3c3..104ea7f16 100644
--- a/src/modules/05_placement/components/probation/FormAssign.vue
+++ b/src/modules/05_placement/components/probation/FormAssign.vue
@@ -66,20 +66,26 @@ const OPgroup = ref<
 >([]);
 
 const dataEdit = async (id: string) => {
-  showLoader();
-  const data = putDataEdit(id);
-  await http
-    .put(config.API.saveEditAssign(id), data)
-    .then(() => {})
-    .catch(() => {})
-    .finally(async () => {
-      status.value = false;
-      getAssign();
-      hideLoader();
-    });
+  await myForm.value.validate().then((result: boolean) => {
+    if (result) {
+      showLoader();
+      const data = putDataEdit(id);
+       http
+        .put(config.API.saveEditAssign(id), data)
+        .then(() => {})
+        .catch(() => {})
+        .finally(async () => {
+          status.value = false;
+          getAssign();
+          hideLoader();
+        });
+    }else {
+      dialogMessageNotify($q, "กรุณากรอกข้อมูลให้ครบ");
+    }
+  });
 };
 const saveEdit = (id: string) => {
-  dialogConfirm($q, () => dataEdit(id));
+  dialogConfirm($q, async () => await dataEdit(id));
 };
 const edit = () => {
   status.value = true;
@@ -392,7 +398,7 @@ const putDataEdit = (id: string) => {
 
   const assign_director = [
     {
-      personal_id: caretaker1.value.personal_id,
+      personal_id: caretaker1.value.id != null ? caretaker1.value.id:caretaker1.value.personal_id,
       role: "mentor",
       dated:
         date2.value instanceof Date
@@ -400,15 +406,7 @@ const putDataEdit = (id: string) => {
           : dateToISO(new Date(date2.value)),
     },
     {
-      personal_id: caretaker2.value.personal_id,
-      role: "mentor",
-      dated:
-        date3.value instanceof Date
-          ? dateToISO(date3.value)
-          : dateToISO(new Date(date3.value)),
-    },
-    {
-      personal_id: commander.value.personal_id,
+      personal_id: commander.value.id != null ? commander.value.id:commander.value.personal_id,
       role: "commander",
       dated:
         date4.value instanceof Date
@@ -416,10 +414,20 @@ const putDataEdit = (id: string) => {
           : dateToISO(new Date(date4.value)),
     },
     {
-      personal_id: chairman.value.personal_id,
+      personal_id: chairman.value.id != null ? chairman.value.id:chairman.value.personal_id,
       role: "chairman",
     },
   ];
+  if (caretaker2.value) {
+    assign_director.push({
+      personal_id: caretaker2.value.id != null ? caretaker2.value.id:caretaker2.value.personal_id,
+      role: "mentor",
+      dated:
+        date3.value instanceof Date
+          ? dateToISO(date3.value)
+          : dateToISO(new Date(date3.value)),
+    });
+  }
   const data = {
     personal_id: GUID,
     fullname: fullname.value,
@@ -658,8 +666,11 @@ const getAssign = async () => {
     date_finish.value = data.assign.date_finish;
     date1.value = data.assign.experimenter_dated;
     if (data.mentors.length > 1) {
+      date2.value = data.mentors[0].dated;
+      caretaker1.value = data.mentors[0];
       date3.value = data.mentors[1].dated;
       caretaker2.value = data.mentors[1];
+
     } else {
       date2.value = data.mentors[0].dated;
       caretaker1.value = data.mentors[0];
@@ -1000,7 +1011,6 @@ watch(knowledge.value, () => {
                 <q-avatar class="bg-grey-2 q-mr-sm" size="28px">2</q-avatar>
                 ผู้ดูแลการทดลองปฏิบัติหน้าที่ราชการ (อาจมีได้มากกว่า 1 คน)
               </div>
-
               <div v-if="status == true" class="col-12 row q-col-gutter-md">
                 <q-select
                   :rules="[(val) => !!val || 'กรุณาเลือกผู้ดูเเล']"
@@ -2264,11 +2274,15 @@ watch(knowledge.value, () => {
                         :disable="!caretaker2"
                         :readonly="status != true"
                         dense
-                        s
+                        :rules="
+                          caretaker2
+                            ? [(val) => !!val || 'กรุณาเลือกวันที่']
+                            : []
+                        "
                         borderless
                         :outlined="status == true"
                         class="full-width datepicker"
-                        :model-value="date3 != null ? date2Thai(date3) : null"
+                        :model-value="caretaker2 != null ? date2Thai(date3) : null"
                         label="ลงวันที่"
                       >
                         <template v-slot:prepend>
diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue
index 36ec5d283..e8139c971 100644
--- a/src/modules/06_retirement/components/ListRetirement/TableList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue
@@ -461,12 +461,12 @@ const paginationLabel = (start: number, end: number, total: number) => {
             v-model="fileUpload"
             accept=".pdf"
             :style="fileUpload === null ? 'width: 150px' : 'width: auto'"
-            label="อัพโหลดไฟล์"
+            label="อัปโหลดไฟล์"
             v-if="statusUpload !== true"
           >
             <template v-slot:prepend>
               <q-icon color="light-blue" name="attach_file" />
-              <q-tooltip>อัพโหลดไฟล์</q-tooltip>
+              <q-tooltip>อัปโหลดไฟล์</q-tooltip>
             </template>
           </q-file>
           <q-btn
diff --git a/src/modules/07_insignia/components/1_Proposals/addProposals.vue b/src/modules/07_insignia/components/1_Proposals/addProposals.vue
index a13f8009b..a319bf103 100644
--- a/src/modules/07_insignia/components/1_Proposals/addProposals.vue
+++ b/src/modules/07_insignia/components/1_Proposals/addProposals.vue
@@ -85,12 +85,12 @@ const editData = async (id: string) => {
   formData.append("amount", datelast.value.toString());
   formData.append("round", roundInsig.value.value);
   if (dateStart.value !== null) {
-    formData.append("startDate", dateToISO(dateStart.value));
+    formData.append("StartDate", dateToISO(dateStart.value));
   }
   if (dateEnd.value !== null) {
-    formData.append("endDate", dateToISO(dateEnd.value));
+    formData.append("EndDate", dateToISO(dateEnd.value));
   }
-  formData.append("file", files.value);
+  formData.append("Files", files.value);
   console.log(formData);
   showLoader();
   await http