- แก้ชื่อ-นามสกุล

- ขยายวันสืบ และสอบ

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",

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"

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"

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",

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",

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",

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 = [
     "ลำดับ",
-    "ชื่อ-สกุล",
+    "ชื่อ-นามสกุล",
     "ตำแหน่ง",
     "สายงาน",
     "ตำแหน่งในสายงาน",

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>
 

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",

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",
   },

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) =>

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",

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",

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",

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) =>

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) =>

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)))
   );
 }
 

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)))
   );
 }