แก้วินัย

src/modules/11_discipline/components/3_InvestigateDisciplinary/AddPage.vue

@@ -5,7 +5,6 @@ const router = useRouter();
 
 /** บันทึกข้อมูลเเละ route กลับหน้าหลัก */
 const onSubmit = async () => {
-  console.log("add");
   router.push(`/discipline/disciplinary`);
 };
 </script>

src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue

@@ -220,9 +220,50 @@ async function fetchDetailComplaints() {
  * @param data ข้อมูล ใน form
  */
 async function onSubmitDisciplinary(data: any) {
+  console.log(data);
   showLoader();
   await http
-    .put(config.API.disciplineDisciplinaryById(id.value), data)
+    .put(config.API.disciplineDisciplinaryById(id.value), {
+      respondentType:data.respondentType ,
+      organizationId:data.organizationId ,
+      disciplinaryDateAllegation:data.disciplinaryDateAllegation ,
+      disciplinaryDateEvident:data.disciplinaryDateEvident ,
+      disciplinaryCaseFault:data.disciplinaryCaseFault ,
+      disciplinaryInvestigateAt:data.disciplinaryInvestigateAt ,
+      disciplinaryFaultLevel:data.disciplinaryFaultLevel ,
+      disciplinaryRefLaw:data.disciplinaryRefLaw ,
+      disciplinarySummaryEvidence:data.disciplinarySummaryEvidence ,
+      disciplinaryRecordAccuser:data.disciplinaryRecordAccuser ,
+      disciplinaryWitnesses:data.disciplinaryWitnesses ,
+      result:data.result ,
+      directors: data.directors,
+      persons: data.persons.map((item: any) => (
+        {
+          id:item.id ,
+          idcard:item.idcard ,
+          name:item.name ,
+          prefix:item.prefix ,
+          firstName:item.firstName ,
+          lastName:item.lastName ,
+          position:item.position === "-" ? null:item.position,
+          positionLevel:item.positionLevel === "-" ? null:item.positionLevel,
+          salary:item.salary === "-" ? null:item.salary,
+          personId:item.personId ,
+          posNo:item.posNo === "-" ? null:item.posNo,
+          organization:item.organization ,
+        })),
+      extendStatus:data.extendStatus ,
+      disciplinaryDateStart:data.disciplinaryDateStart ,
+      disciplinaryDateEnd:data.disciplinaryDateEnd ,
+      daysExtend:data.daysExtend ,
+      disciplinaryDateInvestigation:data.disciplinaryDateInvestigation ,
+      disciplinaryDateResult:data.disciplinaryDateResult ,
+      disciplinaryStatusResult:data.disciplinaryStatusResult ,
+      disciplinaryCauseText:data.disciplinaryCauseText ,
+      disciplinaryResult:data.disciplinaryResult ,
+      disciplinaryExtendHistory:data.disciplinaryExtendHistory ,
+      disciplinaryFaultLevelOther:data.disciplinaryFaultLevelOther ,
+    })
     .then(async () => {
       await fetchDetailDisciplinary();
       success($q, "บันทึกข้อมูลสำเร็จ");

src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue

@@ -240,32 +240,29 @@ async function calEndDate(val: string) {
  * หากยกเลิกจะกลับไปหน้าฟอร์ม
  */
 function onSubmit() {
-  dialogConfirm(
-    $q,
-    async () => {
-      if (
-        formData.disciplinaryDateStart !== null &&
-        formData.disciplinaryDateEnd !== null
-      ) {
-        const disciplinaryDateStart = new Date(formData.disciplinaryDateStart);
-        const disciplinaryDateEnd = new Date(formData.disciplinaryDateEnd);
+  dialogConfirm($q, async () => {
+    if (
+      formData.disciplinaryDateStart !== null &&
+      formData.disciplinaryDateEnd !== null
+    ) {
+      const disciplinaryDateStart = new Date(formData.disciplinaryDateStart);
+      const disciplinaryDateEnd = new Date(formData.disciplinaryDateEnd);
 
-        formData.disciplinaryDateStart = moment(disciplinaryDateStart).format(
-          "YYYY-MM-DD"
-        );
-        formData.disciplinaryDateEnd =
-          moment(disciplinaryDateEnd).format("YYYY-MM-DD");
-      }
-
-      if (mainStore.rowsAdd) {
-        formData.persons = mainStore.rowsAdd;
-      }
-
-      emit("submit:disciplinary", formData);
-      isSave.value = false;
-      extendStatus.value = false;
+      formData.disciplinaryDateStart = moment(disciplinaryDateStart).format(
+        "YYYY-MM-DD"
+      );
+      formData.disciplinaryDateEnd =
+        moment(disciplinaryDateEnd).format("YYYY-MM-DD");
     }
-  );
+
+    if (mainStore.rowsAdd) {
+      formData.persons = mainStore.rowsAdd;
+    }
+
+    emit("submit:disciplinary", formData);
+    isSave.value = false;
+    extendStatus.value = false;
+  });
 }
 
 /** ฟังชั่นลบข้อมูลกรรมการ */
@@ -321,14 +318,48 @@ async function fetchDatadetail() {
       disciplineDisciplinary_DocRelevants.value =
         props.data.disciplineDisciplinary_DocRelevants;
 
-      investigateDis.rowSent = formData.persons;
+      investigateDis.rowSent = formData.persons.map((person: any) => ({
+        id: person.id,
+        idcard: person.idcard,
+        name: person.name,
+        prefix: person.prefix,
+        firstName: person.firstName,
+        lastName: person.lastName,
+        position: person.position === null ? '-':person.position,
+        positionLevel: person.positionLevel === null ? '-':person.positionLevel,
+        salary: person.salary === null ? '-':person.salary,
+        personId: person.personId,
+        posNo: person.posNo === null ? '-':person.posNo,
+        organization: person.organization,
+        isSend: person.isSend,
+        isSuspend: person.isSuspend,
+        status: person.status,
+        statusDiscard: person.statusDiscard,
+      }));
 
       formData.disciplinaryStatusResult = props.data.disciplinaryStatusResult;
       formData.disciplinaryCauseText = props.data.disciplinaryCauseText;
       formData.disciplinaryResult = props.data.disciplinaryResult;
       formData.disciplinaryExtendHistory = props.data.disciplinaryExtendHistory;
 
-      mainStore.rowsAdd = props.data.persons;
+      mainStore.rowsAdd = props.data.persons.map((person: any) => ({
+        id: person.id,
+        idcard: person.idcard,
+        name: person.name,
+        prefix: person.prefix,
+        firstName: person.firstName,
+        lastName: person.lastName,
+        position: person.position === null ? '-':person.position,
+        positionLevel: person.positionLevel === null ? '-':person.positionLevel,
+        salary: person.salary === null ? '-':person.salary,
+        personId: person.personId,
+        posNo: person.posNo === null ? '-':person.posNo,
+        organization: person.organization,
+        isSend: person.isSend,
+        isSuspend: person.isSuspend,
+        status: person.status,
+        statusDiscard: person.statusDiscard,
+      }));
       mainStore.rowsCheck = mainStore.rowsAdd.filter(
         (item: any) => item.isSuspend === "NEW" && item.isSend === "NEW"
       );
@@ -372,12 +403,10 @@ async function fetchDatadetail() {
 
 function returnCount(num: number) {
   countNum.value = num;
-  console.log(countNum.value);
 }
 
 async function addPerson(data: any) {
   await mainStore.fetchData(data);
-  toggleModal();
 }
 
 /**
@@ -566,7 +595,6 @@ function emitPerson(data: PersonsArray[]) {
 }
 
 function openEditDirector(data: any) {
-  console.log(data);
   editDirectorId.value = data.idRaw;
   modalEditDirector.value = true;
   dutyVal.value = data.duty;