fix salary

src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue

@@ -24,8 +24,14 @@ import DialogInfo from "@/modules/13_salary/components/DialogInfoMain.vue";
 /** use*/
 const $q = useQuasar();
 const store = useSalaryEmployeeListSDataStore();
-const { dialogRemove, messageError, showLoader, hideLoader, success } =
-  useCounterMixin();
+const {
+  dialogRemove,
+  messageError,
+  showLoader,
+  hideLoader,
+  success,
+  findOrgNameHtml,
+} = useCounterMixin();
 
 /** Props*/
 const formFilter = defineModel<DataFilter>("formFilter", { required: true });
@@ -128,7 +134,7 @@ const columns = ref<QTableProps["columns"]>([
     label: "สังกัด",
     sortable: false,
     field: "organization",
-    headerStyle: "font-size: 14px",
+    headerStyle: "font-size: 14px;min-width:280px",
     style: "font-size: 14px",
   },
   {
@@ -378,7 +384,7 @@ watch(
       : columns"
       option-value="name"
       style="min-width: 140px"
-      class="col-xs-12 col-sm-3 col-md-2 q-ml-sm"
+      class=" q-ml-sm"
     />
   </q-toolbar>
   <d-table
@@ -475,25 +481,8 @@ watch(
               `${props.row.prefix}${props.row.firstName}  ${props.row.lastName}`
             }}
           </div>
-          <div v-else-if="col.name == 'organization'" class="table_ellipsis">
-            <div
-              v-if="
-                props.row.child4 === null &&
-                props.row.child3 === null &&
-                props.row.child2 === null &&
-                props.row.child1 === null &&
-                props.row.root === null
-              "
-            >
-              -
-            </div>
-            {{
-              `${props.row.child4 ? props.row.child4 + " " : ""}${
-                props.row.child3 ? props.row.child3 + " " : ""
-              }${props.row.child2 ? props.row.child2 + " " : ""}${
-                props.row.child1 ? props.row.child1 + " " : ""
-              }${props.row.root ? props.row.root : ""}`
-            }}
+          <div v-else-if="col.name == 'organization'" class="text-html">
+            {{ findOrgNameHtml(props.row) }}
           </div>
 
           <div v-else-if="col.name == 'isSuspension'">