แก้โหลดไฟล์/วินัยเเก้ เพิ่มฟิล dna

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

@@ -683,6 +683,12 @@ watch(props.data, async () => {
         posTypeName: person.posTypeName,
         posLevelId: person.posLevelId,
         posLevelName: person.posLevelName,
+
+        rootDnaId: person.rootDnaId,
+        child1DnaId: person.child1DnaId,
+        child2DnaId: person.child2DnaId,
+        child3DnaId: person.child3DnaId,
+        child4DnaId: person.child4DnaId,
         citizenId: person.idcard,
       }));
       mainStore.rowsAdd = listDataMain;

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

@@ -375,6 +375,12 @@ async function fetchDatadetail() {
         posTypeName: person.posTypeName,
         posLevelId: person.posLevelId,
         citizenId: person.idcard,
+
+        rootDnaId: person.rootDnaId,
+        child1DnaId: person.child1DnaId,
+        child2DnaId: person.child2DnaId,
+        child3DnaId: person.child3DnaId,
+        child4DnaId: person.child4DnaId,
       }));
       mainStore.rowsAdd = listDataMain;
       mainStore.rowsAddCheck = listDataMain;

src/modules/11_discipline/components/9_DisciplineReport/Main.vue

@@ -58,16 +58,17 @@ const posLevel = ref<string>("");
 const posLevelMainOp = ref<PosLevel[]>([]);
 const posLevelOp = ref<PosLevel[]>(posLevelMainOp.value);
 
-const offenseDetail = ref<string>("");
+const offenseDetail = ref<string>("ALL");
 const offenseDetailOp = ref<DataOption[]>([
-  { id: "", name: "ทั้งหมด" },
+  { id: "ALL", name: "ทั้งหมด" },
   { id: "NOT_SPECIFIED", name: "ยังไม่ระบุ" },
   { id: "NOT_DEADLY", name: "ไม่ร้ายแรง" },
   { id: "DEADLY", name: "ร้ายแรง" },
 ]);
 
-const disciplinaryFaultLevel = ref<string>("");
+const disciplinaryFaultLevel = ref<string>("ALL");
 const disciplinaryFaultLevelOp = ref<DataOptioGroup[]>([
+  { id: "ALL", name: "ทั้งหมด", disable: false },
   { id: "0", name: "ไม่ร้ายแรง", disable: true },
   { id: "ภาคทัณฑ์", name: "ภาคทัณฑ์", disable: false },
   {
@@ -86,9 +87,9 @@ const disciplinaryFaultLevelOp = ref<DataOptioGroup[]>([
   { id: "อื่นๆ", name: "อื่นๆ", disable: false },
 ]);
 
-const status = ref<string>("");
+const status = ref<string>("ALL");
 const statusOp = ref<DataOption[]>([
-  { id: "", name: "ทั้งหมด" },
+  { id: "ALL", name: "ทั้งหมด" },
   { id: "NEW", name: "ใหม่" },
   { id: "SEND_INVESTIGATE", name: "มีมูลส่งไปสืบสวนแล้ว" },
   { id: "INVESTIGATE", name: "กำลังสืบสวน" },
@@ -128,8 +129,8 @@ async function onUpdateFilter() {
     offenseDetail: offenseDetail.value,
     disciplinaryFaultLevel: disciplinaryFaultLevel.value,
     status: status.value,
-    posType: posType.value,
-    posLevel: posLevel.value,
+    posType: posType.value ? posType.value : null,
+    posLevel: posLevel.value ? posLevel.value : null,
   };
   await http
     .post(config.API.disciplineReportByType(employeeClass.value), body)
@@ -297,26 +298,6 @@ onMounted(async () => {
                   /></q-item-section>
                   <q-item-section>ไฟล์ .pdf</q-item-section>
                 </q-item>
-                <q-item
-                  clickable
-                  v-close-popup
-                  @click="
-                    genReport(
-                      detailReport,
-                      `รายชื่อที่กระทำความผิดทางวินัย_${
-                        employeeClass == 'officer'
-                          ? 'ข้าราชการ กทม. สามัญ'
-                          : 'ลูกจ้างประจำ กทม.'
-                      }_${year + 543}`,
-                      'docx'
-                    )
-                  "
-                >
-                  <q-item-section avatar
-                    ><q-icon color="blue" name="mdi-file-word"
-                  /></q-item-section>
-                  <q-item-section>ไฟล์ .docx</q-item-section>
-                </q-item>
                 <q-item
                   clickable
                   v-close-popup

src/modules/11_discipline/store/Main.ts

@@ -430,6 +430,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
    * @param data ข้อมูลรายการบุคคล
    */
   async function fetchData(data: ArrayPersonAdd[], type?: string) {
+    console.log("🚀 ~ fetchData ~ data:", data)
     const dataList: any = data.map((item: any) => ({
       profileType: item.profileType
         ? item.profileType
@@ -468,6 +469,12 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
       posTypeName: item.posTypeName,
       posLevelId: item.posLevelId,
       posLevelName: item.posLevelName,
+
+      rootDnaId:item.rootDnaId,
+      child1DnaId:item.child1DnaId,
+      child2DnaId:item.child2DnaId,
+      child3DnaId:item.child3DnaId,
+      child4DnaId:item.child4DnaId,
     }));
 
     const newItems = dataList.filter(