fix Columns Org
This commit is contained in:
parent
5a47f5be5b
commit
b8b812c319
8 changed files with 72 additions and 59 deletions
|
|
@ -22,6 +22,7 @@ const {
|
|||
findPosMasterNoOld,
|
||||
date2Thai,
|
||||
onSearchDataTable,
|
||||
findOrgNameOldHtml,
|
||||
} = useCounterMixin();
|
||||
|
||||
/** props*/
|
||||
|
|
@ -108,7 +109,7 @@ const columns2 = ref<QTableProps["columns"]>([
|
|||
align: "left",
|
||||
label: "สังกัด",
|
||||
sortable: true,
|
||||
field: "organization",
|
||||
field: "organizationPositionOld",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
format: (val, row) => findOrgNameOld(row),
|
||||
|
|
@ -306,14 +307,13 @@ function onSearch() {
|
|||
</div>
|
||||
|
||||
<div
|
||||
v-else
|
||||
:class="
|
||||
col.name === 'organizationPositionOld' ||
|
||||
col.name === 'organization'
|
||||
? 'table_ellipsis'
|
||||
: ''
|
||||
"
|
||||
v-else-if="col.name === 'organizationPositionOld'"
|
||||
class="text-html"
|
||||
>
|
||||
{{ findOrgNameOldHtml(props.row) }}
|
||||
</div>
|
||||
|
||||
<div v-else>
|
||||
{{
|
||||
col.value == null
|
||||
? ""
|
||||
|
|
|
|||
|
|
@ -114,6 +114,9 @@ const columns2 = ref<QTableProps["columns"]>([
|
|||
label: "ตำแหน่ง/สังกัดเดิม",
|
||||
sortable: true,
|
||||
field: "organizationPositionOld",
|
||||
format(val, row) {
|
||||
return row.organizationPositionOld.replace(/\n/g, " ");
|
||||
},
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
|
|
@ -309,11 +312,13 @@ watch(
|
|||
</div>
|
||||
|
||||
<div
|
||||
v-else
|
||||
:class="
|
||||
col.name === 'affiliation' ? 'table_ellipsis' : ''
|
||||
"
|
||||
v-else-if="col.name === 'organizationPositionOld'"
|
||||
class="text-html"
|
||||
>
|
||||
{{ props.row.organizationPositionOld ?? '-' }}
|
||||
</div>
|
||||
|
||||
<div v-else>
|
||||
{{ col.value ? col.value : "-" }}
|
||||
</div>
|
||||
</q-td>
|
||||
|
|
|
|||
|
|
@ -108,6 +108,9 @@ const columns2 = ref<QTableProps["columns"]>([
|
|||
label: "ตำแหน่ง/สังกัดเดิม",
|
||||
sortable: true,
|
||||
field: "organizationPositionOld",
|
||||
format(val, row) {
|
||||
return row.organizationPositionOld.replace(/\n/g, " ");
|
||||
},
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
|
|
@ -261,14 +264,13 @@ watch(
|
|||
</div>
|
||||
|
||||
<div
|
||||
v-else
|
||||
:class="
|
||||
col.name === 'organizationPositionOld' ||
|
||||
col.name === 'organization'
|
||||
? 'table_ellipsis'
|
||||
: ''
|
||||
"
|
||||
v-else-if="col.name === 'organizationPositionOld'"
|
||||
class="text-html"
|
||||
>
|
||||
{{ props.row.organizationPositionOld ?? "-" }}
|
||||
</div>
|
||||
|
||||
<div v-else>
|
||||
{{ !col.value ? "-" : col.value }}
|
||||
</div>
|
||||
</q-td>
|
||||
|
|
|
|||
|
|
@ -93,6 +93,9 @@ const columns2 = ref<QTableProps["columns"]>([
|
|||
label: "ตำแหน่ง/สังกัดเดิม",
|
||||
sortable: true,
|
||||
field: "organizationPositionOld",
|
||||
format(val, row) {
|
||||
return row.organizationPositionOld.replace(/\n/g, " ");
|
||||
},
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
|
|
@ -241,16 +244,14 @@ watch(
|
|||
<div v-if="col.name === 'no'">
|
||||
{{ props.rowIndex + 1 }}
|
||||
</div>
|
||||
|
||||
<div
|
||||
v-else
|
||||
:class="
|
||||
col.name === 'organizationPositionOld' ||
|
||||
col.name === 'organization'
|
||||
? 'table_ellipsis'
|
||||
: ''
|
||||
"
|
||||
v-else-if="col.name === 'organizationPositionOld'"
|
||||
class="text-html"
|
||||
>
|
||||
{{ props.row.organizationPositionOld ?? "-" }}
|
||||
</div>
|
||||
|
||||
<div v-else>
|
||||
{{ col.value ? col.value : "-" }}
|
||||
</div>
|
||||
</q-td>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue