แก้ space ขึ้นบรรทัดใหม่ เเก้คำ พ้นราชการ

src/modules/06_retirement/views/04_exitInterview.vue

@@ -189,7 +189,6 @@ async function fecthlist() {
       });
       rows.value = list;
       rowsData.value = list;
-      console.log(rows.value);
 
       filters.value = list;
     })

src/modules/06_retirement/views/05_deceased.vue

@@ -23,6 +23,7 @@ const {
   date2Thai,
   findOrgName,
   onSearchDataTable,
+  findOrgNameHtml,
 } = mixin;
 
 /** คอลัมน์ */
@@ -62,7 +63,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "profileType",
     align: "left",
-    label: "สถานภาพ",
+    label: "ประเภทตำแหน่ง",
     sortable: true,
     field: "profileType",
     headerStyle: "font-size: 14px",
@@ -89,7 +90,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "positionType",
     align: "left",
-    label: "ประเภทตำแหน่ง",
+    label: "ตำแหน่งประเภท",
     sortable: true,
     field: "positionType",
     headerStyle: "font-size: 14px",
@@ -155,7 +156,6 @@ async function fectListDecased() {
     .get(config.API.listDeceased())
     .then((res) => {
       const data = res.data.result;
-      console.log(data);
 
       rows.value = data;
       rowsData.value = data;
@@ -214,7 +214,7 @@ onMounted(() => {
               map-options
               option-value="id"
               option-label="name"
-              label="สถานภาพ"
+              label="ประเภทตำแหน่ง"
               :clearable="employeeClass !== ''"
               style="width: 200px"
               @clear="employeeClass = ''"
@@ -294,10 +294,10 @@ onMounted(() => {
                     {{ props.rowIndex + 1 }}
                   </div>
 
-                  <div
-                    v-else
-                    :class="col.name === 'org' ? 'table_ellipsis' : ''"
-                  >
+                  <div v-else-if="col.name == 'org'" class="text-html">
+                    {{ props.row ? findOrgNameHtml(props.row) : "-" }}
+                  </div>
+                  <div v-else>
                     {{ col.value ? col.value : "-" }}
                   </div>
                 </q-td>

src/modules/06_retirement/views/06_dismissOrder.vue

@@ -29,6 +29,7 @@ const {
   success,
   onSearchDataTable,
   dialogRemove,
+  textTranForm,
 } = mixin;
 
 const modal = ref<boolean>(false);
@@ -79,7 +80,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "positionLevel",
     align: "left",
-    label: "ประเภทตำแหน่ง",
+    label: "ตำแหน่งประเภท",
     sortable: true,
     field: "positionLevel",
     headerStyle: "font-size: 14px",
@@ -104,6 +105,9 @@ const columns = ref<QTableProps["columns"]>([
     field: "organizationPositionOld",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return `${row.organizationPositionOld.replace(/\n/g, " ")}`;
+    },
   },
   {
     name: "createdAt",
@@ -370,15 +374,17 @@ onMounted(async () => {
                   <div v-if="col.name === 'no'">
                     {{ props.rowIndex + 1 }}
                   </div>
-
                   <div
-                    v-else
-                    :class="
-                      col.name === 'organizationPositionOld'
-                        ? 'table_ellipsis2'
-                        : ''
-                    "
+                    v-else-if="col.name == 'organizationPositionOld'"
+                    class="text-html"
                   >
+                    {{
+                      props.row.organizationPositionOld
+                        ? textTranForm(props.row.organizationPositionOld)
+                        : "-"
+                    }}
+                  </div>
+                  <div v-else>
                     {{ col.value ? col.value : "-" }}
                   </div>
                 </q-td>

src/modules/06_retirement/views/08_dismissOrderEmp.vue

@@ -29,6 +29,7 @@ const {
   success,
   onSearchDataTable,
   dialogRemove,
+  textTranForm,
 } = mixin;
 
 const modal = ref<boolean>(false);
@@ -104,6 +105,9 @@ const columns = ref<QTableProps["columns"]>([
     field: "organizationPositionOld",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return `${row.organizationPositionOld.replace(/\n/g, " ")}`;
+    },
   },
   {
     name: "createdAt",
@@ -160,7 +164,6 @@ async function getData() {
     .then((res) => {
       const data = res.data.result;
       rows.value = data;
-      console.log("🚀 ~ .then ~ data:", data)
       rowsData.value = data;
       filters.value = data;
       onSearch();
@@ -378,13 +381,16 @@ onMounted(async () => {
                   </div>
 
                   <div
-                    v-else
-                    :class="
-                      col.name === 'organizationPositionOld'
-                        ? 'table_ellipsis2'
-                        : ''
-                    "
+                    v-else-if="col.name == 'organizationPositionOld'"
+                    class="text-html"
                   >
+                    {{
+                      props.row.organizationPositionOld
+                        ? textTranForm(props.row.organizationPositionOld)
+                        : "-"
+                    }}
+                  </div>
+                  <div v-else>
                     {{ col.value ? col.value : "-" }}
                   </div>
                 </q-td>