แก้ตามเทส

src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue

@@ -839,7 +839,7 @@ onMounted(() => {
                 v-model="formDataSalary.posNo"
                 hide-bottom-space
                 :label="`${'ตำแหน่งเลขที่'}`"
-                :rules="[(val: string) => !!val || `${'กรุณากรอกตำแหน่งเลขที่'}`]"
+                :rules="empType !== '-temp'? [(val: string) => !!val || `${'กรุณากรอกตำแหน่งเลขที่'}`]:[]"
               >
               </q-input>
             </div>
@@ -1123,7 +1123,7 @@ onMounted(() => {
                 label="เงินค่าตอบแทนพิเศษ"
                 mask="###,###,###,###"
                 reverse-fill-mask
-                :rules="[(val:string) => !!val || `${'กรุณากรอกเงินค่าตอบแทนพิเศษ'}`]"
+                :rules="empType !== '-temp'? [(val:string) => !!val || `${'กรุณากรอกเงินค่าตอบแทนพิเศษ'}`]:[]"
                 lazy-rules
                 hide-bottom-space
               />
@@ -1191,7 +1191,7 @@ onMounted(() => {
                 :label="`${'เอกสารอ้างอิง'}`"
                 type="textarea"
                 hide-bottom-space
-                :rules="[(val: number) => !!val  || `${'กรุณากรอกเอกสารอ้างอิง'}`]"
+                :rules="empType !== '-temp'? [(val: number) => !!val  || `${'กรุณากรอกเอกสารอ้างอิง'}`]:[]"
               />
             </div>
           </div>

src/modules/11_discipline/components/2_InvestigateFacts/Form.vue

@@ -663,6 +663,7 @@ watch(props.data, async () => {
         isSend: person.isSend,
         isDisciplinary: person.isDisciplinary,
         isAncestorDNA: person.isAncestorDNA,
+        
         root: person.root,
         rootId: person.rootId,
         rootShortName: person.rootShortName,

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

@@ -227,6 +227,7 @@ async function fetchDetailComplaints() {
  * @param data ข้อมูล ใน form
  */
 async function onSubmitDisciplinary(data: any) {
+  console.log("🚀 ~ onSubmitDisciplinary ~ data:", data)
   showLoader();
   await http
     .put(config.API.disciplineDisciplinaryById(id.value), data)

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

@@ -352,6 +352,27 @@ async function fetchDatadetail() {
         status: person.status,
         statusDiscard: person.statusDiscard,
         isAncestorDNA: person.isAncestorDNA,
+
+        root: person.root,
+        rootId: person.rootId,
+        rootShortName: person.rootShortName,
+        child1: person.child1,
+        child1Id: person.child1Id,
+        child1ShortName: person.child1ShortName,
+        child2: person.child2,
+        child2Id: person.child2Id,
+        child2ShortName: person.child2ShortName,
+        child3: person.child3,
+        child3Id: person.child3Id,
+        child3ShortName: person.child3ShortName,
+        child4: person.child4,
+        child4Id: person.child4Id,
+        child4ShortName: person.child4ShortName,
+        posMasterNo: person.posMasterNo,
+        posTypeId: person.posTypeId,
+        posTypeName: person.posTypeName,
+        posLevelId: person.posLevelId,
+        citizenId: person.idcard,
       }));
       mainStore.rowsCheck = mainStore.rowsAdd.filter(
         (item: any) => item.isSuspend === "NEW" && item.isSend === "NEW"
@@ -398,8 +419,8 @@ function returnCount(num: number) {
   countNum.value = num;
 }
 
-async function addPerson(data: any,type?:string) {
+async function addPerson(data: any, type?: string) {
-  await mainStore.fetchData(data,type);
+  await mainStore.fetchData(data, type);
   changeFormData();
   toggleModal();
 }

src/modules/16_positionEmployee/components/DialogSortPosition.vue

@@ -108,7 +108,7 @@ function getData() {
           item.posMasterNoPrefix ? item.posMasterNoPrefix : ""
         }${item.posMasterNo ? item.posMasterNo : ""}${
           item.posMasterNoSuffix ? item.posMasterNoSuffix : ""
-        } ${item.fullNameNextHolder ? item.fullNameNextHolder : ""}`,
+        } ${item.fullNameCurrentHolder ? item.fullNameCurrentHolder : ""}`,
         posMasterNoPrefix: item.posMasterNoPrefix,
         posMasterNo: item.posMasterNo,
         posMasterNoSuffix: item.posMasterNoSuffix,