Merge branch 'develop' into devTee

src/modules/05_placement/components/PersonalList/Table.vue

@@ -93,7 +93,6 @@ const dataInfo = reactive({
   reliefDoc: "",
 });
 
-
 const examId = route.params.examId;
 const examIdString = Array.isArray(examId) ? examId[0] : examId;
 const personalId = ref<string>("");
@@ -315,6 +314,7 @@ async function getTable() {
             examNumber: data.examNumber,
             root: data.root,
             rootId: data.rootId,
+            rootIdOld: data.rootIdOld, // หน่วยงานเดิม
             rootShortName: data.rootShortName,
             child1: data.child1,
             child1Id: data.child1Id,
@@ -745,11 +745,20 @@ function openModalOrder(val: boolean) {
   // ยังไม่ได้ดัก ส่ง ไป ทั้ง object #e.draft == "รอส่งตัว" &&
   rowsOrder.value = rows.value.filter(
     (e: any) =>
-      e.draft == "ส่งตัวแล้ว" &&
-      e.nodeName !== null &&
-      e.reportingDate !== null &&
-      e.statusId !== "REPORT" &&
-      e.statusId !== "DONE"
+      (DataStore.isStaff &&
+        (e.rootId == e.rootIdOld || e.bmaOfficer == "บุคคลภายนอก") &&
+        e.draft == "ส่งตัวแล้ว" &&
+        e.nodeName !== null &&
+        e.reportingDate !== null &&
+        e.statusId !== "REPORT" &&
+        e.statusId !== "DONE") ||
+      (DataStore.isOfficer &&
+        e.rootId != e.rootIdOld &&
+        e.draft == "ส่งตัวแล้ว" &&
+        e.nodeName !== null &&
+        e.reportingDate !== null &&
+        e.statusId !== "REPORT" &&
+        e.statusId !== "DONE")
   );
   modalOrder.value = val;
 }
@@ -810,9 +819,9 @@ async function getWorkFlow() {
     .finally(() => {});
 }
 
-function onclickViewinfo(id:string) {
+function onclickViewinfo(id: string) {
   modalPersonal.value = true;
-  personalId.value = id
+  personalId.value = id;
 }
 
 function updatemodalPersonal(modal: boolean) {

src/modules/07_insignia/interface/index/Main.ts

@@ -109,6 +109,7 @@ interface DataRecord {
   prefix: string;
   position: string;
   status: string;
+  statusMain: string;
   dateReceive: string | Date | null;
   name: string;
   type: string;

src/modules/07_insignia/storeResult.ts

@@ -84,8 +84,6 @@ export const useResultDataStore = defineStore("insigniaResult", () => {
    * @param data รายชื่อข้าราชการสามัญฯ
    */
   async function fetchlistinsignia(data: ResponseRecordLists[]) {
-    console.log(data);
-
     rows.value = [];
     const alllist = await data.map((e: ResponseRecordLists) => ({
       id: e.id,
@@ -93,6 +91,7 @@ export const useResultDataStore = defineStore("insigniaResult", () => {
       prefix: e.prefix,
       position: e.position,
       status: status(e.status) ?? "",
+      statusMain: e.status,
       dateReceive: date2Thai(e.dateReceive),
       name: e.fullName,
       type: `${e.requestInsignia} (${

src/modules/07_insignia/views/03_ResultMain.vue

@@ -69,12 +69,6 @@ const dataModal = ref<DataPerson>(); //ช้อมูลที่ต้อง
 const filterRef = ref<QInput>();
 const filter = ref<string>("");
 const columns = ref<QTableProps["columns"]>([
-  // {
-  //   name: "action",
-  //   align: "left",
-  //   label: "",
-  //   field: "",
-  // },
   {
     name: "no",
     align: "left",
@@ -229,7 +223,6 @@ const visibleColumns = ref<String[]>([
   "dateReceive",
   "date",
   "employeeType",
-  " ",
   "section",
   "page",
   "number",
@@ -909,7 +902,8 @@ onMounted(() => {
                   <q-btn
                     v-if="
                       checkPermission($route)?.attrIsGet &&
-                      checkPermission($route)?.attrIsUpdate
+                      checkPermission($route)?.attrIsUpdate &&
+                      props.row.statusMain === 'DONE'
                     "
                     flat
                     round