diff --git a/src/modules/02_organizationalNew/components/DialogFormAgency.vue b/src/modules/02_organizationalNew/components/DialogFormAgency.vue
index 86ca5cfc0..13b06dc8d 100644
--- a/src/modules/02_organizationalNew/components/DialogFormAgency.vue
+++ b/src/modules/02_organizationalNew/components/DialogFormAgency.vue
@@ -218,6 +218,15 @@ watch(
   () => {
     if (props.modal === true) {
       if (actionType.value === "ADD") {
+        console.log(props.dataNode);
+
+        if (props.dataNode) {
+          formData.orgCode =
+            props?.dataNode?.orgLevel !== 0
+              ? props?.dataNode.orgTreeCode
+              : undefined;
+        }
+
         if (level.value === 0) {
           formData.orgLevel = "DEPARTMENT";
           orgLevelOption.value = orgLevelOptionMain.value;
@@ -230,15 +239,17 @@ watch(
           formData.orgName = props.dataNode.orgTreeName;
           formData.orgShortName = props.dataNode.orgTreeShortName;
           formData.orgCode = props.dataNode.orgTreeCode;
+
           formData.orgPhoneEx = props.dataNode.orgTreePhoneEx;
           formData.orgPhoneIn = props.dataNode.orgTreePhoneIn;
           formData.orgFax = props.dataNode.orgTreeFax;
           formData.orgLevel = props.dataNode.orgTreeRank;
+          formData.orgLevelSub = props.dataNode.orgTreeRankSub;
           orgLevelOption.value =
             props.dataNode.orgTreeRank === "DEPARTMENT"
               ? orgLevelOptionMain.value
               : orgLevelOptionMain.value.slice(1, 4);
-          selectOrgLevele(formData.orgLevel);
+          selectOrgLevele(formData.orgLevel, false);
         }
       }
     }
@@ -256,8 +267,8 @@ const tittleName = computed(() => {
   return name;
 });
 
-function selectOrgLevele(val: string) {
-  formData.orgLevelSub = "";
+function selectOrgLevele(val: string, status: boolean = true) {
+  formData.orgLevelSub = status ? "" : formData.orgLevelSub;
   switch (val) {
     case "OFFICE":
       orgLevelSubOptionMain.value = [
@@ -339,6 +350,10 @@ function selectOrgLevele(val: string) {
               </div>
               <div class="col-2">
                 <q-input
+                  :readonly="
+                    (actionType === 'ADD' && props?.dataNode?.orgLevel !== 0) ||
+                    (actionType === 'EDIT' && props?.dataNode?.orgLevel > 1)
+                  "
                   mask="##"
                   v-model="formData.orgCode"
                   ref="orgCodeRef"
diff --git a/src/modules/13_salary/components/salaryEmployeeChart/DialogEmployeeRate.vue b/src/modules/13_salary/components/salaryEmployeeChart/DialogEmployeeRate.vue
index 0a0aad81c..e981ae5f2 100644
--- a/src/modules/13_salary/components/salaryEmployeeChart/DialogEmployeeRate.vue
+++ b/src/modules/13_salary/components/salaryEmployeeChart/DialogEmployeeRate.vue
@@ -176,12 +176,12 @@ watch(
                 dense
                 outlined
                 v-model="formData.salaryMonth"
-                label="อัตราค่าจ้าง/ชั้นวิ่ง (รายเดือน)"
+                label="อัตราค่าจ้าง/ขั้นวิ่ง (รายเดือน)"
                 mask="###,###,###,###"
                 reverse-fill-mask
                 :rules="[
                   (val) =>
-                    !!val || `${'กรุณากรอกอัตราค่าจ้าง/ชั้นวิ่ง (รายเดือน)'}`,
+                    !!val || `${'กรุณากรอกอัตราค่าจ้าง/ขั้นวิ่ง (รายเดือน)'}`,
                 ]"
                 lazy-rules
                 hide-bottom-space
@@ -193,14 +193,14 @@ watch(
                 dense
                 outlined
                 v-model="formData.salaryDay"
-                label="อัตราค่าจ้าง/ชั้นวิ่ง (รายวัน)"
+                label="อัตราค่าจ้าง/ขั้นวิ่ง (รายวัน)"
                 mask="###,###,###,###"
                 reverse-fill-mask
                 lazy-rules
                 hide-bottom-space
                 :rules="[
                   (val) =>
-                    !!val || `${'กรุณากรอกอัตราค่าจ้าง/ชั้นวิ่ง (รายวัน)'}`,
+                    !!val || `${'กรุณากรอกอัตราค่าจ้าง/ขั้นวิ่ง (รายวัน)'}`,
                 ]"
               />
             </div>
diff --git a/src/modules/13_salary/views/salaryEmployeeRate.vue b/src/modules/13_salary/views/salaryEmployeeRate.vue
index 232077275..6f8ddec54 100644
--- a/src/modules/13_salary/views/salaryEmployeeRate.vue
+++ b/src/modules/13_salary/views/salaryEmployeeRate.vue
@@ -36,7 +36,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "step",
     align: "left",
     label: "ลำดับขั้น",
-    sortable: true,
+    sortable: false,
     field: "step",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -44,20 +44,34 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "salaryMonth",
     align: "left",
-    label: "อัตราค่าจ้าง/ชั้นวิ่ง (รายเดือน)",
-    sortable: true,
+    label: "อัตราค่าจ้าง/ขั้นวิ่ง (รายเดือน)",
+    sortable: false,
     field: "salaryMonth",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (val) =>
+      val.toLocaleString("en", {
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 2,
+      }),
   },
   {
     name: "salaryDay",
     align: "left",
-    label: "อัตราค่าจ้าง/ชั้นวิ่ง (รายวัน)",
-    sortable: true,
+    label: "อัตราค่าจ้าง/ขั้นวิ่ง (รายวัน)",
+    sortable: false,
     field: "salaryDay",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    // sort: (a: number) => a.toLocaleString("en", {
+    //                     minimumFractionDigits: 2,
+    //                     maximumFractionDigits: 2,
+    //                   }),
+    format: (val) =>
+      val.toLocaleString("en", {
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 2,
+      }),
   },
 ]);
 const rows = ref<EmployeeRateSalary[]>([]);
@@ -294,13 +308,7 @@ onMounted(() => {
         <template v-slot:body="props">
           <q-tr :props="props" class="cursor-pointer">
             <q-td v-for="col in props.cols" :key="col.name" :props="props">
-              <div v-if="col.name === 'salaryMonth'">
-                {{ col.value ? col.value.toLocaleString() : "-" }}
-              </div>
-              <div v-else-if="col.name === 'salaryDay'">
-                {{ col.value ? col.value.toLocaleString() : "-" }}
-              </div>
-              <div v-else>{{ col.value ? col.value : "-" }}</div>
+              {{ col.value ? col.value : "-" }}
             </q-td>
             <q-td v-if="!isActive">
               <q-btn