fix: getColumnLabel posNo

src/modules/18_command/components/Step/Dialog1_AddOperetor.vue

@@ -4,6 +4,7 @@ import { useQuasar, type QTableProps } from "quasar";
 import { usePagination } from "@/composables/usePagination";
 
 import { useCounterMixin } from "@/stores/mixin";
+import { getColumnLabel } from "@/utils/function";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
@@ -64,15 +65,6 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-  {
-    name: "actFullName",
-    align: "left",
-    label: "รักษาการแทน",
-    field: "actFullName",
-    sortable: true,
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
 ]);
 
 const roleName = ref<string>("");
@@ -282,7 +274,7 @@ watch(modal, (newVal) => {
                     :key="col.name"
                     :props="props"
                   >
-                    <span class="text-weight-medium">{{ col.label }}</span>
+                    <span class="text-weight-medium">{{ getColumnLabel(col, isAct) }}</span>
                   </q-th>
                 </q-tr>
               </template>

src/modules/18_command/components/Step/View0_Digital.vue

@@ -7,6 +7,7 @@ import { useRoute, useRouter } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
 import { useCommandDetail } from "@/modules/18_command/store/DetailStore";
 import { usePagination } from "@/composables/usePagination";
+import { getColumnLabel } from "@/utils/function";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
@@ -111,16 +112,6 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-
-  {
-    name: "actFullName",
-    align: "left",
-    label: "รักษาการแทน",
-    sortable: true,
-    field: "actFullName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
 ]);
 
 //รอผู้มีอำนาจลงนามอนุมัติ
@@ -776,7 +767,9 @@ onMounted(async () => {
                     :key="col.name"
                     :props="props"
                   >
-                    <span class="text-weight-medium">{{ col.label }}</span>
+                    <span class="text-weight-medium">{{
+                      getColumnLabel(col, isAct)
+                    }}</span>
                   </q-th>
                 </q-tr>
               </template>