Merge branch 'develop' into dev

* develop:
  fix:bug close Dialog
  fix:filter posMasterNo

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

@@ -141,7 +141,7 @@ const visibleColumnslist = ref<any>([
 ]);
 
 /**หัวตาราง */
-const columns = ref<QTableProps["columns"]>([
+const columnsBase = ref<QTableProps["columns"]>([
   {
     name: "no",
     align: "center",
@@ -178,7 +178,7 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo}) `;
+      return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName} ${row.posMasterNo}) `;
     },
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
@@ -247,6 +247,17 @@ const columns = ref<QTableProps["columns"]>([
   },
 ]);
 
+const columns = computed(() =>
+  roleAdmin.value
+    ? columnsBase.value
+    : columnsBase.value?.filter(
+        (col) =>
+          col.name !== "no" &&
+          col.name !== "draft" &&
+          col.name !== "refCommandNo"
+      )
+);
+
 /**
  * แปลงสถานะพนักงาน
  * @param val type
@@ -539,6 +550,7 @@ function selectData(pid: string, draft: string) {
   if (roleAdmin.value && draft === "ส่งตัวแล้ว") {
     personalId.value = pid;
     modal.value = true;
+    editRow.value = false;
   } else {
     router.push("/placement/personal-detail/" + pid);
   }
@@ -819,18 +831,18 @@ async function getWorkFlow() {
       roleAdmin.value = data.isOfficer;
       if (roleAdmin.value === false) {
         displayAdd.value = false;
-        visibleColumns.value = [
+        // visibleColumns.value = [
-          "position",
+        //   "position",
-          "fullName",
+        //   "fullName",
-          "examNumber",
+        //   "examNumber",
-          "idCard",
+        //   "idCard",
-          "positionNumber",
+        //   "positionNumber",
-          "organizationName",
+        //   "organizationName",
-          "reportingDate",
+        //   "reportingDate",
-          "bmaOfficer",
+        //   "bmaOfficer",
-          "statusName",
+        //   "statusName",
-          "positionCandidate",
+        //   "positionCandidate",
-        ];
+        // ];
       }
     })
     .catch((e) => {