Merge branch 'develop' into dev

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

@@ -249,7 +249,7 @@ const columnsBase = ref<QTableProps["columns"]>([
 ]);
 
 const columns = computed(() =>
-  roleAdmin.value
+  roleAdmin.value || checkPermission(route)?.attrOwnership == "OWNER"
     ? columnsBase.value
     : columnsBase.value?.filter(
         (col) =>
@@ -406,7 +406,8 @@ async function getTable() {
           rowsAll.value.push(rowData);
         });
 
-      const rowData = await (roleAdmin.value
+      const rowData = await (roleAdmin.value ||
+      checkPermission(route)?.attrOwnership == "OWNER"
         ? rowsAll.value
         : rowsAll.value.filter((x: any) => x.isDraft === true));
 
@@ -553,7 +554,10 @@ function getClass(val: boolean) {
  * @param draft status
  */
 function selectData(pid: string, draft: string) {
-  if (roleAdmin.value && draft === "ส่งตัวแล้ว") {
+  if (
+    (roleAdmin.value || checkPermission(route)?.attrOwnership == "OWNER") &&
+    draft === "ส่งตัวแล้ว"
+  ) {
     personalId.value = pid;
     modal.value = true;
     editRow.value = false;
@@ -862,8 +866,12 @@ async function getWorkFlow() {
       const data = await res.data.result;
       DataStore.isOfficer = data.isOfficer;
       DataStore.isStaff = data.isStaff;
-      roleAdmin.value = data.isOfficer;
+      roleAdmin.value =
-      if (roleAdmin.value === false) {
+        data.isOfficer || checkPermission(route)?.attrOwnership == "OWNER";
+      if (
+        roleAdmin.value === false &&
+        checkPermission(route)?.attrOwnership !== "OWNER"
+      ) {
         displayAdd.value = false;
         // visibleColumns.value = [
         //   "position",

src/modules/13_salary/views/04_salaryLists.vue

@@ -570,8 +570,12 @@ onMounted(async () => {
         @update:model-value="onChangeSnap"
         :disable="!isDisable"
       />
+
       <q-select
-        :readonly="checkPermission($route)?.attrOwnership === 'STAFF'"
+        :readonly="
+          checkPermission($route)?.attrOwnership === 'STAFF' &&
+          checkPermission($route)?.attrPrivilege !== 'PARENT'
+        "
         v-model="agencyFilter"
         label="หน่วยงาน"
         lazy-rules
@@ -601,7 +605,8 @@ onMounted(async () => {
         <template
           v-if="
             agencyFilter !== 'ALL' &&
-            checkPermission($route)?.attrOwnership === 'OWNER'
+            (checkPermission($route)?.attrOwnership === 'OWNER' ||
+              checkPermission($route)?.attrPrivilege === 'PARENT')
           "
           v-slot:append
         >

src/modules/13_salary/views/05_salaryListsEmployee.vue

@@ -521,7 +521,10 @@ onMounted(async () => {
         :disable="!isDisable"
       />
       <q-select
-        :readonly="checkPermission($route)?.attrOwnership === 'STAFF'"
+        :readonly="
+          checkPermission($route)?.attrOwnership === 'STAFF' &&
+          checkPermission($route)?.attrPrivilege !== 'PARENT'
+        "
         v-model="agencyFilter"
         label="หน่วยงาน"
         dense
@@ -546,7 +549,8 @@ onMounted(async () => {
         <template
           v-if="
             agencyFilter !== 'ALL' &&
-            checkPermission($route)?.attrOwnership === 'OWNER'
+            (checkPermission($route)?.attrOwnership === 'OWNER' ||
+              checkPermission($route)?.attrPrivilege === 'PARENT')
           "
           v-slot:append
         >

src/modules/18_command/components/Step/2_ListPersons.vue

@@ -149,7 +149,7 @@ const columns = computed<QTableProps["columns"]>(() => {
     props.commandCode === "C-PM-03" ||
     props.commandCode === "C-PM-04"
   ) {
-    return baseColumns.value;
+    return baseColumns.value?.filter((e) => e.name !== "posNo");
   } else if (props.commandCode == "C-PM-40") {
     return baseColumns.value?.filter(
       (e) => e.name !== "position" && e.name !== "positionType"