Merge branch 'nice_dev' into develop

src/modules/13_salary/components/SalaryLists/TableTypePending.vue

@@ -82,7 +82,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "result",
     align: "center",
-    label: "ผลการประเมิน",
+    label: "ผลการประเมินผลการปฏิบัติราชการ",
     sortable: false,
     field: "result",
     headerStyle: "font-size: 14px",
@@ -91,7 +91,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "duration",
     align: "center",
-    label: "ระยะเวลา",
+    label: "ระยะเวลาการปฏิบัติราชการในรอบครึ่งปี",
     sortable: false,
     field: "duration",
     headerStyle: "font-size: 14px",
@@ -100,7 +100,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "punish",
     align: "center",
-    label: "การลงโทษ",
+    label: "การลงโทษทางวินัย",
     sortable: false,
     field: "punish",
     headerStyle: "font-size: 14px",
@@ -109,7 +109,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "retired",
     align: "center",
-    label: "พ้นราชการ",
+    label: "พักราชการ",
     sortable: false,
     field: "retired",
     headerStyle: "font-size: 14px",
@@ -124,6 +124,15 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "dateLevel",
+    align: "center",
+    label: "วันลา",
+    sortable: false,
+    field: "dateLevel",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
 ]);
 const visibleColumns = ref<string[]>([
   "no",
@@ -135,6 +144,7 @@ const visibleColumns = ref<string[]>([
   "punish",
   "retired",
   "retired2",
+  "dateLevel",
 ]);
 
 /** modalDialog*/