diff --git a/src/api/18_command/api.command.ts b/src/api/18_command/api.command.ts
index d986ff9b2..9bf159f39 100644
--- a/src/api/18_command/api.command.ts
+++ b/src/api/18_command/api.command.ts
@@ -25,6 +25,4 @@ export default {
 
   //Digital Signature
   commandDirector: `${env.API_URI}/org/profile/commander-director`,
-
-  commandEditSalary: `${command}/tab2/edit-salary`,
 };
diff --git a/src/components/CurruncyInput.vue b/src/components/CurruncyInput.vue
index e2b2f3ae0..9386d093e 100644
--- a/src/components/CurruncyInput.vue
+++ b/src/components/CurruncyInput.vue
@@ -44,7 +44,7 @@ const { inputRef, formattedValue, setValue } = useCurrencyInput({
   currency: "THB",
   currencyDisplay: "hidden" as any,
   hideCurrencySymbolOnFocus: true,
-  hideGroupingSeparatorOnFocus: false,
+  hideGroupingSeparatorOnFocus: true,
   hideNegligibleDecimalDigitsOnFocus: true,
   autoDecimalDigits: false,
   useGrouping: true,
diff --git a/src/modules/05_placement/components/PersonalList/DialogOrders.vue b/src/modules/05_placement/components/PersonalList/DialogOrders.vue
index 8ac613a5f..253a7cf7f 100644
--- a/src/modules/05_placement/components/PersonalList/DialogOrders.vue
+++ b/src/modules/05_placement/components/PersonalList/DialogOrders.vue
@@ -346,7 +346,7 @@ watch(
                   keep-color
                   color="primary"
                   dense
-                  :disable="commandType ? false : true"
+                  :disable="commandType"
                   v-model="scope.selected"
                 />
               </template>
@@ -357,7 +357,7 @@ watch(
                       keep-color
                       color="primary"
                       dense
-                      :disable="commandType ? false : true"
+                      :disable="commandType"
                       v-model="props.selected"
                     />
                   </q-td>
diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index 0d7776b28..931a67feb 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -774,6 +774,7 @@ function onSubmitDate() {
  */
 function openModalOrder(val: boolean) {
   // ยังไม่ได้ดัก ส่ง ไป ทั้ง object #e.draft == "รอส่งตัว" &&
+  console.log(rowsOrder.value);
 
   rowsOrder.value = rows.value.filter(
     (e: any) =>
diff --git a/src/modules/15_development/components/ProjectDetail.vue b/src/modules/15_development/components/ProjectDetail.vue
index 8ed60030f..4847fa233 100644
--- a/src/modules/15_development/components/ProjectDetail.vue
+++ b/src/modules/15_development/components/ProjectDetail.vue
@@ -1015,7 +1015,6 @@ defineExpose({
                 v-model="formData.projectModalPlanned"
                 label="จำนวน (รุ่น)"
                 mask="#"
-                maxlength="5"
                 reverse-fill-mask
                 class="inputgreen"
                 @update:model-value="props.onCheckChangeData()"
@@ -1199,7 +1198,6 @@ defineExpose({
                     v-model="formData.projectModalActual"
                     label="จำนวน (รุ่น)"
                     mask="#"
-                    maxlength="5"
                     reverse-fill-mask
                     @update:model-value="props.onCheckChangeData()"
                   />
diff --git a/src/modules/15_development/components/Target.vue b/src/modules/15_development/components/Target.vue
index 360cd4b26..73085fc29 100644
--- a/src/modules/15_development/components/Target.vue
+++ b/src/modules/15_development/components/Target.vue
@@ -222,7 +222,6 @@ const columnsPlannedGoals = ref<QTableProps["columns"]>([
     align: "left",
     label: "จำนวน(คน)",
     sortable: true,
-    format: (val) => Number(val).toLocaleString("th-TH"),
     field: "amount",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -265,9 +264,9 @@ const columnsActualGoals = ref<QTableProps["columns"]>([
     label: "จำนวน(คน)",
     sortable: true,
     field: "amount",
-    format: (val) => Number(val).toLocaleString("th-TH"),
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (val) => Number(val),
   },
 ]);
 
@@ -291,7 +290,7 @@ const columnsRelated = ref<QTableProps["columns"]>([
     field: "amount",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (val) => Number(val).toLocaleString("th-TH"),
+    format: (val) => Number(val),
   },
 ]);
 
@@ -1204,7 +1203,6 @@ onMounted(() => {
                 v-model="formGroupTarget.amount"
                 label="จำนวน(คน)"
                 mask="#"
-                maxlength="5"
                 reverse-fill-mask
                 :rules="[
               (val:string) =>
@@ -1354,7 +1352,6 @@ onMounted(() => {
                 v-model="formGroupTarget.amount"
                 label="จำนวน(คน)"
                 mask="#"
-                maxlength="5"
                 reverse-fill-mask
                 :rules="[
               (val:string) =>
@@ -1549,7 +1546,6 @@ onMounted(() => {
                 v-model="formGroupRelate.amount"
                 label="จำนวน(คน)"
                 mask="#"
-                maxlength="5"
                 reverse-fill-mask
                 :rules="[
             (val:string) =>
diff --git a/src/modules/18_command/components/DialogCreateCommand.vue b/src/modules/18_command/components/DialogCreateCommand.vue
index c2928197c..d29ce53f6 100644
--- a/src/modules/18_command/components/DialogCreateCommand.vue
+++ b/src/modules/18_command/components/DialogCreateCommand.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watch, computed, type PropType } from "vue";
+import { ref, watch } from "vue";
 import { useQuasar } from "quasar";
 
 import http from "@/plugins/http";
@@ -19,7 +19,6 @@ import type {
 import type { DataListCommand } from "@/modules/18_command/interface/response/Main";
 
 import DialogHeader from "@/components/DialogHeader.vue";
-import DialogEditSalary from "@/modules/18_command/components/DialogEditSalary.vue";
 
 const storeCommand = useCommandMainStore();
 const router = useRouter();
@@ -44,10 +43,6 @@ const props = defineProps({
   },
 });
 
-const isSalary = computed(() => {
-  return !!commandOp.value.find((v) => v.id == commandType.value)?.isSalary;
-});
-
 const commandOp = ref<ListCommand[]>([]); // ประเภทคำสั่ง
 const commandType = ref<string>(""); //ประเภทคำสั่ง
 const commandNo = ref<string>(""); //คำสั่งเลขที่
@@ -135,9 +130,6 @@ const columns = ref<QTableProps["columns"]>([
 
 const selectCreate = ref<string | null>("NEW"); //ประเภทการออกคำสั่ง สร้างใหม่/คำสั่งแบบร่าง
 
-const modalSalary = ref<boolean>(false); //
-const commandOrderId = ref<string>(""); // ไอดีคำสั่งที่สร้างหรือเพิ่มคนเข้าไป
-
 /** ฟังก์ชันเรียกข้อมูลรายการคำสั่ง*/
 async function getListCommandDraf() {
   showLoader();
@@ -199,18 +191,12 @@ function createCommand(isRedirect: boolean) {
       .post(config.API.command + `/person`, body)
       .then(async (res) => {
         const id = await res.data.result;
-        commandOrderId.value = id;
         modal.value = false;
-        if (!isSalary.value) {
-          if (isRedirect) {
-            router.push(`/command/edit/${id}`);
-          } else {
-            clearValue();
-            props.fetchData(); // เรียกฟังก์ชัน fetchData ที่ส่งมาจาก props เพื่อรีเฟรชข้อมูล
-          }
+        if (isRedirect) {
+          router.push(`/command/edit/${id}`);
         } else {
-          modal.value = false;
-          modalSalary.value = true;
+          clearValue();
+          await props.fetchData(); // เรียกฟังก์ชัน fetchData ที่ส่งมาจาก props เพื่อรีเฟรชข้อมูล
         }
       })
       .catch((e) => {
@@ -251,18 +237,12 @@ function addPersonalToCommand(isRedirect: boolean) {
       .post(config.API.command + `/person`, body)
       .then(async (res) => {
         const id = await res.data.result;
-        commandOrderId.value = id;
         modal.value = false;
-        if (!isSalary.value) {
-          if (isRedirect) {
-            router.push(`/command/edit/${id}`);
-          } else {
-            modal.value = false;
-            props.fetchData(); // เรียกฟังก์ชัน fetchData ที่ส่งมาจาก props เพื่อรีเฟรชข้อมูล
-          }
+        if (isRedirect) {
+          router.push(`/command/edit/${id}`);
         } else {
           modal.value = false;
-          modalSalary.value = true;
+          await props.fetchData(); // เรียกฟังก์ชัน fetchData ที่ส่งมาจาก props เพื่อรีเฟรชข้อมูล
         }
       })
       .catch((e) => {
@@ -589,7 +569,7 @@ watch(
 
       <q-card-actions align="right">
         <q-btn
-          v-if="isHold && !isSalary"
+          v-if="isHold"
           label="บันทึกและเลือกรายชื่อต่อ"
           @click="() => onSubmit(false)"
           :disable="
@@ -600,9 +580,7 @@ watch(
           <q-tooltip>บันทึกและเลือกรายชื่อต่อ</q-tooltip>
         </q-btn>
         <q-btn
-          :label="
-            !isSalary ? 'บันทึกและไปยังหน้าคำสั่ง' : 'บันทึกและไปยังหน้าแก้ไขเงินเดือน'
-          "
+          label="บันทึกและไปยังหน้าคำสั่ง"
           @click="() => onSubmit(true)"
           :disable="
             selectCreate == 'NEW' ? commandType == '' : selected.length == 0
@@ -614,19 +592,6 @@ watch(
       </q-card-actions>
     </q-card>
   </q-dialog>
-
-  <DialogEditSalary
-    v-model:modal="modalSalary"
-    :command-code="commandTypeCode || ''"
-    :command-id="
-      selectCreate === 'NEW'
-        ? commandOrderId
-        : selected.length > 0
-        ? selected[0].id
-        : ''
-    "
-    :fetch-data="fetchData"
-  />
 </template>
 
 <style scoped></style>
diff --git a/src/modules/18_command/components/DialogEditSalary.vue b/src/modules/18_command/components/DialogEditSalary.vue
deleted file mode 100644
index e24ad4329..000000000
--- a/src/modules/18_command/components/DialogEditSalary.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<script setup lang="ts">
-import { ref, computed, watch } from "vue";
-import { useQuasar, type QTableProps } from "quasar";
-
-import http from "@/plugins/http";
-import config from "@/app.config";
-import { useRouter } from "vue-router";
-import { useCounterMixin } from "@/stores/mixin";
-
-import DialogHeader from "@/components/DialogHeader.vue";
-import CurruncyInput from "@/components/CurruncyInput.vue";
-
-const $q = useQuasar();
-const router = useRouter();
-
-const {
-  dialogConfirm,
-
-  messageError,
-  showLoader,
-  hideLoader,
-  success,
-  onSearchDataTable,
-} = useCounterMixin();
-
-const modal = defineModel<boolean>("modal", {
-  type: Boolean,
-  required: true,
-});
-
-const props = defineProps({
-  commandCode: {
-    type: String,
-    required: true,
-  },
-  commandId: {
-    type: String,
-    required: true,
-  },
-  fetchData: {
-    type: Function,
-    default: () => {},
-  },
-});
-
-const baseColumns = ref<QTableProps["columns"]>([
-  {
-    name: "no",
-    align: "left",
-    label: "ลำดับ",
-    field: (row) => rows.value.indexOf(row) + 1,
-    sortable: false,
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posNo",
-    align: "left",
-    label: "รักษาการ (เลขที่ตำแหน่ง)",
-    field: "posNo",
-    sortable: false,
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "citizenId",
-    align: "left",
-    label: "เลขประจำตัวประชาชน",
-    field: "citizenId",
-    sortable: false,
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "fullName",
-    align: "left",
-    label: "ชื่อ-นามสกุล",
-    field: "fullName",
-    sortable: false,
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    format(val, row) {
-      return `${row.prefix ?? ""}${row.firstName ?? ""} ${row.lastName ?? ""}`;
-    },
-  },
-  {
-    name: "position",
-    align: "left",
-    label: "ตำแหน่ง",
-    field: "position",
-    sortable: false,
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "positionType",
-    align: "left",
-    label: "ประเภทตำแหน่ง",
-    field: "positionType",
-    sortable: false,
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    format(val, row) {
-      return row.posType
-        ? `${row.posType} ${row.posLevel ? `(${row.posLevel})` : ""}`
-        : "-";
-    },
-  },
-  {
-    name: "amount",
-    align: "left",
-    label: "เงินเดือน",
-    field: "amount",
-    format(val) {
-      return val ? val.toLocaleString() : "-";
-    },
-    sortable: false,
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-
-  {
-    name: "amountSpecial",
-    align: "left",
-    label: "เงินค่าตอบแทนพิเศษ",
-    field: "amountSpecial",
-    format(val) {
-      return val ? val.toLocaleString() : "-";
-    },
-    sortable: false,
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "positionSalaryAmount",
-    align: "left",
-    label: "เงินประจำตำแหน่ง",
-    field: "positionSalaryAmount",
-    format(val) {
-      return val ? val.toLocaleString() : "-";
-    },
-    sortable: false,
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "mouthSalaryAmount",
-    align: "left",
-    label: "เงินค่าตอบแทนรายเดือน",
-    field: "mouthSalaryAmount",
-    format(val) {
-      return val ? val.toLocaleString() : "-";
-    },
-    sortable: false,
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "remarkHorizontal",
-    align: "left",
-    label: "หมายเหตุแนวนอน",
-    field: "remarkHorizontal",
-    format(val) {
-      return val ? val.toLocaleString() : "-";
-    },
-    sortable: false,
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "remarkVertical",
-    align: "left",
-    label: "หมายเหตุแนวตั้ง",
-    field: "remarkVertical",
-    format(val) {
-      return val ? val.toLocaleString() : "-";
-    },
-    sortable: false,
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-]);
-
-const columns = computed<QTableProps["columns"]>(() => {
-  if (
-    props.commandCode === "C-PM-01" ||
-    props.commandCode === "C-PM-02" ||
-    props.commandCode === "C-PM-03" ||
-    props.commandCode === "C-PM-04"
-  ) {
-    return baseColumns.value;
-  } else if (props.commandCode == "C-PM-40") {
-    return baseColumns.value?.filter(
-      (e) => e.name !== "position" && e.name !== "positionType"
-    );
-  } else {
-    return baseColumns.value?.filter(
-      (e) =>
-        e.name !== "position" && e.name !== "positionType" && e.name !== "posNo"
-    );
-  }
-});
-const visibleColumns = ref<String[]>([
-  "no",
-  "posNo",
-  "citizenId",
-  "fullName",
-  "amount",
-  "position",
-  "positionType",
-  "amountSpecial",
-  "positionSalaryAmount",
-  "mouthSalaryAmount",
-  "remarkHorizontal",
-  "remarkVertical",
-]);
-
-const filter = ref<string>("");
-const rowsMain = ref<Array<any>>([]);
-const rows = ref<Array<any>>([]);
-const isNext = ref<boolean>(false);
-
-// Functions for number formatting
-function formatNumber(value: any): string {
-  if (!value || isNaN(value)) return "";
-  return Number(value).toLocaleString();
-}
-
-function unformatNumber(value: string): number | null {
-  if (!value) return null;
-  const numStr = value.replace(/,/g, "");
-  const num = parseFloat(numStr);
-  return isNaN(num) ? null : num;
-}
-
-function onSearchData() {
-  rows.value = onSearchDataTable(
-    filter.value,
-    rowsMain.value,
-    columns.value ? columns.value : []
-  );
-}
-
-function closeModal() {
-  modal.value = false;
-  rows.value = [];
-  rowsMain.value = [];
-  filter.value = "";
-}
-
-/** ดึงข้อมูล บุคคล */
-async function getPersonList() {
-  await http
-    .get(config.API.commandAction(props.commandId, "tab2"))
-    .then(async (res) => {
-      const data = await res.data.result;
-      rows.value = data.commandRecives;
-      rowsMain.value = data.commandRecives;
-
-      onSearchData();
-    })
-    .catch((e) => {
-      messageError($q, e);
-    });
-}
-
-function onSubmit() {
-  dialogConfirm($q, async () => {
-    showLoader();
-    try {
-      const payload = rows.value.map((item) => ({
-        id: item.id,
-        mouthSalaryAmount: Number(item.mouthSalaryAmount) || null,
-        positionSalaryAmount: Number(item.positionSalaryAmount) || null,
-        amount: Number(item.amount) || null,
-        amountSpecial: Number(item.amountSpecial) || null,
-        remarkVertical: item.remarkVertical,
-        remarkHorizontal: item.remarkHorizontal,
-      }));
-
-      await http.post(config.API.commandEditSalary, payload);
-      if (isNext.value) {
-        router.push(`/command/edit/${props.commandId}`);
-      } else {
-        await props.fetchData(); // เรียกฟังก์ชัน fetchData ที่ส่งมาจาก props เพื่อรีเฟรชข้อมูล
-        closeModal();
-      }
-      success($q, "บันทึกข้อมูลาสำเร็จ");
-    } catch (error) {
-      messageError($q, error);
-    } finally {
-      hideLoader();
-    }
-  });
-}
-
-watch(
-  () => modal.value,
-  (newVal) => {
-    if (newVal) {
-      getPersonList();
-    }
-  }
-);
-</script>
-
-<template>
-  <q-dialog v-model="modal" persistent full-width>
-    <q-card>
-      <DialogHeader :tittle="'แก้ไขเงินเดือน'" :close="closeModal" />
-      <q-form greedy @submit.prevent @validation-success="onSubmit">
-        <q-separator />
-        <q-card-section>
-          <div class="row q-col-gutter-sm">
-            <div class="col-12 row q-pb-sm items-center">
-              <q-space />
-
-              <div class="items-center" style="display: flex">
-                <!-- ค้นหาข้อความใน table -->
-                <q-input
-                  standout
-                  dense
-                  v-model="filter"
-                  ref="filterRef"
-                  outlined
-                  placeholder="ค้นหา"
-                  @keydown.enter.prevent="onSearchData()"
-                >
-                  <template v-slot:append>
-                    <q-icon name="search" />
-                  </template>
-                </q-input>
-                <!-- แสดงคอลัมน์ใน table -->
-                <q-select
-                  v-model="visibleColumns"
-                  :display-value="$q.lang.table.columns"
-                  multiple
-                  outlined
-                  dense
-                  :options="columns"
-                  options-dense
-                  option-value="name"
-                  map-options
-                  emit-value
-                  style="min-width: 140px"
-                  class="gt-xs q-ml-sm"
-                />
-              </div>
-            </div>
-            <div class="col-12">
-              <d-table
-                :rows="rows"
-                :columns="columns"
-                :visible-columns="visibleColumns"
-                row-key="name"
-              >
-                <template v-slot:header="props">
-                  <q-tr :props="props">
-                    <q-th
-                      v-for="col in props.cols"
-                      :key="col.name"
-                      :props="props"
-                    >
-                      <span class="text-weight-medium">{{ col.label }}</span>
-                    </q-th>
-                  </q-tr>
-                </template>
-                <template v-slot:body="props">
-                  <q-tr :props="props">
-                    <q-td
-                      v-for="col in props.cols"
-                      :key="col.name"
-                      :props="props"
-                    >
-                      <div v-if="col.name == 'amount'">
-                        <CurruncyInput
-                          v-model="props.row.amount"
-                          :edit="true"
-                          dense
-                          outlined
-                          hide-bottom-space
-                          lazy-rules
-                          :rules="[
-                            (val:any) => !!val || 'กรุณากรอกเงินเดือน',
-                            (val:any) => {
-                              if (!val) return true;
-                              const numVal = typeof val === 'number' ? val : Number(String(val).replace(/,/g, ''));
-                              return numVal <= 10000000 || 'เงินเดือนต้องไม่เกิน 10,000,000 บาท';
-                            }
-                          ]"
-                        />
-                      </div>
-                      <div v-else-if="col.name == 'amountSpecial'">
-                        <CurruncyInput
-                          v-model="props.row.amountSpecial"
-                          :edit="true"
-                          dense
-                          outlined
-                          hide-bottom-space
-                          lazy-rules
-                          :rules="[
-                            (val:any) => {
-                              if (!val) return true;
-                              const numVal = typeof val === 'number' ? val : Number(String(val).replace(/,/g, ''));
-                              return numVal <= 10000000 || 'เงินค่าตอบแทนพิเศษต้องไม่เกิน 10,000,000 บาท';
-                            }
-                          ]"
-                        />
-                        <!-- :rules="[(val:string) => !!val || 'กรุณากรอกเงินค่าตอบแทนพิเศษ']" -->
-                      </div>
-                      <div v-else-if="col.name == 'positionSalaryAmount'">
-                        <CurruncyInput
-                          v-model="props.row.positionSalaryAmount"
-                          :edit="true"
-                          dense
-                          outlined
-                          hide-bottom-space
-                          lazy-rules
-                          :rules="[
-                            (val:any) => {
-                              if (!val) return true;
-                              const numVal = typeof val === 'number' ? val : Number(String(val).replace(/,/g, ''));
-                              return numVal <= 10000000 || 'เงินประจำตำแหน่งต้องไม่เกิน 10,000,000 บาท';
-                            }
-                          ]"
-                        />
-                        <!-- :rules="[(val:string) => !!val || 'กรุณากรอกเงินประจำตำแหน่ง']" -->
-                      </div>
-                      <div v-else-if="col.name == 'mouthSalaryAmount'">
-                        <CurruncyInput
-                          v-model="props.row.mouthSalaryAmount"
-                          :edit="true"
-                          dense
-                          outlined
-                          hide-bottom-space
-                          lazy-rules
-                          :rules="[
-                            (val:any) => {
-                              if (!val) return true;
-                              const numVal = typeof val === 'number' ? val : Number(String(val).replace(/,/g, ''));
-                              return numVal <= 10000000 || 'เงินค่าตอบแทนรายเดือนต้องไม่เกิน 10,000,000 บาท';
-                            }
-                          ]"
-                        />
-                        <!-- :rules="[(val:string) => !!val || 'กรุณากรอกเงินค่าตอบแทนรายเดือน']" -->
-                      </div>
-                      <div v-else-if="col.name == 'remarkHorizontal'">
-                        <q-input
-                          v-model="props.row.remarkHorizontal"
-                          type="textarea"
-                          autorows
-                          hide-bottom-space
-                          dense
-                          borderless
-                          outlined
-                          rows="1"
-                        />
-                      </div>
-                      <div v-else-if="col.name == 'remarkVertical'">
-                        <q-input
-                          v-model="props.row.remarkVertical"
-                          type="textarea"
-                          autorows
-                          hide-bottom-space
-                          dense
-                          borderless
-                          outlined
-                          rows="1"
-                        />
-                      </div>
-                      <div v-else>
-                        {{ col.value ?? "-" }}
-                      </div>
-                    </q-td>
-                  </q-tr>
-                </template>
-              </d-table>
-            </div>
-          </div>
-        </q-card-section>
-        <q-separator />
-
-        <q-card-actions align="right">
-          <q-btn
-            label="บันทึกและเลือกรายชื่อต่อ"
-            color="blue"
-            @click="() => (isNext = false)"
-            type="submit"
-          >
-            <q-tooltip>บันทึกและเลือกรายชื่อต่อ</q-tooltip>
-          </q-btn>
-          <q-btn
-            label="บันทึกและไปยังหน้าคำสั่ง"
-            @click="() => (isNext = true)"
-            color="public"
-            type="submit"
-          >
-            <q-tooltip>บันทึกและไปยังหน้าคำสั่ง</q-tooltip>
-          </q-btn>
-        </q-card-actions>
-      </q-form>
-    </q-card>
-  </q-dialog>
-</template>
-
-<style scoped></style>
diff --git a/src/modules/18_command/components/Step/Dialog2_Salary.vue b/src/modules/18_command/components/Step/Dialog2_Salary.vue
index 68995a783..77a3efceb 100644
--- a/src/modules/18_command/components/Step/Dialog2_Salary.vue
+++ b/src/modules/18_command/components/Step/Dialog2_Salary.vue
@@ -8,7 +8,6 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useCommandMainStore } from "@/modules/18_command/store/Main";
 import { useCommandDetail } from "@/modules/18_command/store/DetailStore";
 import DialogHeader from "@/components/DialogHeader.vue";
-import CurruncyInput from "@/components/CurruncyInput.vue";
 
 const $q = useQuasar();
 const { showLoader, hideLoader, dialogConfirm, messageError, success } =
@@ -141,30 +140,25 @@ watch(
                 v-if="store.isShowSalary(type)"
                 class="col-xs-6 col-sm-6 col-md-6"
               >
-                <CurruncyInput
+                <q-input
                   dense
                   outlined
                   lazy-rules
                   hide-bottom-space
                   v-model="formData.amount"
                   :class="getClass(storeDetail.isSalary)"
+                  mask="###,###,###,###,###,###"
+                  reverse-fill-mask
                   :readonly="!storeDetail.isSalary"
                   :label="`${'เงินเดือน'}`"
-                  :rules="[
-                    (val:any) => !!val || 'กรุณากรอกเงินเดือน',
-                    (val:any) => {
-                      if (!val) return true;
-                      const numVal = typeof val === 'number' ? val : Number(String(val).replace(/,/g, ''));
-                      return numVal <= 10000000 || 'เงินเดือนต้องไม่เกิน 10,000,000 บาท';
-                    }
-                  ]"
+                  :rules="[(val: any) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
                 />
               </div>
               <div
                 v-if="store.isShowSalary(type)"
                 class="col-xs-6 col-sm-6 col-md-6"
               >
-                <CurruncyInput
+                <q-input
                   dense
                   outlined
                   lazy-rules
@@ -172,21 +166,16 @@ watch(
                   v-model="formData.amountSpecial"
                   :class="getClass(storeDetail.isSalary)"
                   :readonly="!storeDetail.isSalary"
+                  mask="###,###,###,###,###,###"
+                  reverse-fill-mask
                   :label="`${'เงินค่าตอบแทนพิเศษ'}`"
-                  :rules="[
-                    (val:any) => {
-                      if (!val) return true;
-                      const numVal = typeof val === 'number' ? val : Number(String(val).replace(/,/g, ''));
-                      return numVal <= 10000000 || 'เงินค่าตอบแทนพิเศษต้องไม่เกิน 10,000,000 บาท';
-                    }
-                  ]"
                 />
               </div>
               <div
                 v-if="store.isShowSalary(type)"
                 class="col-xs-6 col-sm-6 col-md-6"
               >
-                <CurruncyInput
+                <q-input
                   dense
                   outlined
                   lazy-rules
@@ -194,14 +183,9 @@ watch(
                   v-model="formData.positionSalaryAmount"
                   :class="getClass(storeDetail.isSalary)"
                   :readonly="!storeDetail.isSalary"
+                  mask="###,###,###,###,###,###"
+                  reverse-fill-mask
                   :label="`${'เงินประจำตำแหน่ง'}`"
-                  :rules="[
-                    (val:any) => {
-                      if (!val) return true;
-                      const numVal = typeof val === 'number' ? val : Number(String(val).replace(/,/g, ''));
-                      return numVal <= 10000000 || 'เงินประจำตำแหน่งต้องไม่เกิน 10,000,000 บาท';
-                    }
-                  ]"
                 />
               </div>
 
@@ -209,7 +193,7 @@ watch(
                 v-if="store.isShowSalary(type)"
                 class="col-xs-6 col-sm-6 col-md-6"
               >
-                <CurruncyInput
+                <q-input
                   dense
                   outlined
                   lazy-rules
@@ -217,14 +201,9 @@ watch(
                   v-model="formData.monthSalaryAmount"
                   :class="getClass(storeDetail.isSalary)"
                   :readonly="!storeDetail.isSalary"
+                  mask="###,###,###,###,###,###"
+                  reverse-fill-mask
                   :label="`${'เงินค่าตอบแทนรายเดือน'}`"
-                  :rules="[
-                    (val:any) => {
-                      if (!val) return true;
-                      const numVal = typeof val === 'number' ? val : Number(String(val).replace(/,/g, ''));
-                      return numVal <= 10000000 || 'เงินค่าตอบแทนรายเดือนต้องไม่เกิน 10,000,000 บาท';
-                    }
-                  ]"
                 />
               </div>
             </div>
diff --git a/src/modules/18_command/interface/index/Main.ts b/src/modules/18_command/interface/index/Main.ts
index 1ee537587..98e1b78a7 100644
--- a/src/modules/18_command/interface/index/Main.ts
+++ b/src/modules/18_command/interface/index/Main.ts
@@ -60,7 +60,6 @@ interface ListCommand {
   name: string;
   subtitle?: string;
   commandSysId: string;
-  isSalary?: boolean;
 }
 
 interface DataOrder {