hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

แก้การแสดงตำแหน่ง และตำแหน่งทางการบริหาร หน้ารายการแต่งตั้ง-เลื่อน-ย้าย

Browse source
This commit is contained in:
Warunee Tamkoo 2025-06-19 11:58:50 +07:00
parent 793293c0ef
commit 14b03c704f
1 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/modules/05_placement/views/06_appointPromoteMain.vue
View file

@ -36,6 +36,7 @@ const {
date2Thai,
dialogRemove,
onSearchDataTable,
findOrgNameHtml,
} = useCounterMixin();
const status = ref<string>("");
@ -146,9 +147,9 @@ const columns = ref<QTableProps["columns"]>([
field: "organizationName",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format: (val, row) => {
return `${row.root.position}${row.root.posTypeName}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
},
// format: (val, row) => {
// return `${row.root.position}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
// },
},
{
name: "dateOfBirth",
@ -617,35 +618,37 @@ onMounted(async () => {
<div>
{{
props.row.position !== null ? props.row.position : ""
}}{{
(props.row.posTypeName !== null &&
props.row.posTypeName === "บริหาร") ||
props.row.posTypeName === "อำนวยการ"
? `${props.row.posTypeName}`
: ""
}}{{
props.row.posLevelName !== null
? `${props.row.posLevelName}`
: ""
}}
</div>
<div>
{{ props.row.root !== null ? props.row.root : "-" }}
{{
props.row.rootShortName !== null
? `(${props.row.rootShortName})`
: ""
}}
</div>
<div>
{{
props.row.nodeName !== null ? props.row.nodeName : ""
}}
{{
props.row.nodeShortName !== null
? `(${props.row.nodeShortName}${props.row.posMasterNo})`
: ""
}}
<!-- {{
(props.row.posTypeName !== null &&
props.row.posTypeName === "บริหาร") ||
props.row.posTypeName === "อำนวยการ"
? `${props.row.posTypeName}`
: ""
}} -->
<div>
{{
props.row.positionExecutive !== null
? `${props.row.positionExecutive}${
props.row.positionExecutiveField
? ` (${props.row.positionExecutiveField})`
: ""
}`
: ""
}}
</div>
</div>
<div class="text-html">
{{ findOrgNameHtml(props.row) }}
</div>
</div>
</div>