src/modules/01_metadata/components/position-employee/GroupDetail.vue

@@ -51,18 +51,9 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "posLevelName",
     align: "left",
-    label: "ชั้นงาน",
-    sortable: true,
-    field: "posLevelName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posLevelRank",
-    align: "left",
     label: "ระดับชั้นงาน",
     sortable: true,
-    field: "posLevelRank",
+    field: "posLevelName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -125,7 +116,6 @@ const columns = ref<QTableProps["columns"]>([
 const visibleColumns = ref<string[]>([
   "no",
   "posLevelName",
-  "posLevelRank",
   "posTypeName",
   "posLevelAuthority",
   "createdAt",
@@ -140,10 +130,9 @@ const isStatusEdit = ref<boolean>(false); // สถานะแก่ไขข
 const modalDialog = ref<boolean>(false); // popup
 // ฟอร์มระดับชั้นงาน
 const formDataLevel = reactive<FormDataLevel>({
-  posLevelName: "",
+  posLevelName: null,
   posTypeName: "",
   posLevelAuthority: "",
-  posLevelRank: null,
 });
 
 /**
@@ -181,7 +170,7 @@ async function fetchData() {
  */
 function onClickOpenDialog(
   statusEdit: boolean = false,
-  data: DataGroup = {} as DataGroup,
+  data: DataGroup = {} as DataGroup
 ) {
   isStatusEdit.value = statusEdit;
   modalDialog.value = true;
@@ -191,7 +180,6 @@ function onClickOpenDialog(
     formDataLevel.posLevelName = data.posLevelName;
     formDataLevel.posTypeName = titleName.value;
     formDataLevel.posLevelAuthority = data.posLevelAuthority;
-    formDataLevel.posLevelRank = data.posLevelRank;
   } else {
     formDataLevel.posTypeName = titleName.value ? titleName.value : "";
   }
@@ -203,10 +191,9 @@ function onClickOpenDialog(
  */
 function onClickCloseDialog() {
   modalDialog.value = false;
-  formDataLevel.posLevelName = "";
+  formDataLevel.posLevelName = null;
   formDataLevel.posTypeName = "";
   formDataLevel.posLevelAuthority = "";
-  formDataLevel.posLevelRank = null;
 }
 
 /**
@@ -219,9 +206,9 @@ function onSubmit() {
   dialogConfirm($q, async () => {
     showLoader();
     const body = {
-      posLevelName: formDataLevel.posLevelName,
+      posLevelName: Number(formDataLevel.posLevelName),
       posTypeId: posTypeId.value,
-      posLevelRank: Number(formDataLevel.posLevelRank),
+      posLevelRank: Number(formDataLevel.posLevelName),
       posLevelAuthority: formDataLevel.posLevelAuthority,
     };
     // กำหนด Phat APi
@@ -281,7 +268,7 @@ function serchDataTable() {
   rows.value = onSearchDataTable(
     filter.value,
     rowsMain.value,
-    columns.value ? columns.value : [],
+    columns.value ? columns.value : []
   );
 }
 
@@ -425,13 +412,15 @@ onMounted(() => {
               outlined
               ref="posLevelNameRef"
               v-model="formDataLevel.posLevelName"
-              label="ชั้นงาน"
+              label="ระดับชั้นงาน"
               dense
               lazy-rules
               borderless
               bg-color="white"
               hide-bottom-space
-              :rules="[(val:string) => !!val || 'กรุณากรอกชั้นงาน']"
+              mask="#"
+              reverse-fill-mask
+              :rules="[(val:string) => !!val || 'กรุณากรอกระดับชั้นงาน']"
               class="inputgreen"
             />
           </div>
@@ -460,7 +449,7 @@ onMounted(() => {
             <q-select
               ref="posTypeIdRef"
               v-model="formDataLevel.posTypeName"
-              label="กลุ่มงาน"
+              label="ระดับชั้นงาน"
               outlined
               dense
               bg-color="white"
@@ -468,24 +457,6 @@ onMounted(() => {
               readonly
             />
           </div>
-
-          <div class="col-12">
-            <q-input
-              outlined
-              ref="posLevelNameRef"
-              v-model="formDataLevel.posLevelRank"
-              label="ระดับชั้นงาน"
-              dense
-              lazy-rules
-              borderless
-              bg-color="white"
-              hide-bottom-space
-              mask="#"
-              reverse-fill-mask
-              :rules="[(val:string) => !!val || 'กรุณากรอกระดับชั้นงาน']"
-              class="inputgreen"
-            />
-          </div>
         </q-card-section>
         <q-separator />
         <q-card-actions align="right">

src/modules/01_metadata/interface/index/positionEmployee.ts

@@ -28,7 +28,7 @@ interface FormQuery {
 interface DataGroup {
   id: string;
   posLevelAuthority: string;
-  posLevelName: string;
+  posLevelName: number;
   posLevelRank: number;
   posTypeName: string;
 }

src/modules/01_metadata/interface/request/positionEmployee.ts

@@ -5,10 +5,9 @@ interface FrmDataGroup {
 }
 
 interface FormDataLevel {
-  posLevelName: string;
+  posLevelName: number | null;
   posTypeName: string | null;
   posLevelAuthority: string;
-  posLevelRank: number | null;
 }
 
 export type { FrmDataGroup, FormDataLevel };