diff --git a/src/modules/02_organizational/views/ManageReport2.vue b/src/modules/02_organizational/views/ManageReport2.vue
index 40e8c4190..b470e39a7 100644
--- a/src/modules/02_organizational/views/ManageReport2.vue
+++ b/src/modules/02_organizational/views/ManageReport2.vue
@@ -146,7 +146,7 @@ const columns = ref<any>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ-สกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "name",
     headerStyle: "font-size: 14px; min-width: 200px",
diff --git a/src/modules/02_organizational/views/ManageReport2Add.vue b/src/modules/02_organizational/views/ManageReport2Add.vue
index d08c975f1..dd7971c62 100644
--- a/src/modules/02_organizational/views/ManageReport2Add.vue
+++ b/src/modules/02_organizational/views/ManageReport2Add.vue
@@ -23,7 +23,7 @@
       <div class="q-pa-md row col-12 q-col-gutter-sm">
         <q-input
           v-model="myData.name"
-          label="ชื่อ-สกุล"
+          label="ชื่อ-นามสกุล"
           class="col-xs-12 col-sm-6"
           hide-bottom-space
           :outlined="true"
diff --git a/src/modules/02_organizational/views/ManageReport2History.vue b/src/modules/02_organizational/views/ManageReport2History.vue
index 89983c82d..6bb7b25bf 100644
--- a/src/modules/02_organizational/views/ManageReport2History.vue
+++ b/src/modules/02_organizational/views/ManageReport2History.vue
@@ -47,7 +47,7 @@
       >
         <q-input
           v-model="items.fullName"
-          label="ชื่อ-สกุล"
+          label="ชื่อ-นามสกุล"
           class="col-xs-12 col-sm-6"
           hide-bottom-space
           :outlined="true"
diff --git a/src/modules/03_recruiting/views/01_compete/Detail.vue b/src/modules/03_recruiting/views/01_compete/Detail.vue
index 709a17b2e..4909c3fa7 100644
--- a/src/modules/03_recruiting/views/01_compete/Detail.vue
+++ b/src/modules/03_recruiting/views/01_compete/Detail.vue
@@ -188,7 +188,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "fullName",
     align: "left",
-    label: "ชื่อ-สกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "personName",
     headerStyle: "font-size: 14px; min-width: 250px",
diff --git a/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue b/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue
index 774081eb1..aad8efb37 100644
--- a/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue
+++ b/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue
@@ -182,7 +182,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "fullName",
     align: "left",
-    label: "ชื่อ-สกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "personName",
     headerStyle: "font-size: 14px; min-width: 250px",
diff --git a/src/modules/03_recruiting/views/02_qualify/manageDetail.vue b/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
index 36a16eb1d..231e53eeb 100644
--- a/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
+++ b/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
@@ -368,7 +368,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "fullname",
     align: "left",
-    label: "ชื่อ-สกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "fullname",
     headerStyle: "font-size: 14px; min-width: 200px",
diff --git a/src/modules/04_registry/views/Main.vue b/src/modules/04_registry/views/Main.vue
index 94e239383..535afc63c 100644
--- a/src/modules/04_registry/views/Main.vue
+++ b/src/modules/04_registry/views/Main.vue
@@ -251,7 +251,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "fullname",
     align: "left",
-    label: "ชื่อ-สกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "fullname",
     headerStyle: "font-size: 14px; min-width: 200px",
@@ -498,7 +498,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "fullnameOld",
     align: "left",
-    label: "ชื่อ-สกุล(เดิม)",
+    label: "ชื่อ-นามสกุล(เดิม)",
     sortable: true,
     field: "fullnameOld",
     headerStyle: "font-size: 14px; min-width: 200px",
@@ -583,7 +583,7 @@ const columnsEmployee = ref<QTableProps["columns"]>([
   {
     name: "fullname",
     align: "left",
-    label: "ชื่อ-สกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "fullname",
     headerStyle: "font-size: 14px; min-width: 200px",
@@ -802,7 +802,7 @@ const columnsEmployee = ref<QTableProps["columns"]>([
   {
     name: "fullnameOld",
     align: "left",
-    label: "ชื่อ-สกุล(เดิม)",
+    label: "ชื่อ-นามสกุล(เดิม)",
     sortable: true,
     field: "fullnameOld",
     headerStyle: "font-size: 14px; min-width: 200px",
@@ -886,7 +886,7 @@ const columnsEmployeeTemp = ref<QTableProps["columns"]>([
   {
     name: "fullname",
     align: "left",
-    label: "ชื่อ-สกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "fullname",
     headerStyle: "font-size: 14px; min-width: 200px",
@@ -1105,7 +1105,7 @@ const columnsEmployeeTemp = ref<QTableProps["columns"]>([
   {
     name: "fullnameOld",
     align: "left",
-    label: "ชื่อ-สกุล(เดิม)",
+    label: "ชื่อ-นามสกุล(เดิม)",
     sortable: true,
     field: "fullnameOld",
     headerStyle: "font-size: 14px; min-width: 200px",
@@ -1370,7 +1370,7 @@ const doSearch = async () => {
 const onExport = () => {
   const head = [
     "ลำดับ",
-    "ชื่อ-สกุล",
+    "ชื่อ-นามสกุล",
     "ตำแหน่ง",
     "สายงาน",
     "ตำแหน่งในสายงาน",
diff --git a/src/modules/05_placement/components/probation/FormAssign.vue b/src/modules/05_placement/components/probation/FormAssign.vue
index eeebdbda2..a59048fd8 100644
--- a/src/modules/05_placement/components/probation/FormAssign.vue
+++ b/src/modules/05_placement/components/probation/FormAssign.vue
@@ -1089,7 +1089,7 @@ onMounted(async () => {
                     borderless
                     outlined
                     v-model="fullname"
-                    label="ชื่อ-สกุล"
+                    label="ชื่อ-นามสกุล"
                   />
 
                 </div>
@@ -2359,7 +2359,7 @@ onMounted(async () => {
                     borderless
                     :outlined="status == true"
                     v-model="fullname"
-                    label="ชื่อ-สกุล"
+                    label="ชื่อ-นามสกุล"
                   />
                 </div>
 
diff --git a/src/modules/05_placement/components/probation/MainProbation.vue b/src/modules/05_placement/components/probation/MainProbation.vue
index e8dcc6e51..2cb48755f 100644
--- a/src/modules/05_placement/components/probation/MainProbation.vue
+++ b/src/modules/05_placement/components/probation/MainProbation.vue
@@ -79,7 +79,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ-สกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "name",
     headerStyle: "font-size: 14px",
@@ -155,7 +155,7 @@ const columns2 = ref<QTableProps["columns"]>([
   {
     name: "fullname",
     align: "left",
-    label: "ชื่อ-สกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "fullname",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/06_retirement/components/ListRetirement/AddList.vue b/src/modules/06_retirement/components/ListRetirement/AddList.vue
index 754cfddfe..6a440ba58 100644
--- a/src/modules/06_retirement/components/ListRetirement/AddList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/AddList.vue
@@ -41,7 +41,7 @@ const columns = ref<any["columns"]>([
   {
     name: "fullname",
     required: true,
-    label: "ชื่อ-สกุล",
+    label: "ชื่อ-นามสกุล",
     field: "fullname",
     align: "left",
   },
diff --git a/src/modules/06_retirement/components/resign/DetailByidDeceased.vue b/src/modules/06_retirement/components/resign/DetailByidDeceased.vue
index 12af75555..aa02175fa 100644
--- a/src/modules/06_retirement/components/resign/DetailByidDeceased.vue
+++ b/src/modules/06_retirement/components/resign/DetailByidDeceased.vue
@@ -84,7 +84,7 @@ const columnsModal = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ-สกุล",
+    label: "ชื่อ-นามสกุล",
     field: "name",
     sortable: true,
     sort: (a: string, b: string) =>
@@ -132,7 +132,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ-สกุล",
+    label: "ชื่อ-นามสกุล",
     field: "name",
     sortable: true,
     sort: (a: string, b: string) =>
diff --git a/src/modules/07_insignia/components/4_Allocate/OrgAdd.vue b/src/modules/07_insignia/components/4_Allocate/OrgAdd.vue
index 065bb916f..d472db3ff 100644
--- a/src/modules/07_insignia/components/4_Allocate/OrgAdd.vue
+++ b/src/modules/07_insignia/components/4_Allocate/OrgAdd.vue
@@ -155,7 +155,7 @@ const columns2 = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ-สกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "name",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/08_registryEmployee/components/DialogSendToCommand.vue b/src/modules/08_registryEmployee/components/DialogSendToCommand.vue
index 5dc935268..b87a817cc 100644
--- a/src/modules/08_registryEmployee/components/DialogSendToCommand.vue
+++ b/src/modules/08_registryEmployee/components/DialogSendToCommand.vue
@@ -198,7 +198,7 @@ const columnsOrder = ref<QTableProps["columns"]>([
   {
     name: "fullnameOld",
     align: "left",
-    label: "ชื่อ-สกุล(เดิม)",
+    label: "ชื่อ-นามสกุล(เดิม)",
     sortable: true,
     field: "fullnameOld",
     headerStyle: "font-size: 14px; min-width: 200px",
diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue
index 90a83ccae..bfbd77bf1 100644
--- a/src/modules/08_registryEmployee/views/Main.vue
+++ b/src/modules/08_registryEmployee/views/Main.vue
@@ -77,7 +77,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "fullname",
     align: "left",
-    label: "ชื่อ-สกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "fullname",
     headerStyle: "font-size: 14px; min-width: 200px",
@@ -192,7 +192,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "fullnameOld",
     align: "left",
-    label: "ชื่อ-สกุล(เดิม)",
+    label: "ชื่อ-นามสกุล(เดิม)",
     sortable: true,
     field: "fullnameOld",
     headerStyle: "font-size: 14px; min-width: 200px",
diff --git a/src/modules/10_order/components/step/step01.vue b/src/modules/10_order/components/step/step01.vue
index 6e1539111..dfc96ed0d 100644
--- a/src/modules/10_order/components/step/step01.vue
+++ b/src/modules/10_order/components/step/step01.vue
@@ -594,7 +594,7 @@ const columnsModal = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ-สกุล",
+    label: "ชื่อ-นามสกุล",
     field: "name",
     sortable: true,
     sort: (a: string, b: string) =>
diff --git a/src/modules/10_order/components/step/step03.vue b/src/modules/10_order/components/step/step03.vue
index 4f2951e23..bc51e2cce 100644
--- a/src/modules/10_order/components/step/step03.vue
+++ b/src/modules/10_order/components/step/step03.vue
@@ -71,7 +71,7 @@ const columnsModal = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ-สกุล",
+    label: "ชื่อ-นามสกุล",
     field: "name",
     sortable: true,
     sort: (a: string, b: string) =>
@@ -117,7 +117,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ-สกุล",
+    label: "ชื่อ-นามสกุล",
     field: "name",
     sortable: true,
     sort: (a: string, b: string) =>
diff --git a/src/modules/11_discipline/components/1_Complaint/MainPage.vue b/src/modules/11_discipline/components/1_Complaint/MainPage.vue
index 800fd3acd..d2e3c1a8b 100644
--- a/src/modules/11_discipline/components/1_Complaint/MainPage.vue
+++ b/src/modules/11_discipline/components/1_Complaint/MainPage.vue
@@ -28,7 +28,7 @@ const filterKeyword = ref<string>("");
 const maxPage = ref<number>(1);
 const page = ref<number>(1);
 const rowsPerPage = ref<number>(10);
-const statusFilter = ref<string>("ALL");
+const statusFilter = ref<string>("NEW");
 
 async function updatePagingProp(rowPerpage: number, pageCurrent: number) {
   rowsPerPage.value = rowPerpage;
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
index 3cea9cef9..783979380 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@@ -245,7 +245,7 @@ async function calEndDate(val: string) {
   changeFormData();
   const date = await new Date(props.data.investigationDateEnd);
   formData.investigationDateEnd = await new Date(
-    date.setDate(date.getDate() + (Number(val) + 1))
+    date.setDate(date.getDate() + (Number(val)))
   );
 }
 
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue b/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue
index 87fb70752..b27372954 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue
@@ -25,7 +25,7 @@ function resetFilter() {
     getList();
   }
 }
-const statusFilter = ref<string>("ALL");
+const statusFilter = ref<string>("NEW");
 const currentPage = ref<number>(1);
 const maxPage = ref<number>(1);
 const page = ref<number>(1);
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index 310c9543e..8976738da 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -230,7 +230,7 @@ async function calEndDate(val: string) {
   changeFormData();
   const date = await new Date(props.data.disciplinaryDateEnd);
   formData.disciplinaryDateEnd = await new Date(
-    date.setDate(date.getDate() + (Number(val) + 1))
+    date.setDate(date.getDate() + (Number(val)))
   );
 }
 
@@ -669,8 +669,6 @@ onMounted(async () => {
                       map-options
                       hide-bottom-space
                       :options="complainstStore.complainantoptions"
-                      :rules="[(val) => !!val || `${'กรุณาเลือกผู้ร้องเรียน'}`]"
-                      lazy-rules
                       @update:model-value="
                         selectComplainant(formData.respondentType);
                         changeFormData();
@@ -709,41 +707,9 @@ onMounted(async () => {
                       v-model="formData.organizationId"
                       :options="organizationOption"
                       label="เลือกสำนักงาน"
-                      :rules="[(val) => !!val || `${'กรุณาเลือกสำนักงาน'}`]"
-                      lazy-rules
                       @update:model-value="changeFormData()"
                     />
                   </div>
-                  <!-- <div class="col-xs-12 col-sm-3" id="consideredAgency">
-                    <q-select
-                  ref="consideredAgencyRef"
-                  for="selectAgency"
-                  dense
-                  outlined
-                  v-model="formData.consideredAgency"
-                  :options="organizationOption"
-                  label="หน่วยงานที่พิจารณา"
-                  option-value="id"
-                  option-label="name"
-                  hide-bottom-space
-                  emit-value
-                  map-options
-                  :rules="[(val) => !!val || `${'กรุณาเลือกหน่วยงาน'}`]"
-                  lazy-rules
-                  use-input
-                  @filter="(inputValue: any,
-                  doneFn: Function) => filterSelector(inputValue, doneFn, 'filterconsideredAgencytoptions'
-                  )"
-                >
-                  <template v-slot:no-option>
-                    <q-item>
-                      <q-item-section class="text-grey">
-                        ไม่มีข้อมูล
-                      </q-item-section>
-                    </q-item>
-                  </template>
-                </q-select>
-                  </div> -->
                   <div
                     class="col-xs-12 col-sm-4"
                     v-if="
@@ -907,11 +873,6 @@ onMounted(async () => {
                             : null
                         "
                         :label="`${'วันที่มีคำสั่งให้สอบสวน'}`"
-                        :rules="[
-                          (val) =>
-                            !!val || `${'กรุณาเลือกวันที่มีคำสั่งให้สอบสวน'}`,
-                        ]"
-                        lazy-rules
                       >
                         <template v-slot:prepend>
                           <q-icon
@@ -958,11 +919,6 @@ onMounted(async () => {
                             : null
                         "
                         :label="`${'วันที่รับทราบข้อกล่าวหา'}`"
-                        :rules="[
-                          (val) =>
-                            !!val || `${'กรุณาเลือกวันที่รับทราบข้อกล่าวหา'}`,
-                        ]"
-                        lazy-rules
                       >
                         <template v-slot:prepend>
                           <q-icon
@@ -1037,7 +993,7 @@ onMounted(async () => {
                                 for="#daysExtend"
                                 outlined
                                 dense
-                                lazy-rules
+       
                                 ref="daysExtendRef"
                                 v-model="formData.daysExtend"
                                 :options="investigateDis.daysExtendOps"
@@ -1045,13 +1001,6 @@ onMounted(async () => {
                                 emit-value
                                 hide-bottom-space
                                 map-options
-                                :rules="[
-                                  (val) =>
-                                    formData.extendStatus
-                                      ? !!val ||
-                                        'กรุณาเลือกจำนวนวันที่ต้องการขยาย'
-                                      : true,
-                                ]"
                                 option-label="name"
                                 option-value="id"
                                 use-input
@@ -1099,7 +1048,6 @@ onMounted(async () => {
                                     "
                                     outlined
                                     dense
-                                    lazy-rules
                                     borderless
                                     hide-bottom-space
                                     :model-value="
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue
index fc6bc9f12..5756dd897 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue
@@ -22,7 +22,7 @@ const router = useRouter();
 const filter = ref<string>(""); //search data table
 const page = ref<number>(1);
 const maxPage = ref<number>(1);
-const status = ref<string>("ALL");
+const status = ref<string>("NEW");
 async function fetchListDisciplinary() {
   showLoader();
   await http
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue
index 8bf753782..e8685f732 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue
@@ -9,7 +9,7 @@ const filterRef = ref<any>(null);
 const attrs = ref<any>(useAttrs());
 const paging = ref<boolean>(true);
 const currentPage = ref<number>(1);
-const statusFilter = ref<string>("ALL");
+const statusFilter = ref<string>("NEW");
 
 /** รับ props มาจากหน้าหลัก */
 const props = defineProps({
diff --git a/src/modules/11_discipline/components/4_Result/Form.vue b/src/modules/11_discipline/components/4_Result/Form.vue
index daa14549e..61b8d51ce 100644
--- a/src/modules/11_discipline/components/4_Result/Form.vue
+++ b/src/modules/11_discipline/components/4_Result/Form.vue
@@ -138,12 +138,13 @@ function onSubmit() {
         .then(() => {
           isSave.value = false;
           success($q, "บันทึกข้อมูลสำเร็จ");
+          props.fetchData();
         })
         .catch((err) => {
           messageError($q, err);
         })
         .finally(async () => {
-          await props.fetchData();
+
         });
     },
     "ยืนยันการบันทึกข้อมูล",
diff --git a/src/modules/11_discipline/components/4_Result/MainPage.vue b/src/modules/11_discipline/components/4_Result/MainPage.vue
index a3dcd7f45..30d9ff18a 100644
--- a/src/modules/11_discipline/components/4_Result/MainPage.vue
+++ b/src/modules/11_discipline/components/4_Result/MainPage.vue
@@ -26,7 +26,7 @@ const page = ref<number>(1);
 const pageSize = ref<number>(10);
 const maxPage = ref<number>(1);
 const filter = ref<string>("");
-const status = ref<string>("ALL");
+const status = ref<string>("DONE");
 /** function เรียกรายการสรุปผลการพิจารณาทางวินัย*/
 async function fetchListResult() {
   showLoader();
diff --git a/src/modules/11_discipline/components/4_Result/Table.vue b/src/modules/11_discipline/components/4_Result/Table.vue
index 0cfb4787e..6a9d2aba3 100644
--- a/src/modules/11_discipline/components/4_Result/Table.vue
+++ b/src/modules/11_discipline/components/4_Result/Table.vue
@@ -7,7 +7,7 @@ const table = ref<any>(null);
 const filterRef = ref<any>(null);
 const attrs = ref<any>(useAttrs());
 const paging = ref<boolean>(true);
-const statusFilter = ref<string>("ALL");
+const statusFilter = ref<string>("DONE");
 /** รับ props มาจากหน้าหลัก */
 const props = defineProps({
   count: Number,