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 18:19:28 +07:00
parent 370050eab9
commit a6c90edfd3
5 changed files with 98 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
public/File/สรรหาสอบแข่งขัน_จำนวนผู้สอบทั้งหมด.xlsx
View file

Binary file not shown.

32
src/modules/05_placement/views/03_receiveMain.vue
View file

@ -37,6 +37,7 @@ const {
date2Thai, date2Thai,
dialogRemove, dialogRemove,
onSearchDataTable, onSearchDataTable,
findOrgNameHtml,
} = mixin; } = mixin;
const status = ref<string>(""); const status = ref<string>("");
@ -635,8 +636,32 @@ onMounted(async () => {
</div> </div>
<div v-else-if="col.name == 'organizationName'"> <div v-else-if="col.name == 'organizationName'">
<div class="col-4"> {{ props.row.position !== null ? props.row.position : ""
<div> }}{{
props.row.posLevelName !== null
? `${props.row.posLevelName}`
: ""
}}
{{
props.row.nodeShortName !== null
? `(${props.row.nodeShortName}${props.row.posMasterNo})`
: ""
}}
<!-- <div>
{{
props.row.positionExecutive !== null
? `${props.row.positionExecutive}${
props.row.positionExecutiveField
? ` (${props.row.positionExecutiveField})`
: ""
}`
: ""
}}
</div> -->
<div class="text-html">
{{ findOrgNameHtml(props.row) }}
</div>
<!-- <div>
{{ {{
props.row.position !== null ? props.row.position : "" props.row.position !== null ? props.row.position : ""
}}{{ }}{{
@ -668,8 +693,7 @@ onMounted(async () => {
? `(${props.row.nodeShortName}${props.row.posMasterNo})` ? `(${props.row.nodeShortName}${props.row.posMasterNo})`
: "" : ""
}} }}
</div> </div> -->
</div>
</div> </div>
<div v-else> <div v-else>
{{ col.value ? col.value : "-" }} {{ col.value ? col.value : "-" }}

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

@ -614,45 +614,39 @@ onMounted(async () => {
</div> </div>
<div v-else-if="col.name == 'organizationName'"> <div v-else-if="col.name == 'organizationName'">
<div class="col-4"> {{ props.row.position !== null ? props.row.position : ""
<div> }}{{
{{ props.row.posLevelName !== null
props.row.position !== null ? props.row.position : "" ? `${props.row.posLevelName}`
}}{{ : ""
props.row.posLevelName !== null }}
? `${props.row.posLevelName}` <!-- {{
: ""
}}
{{
props.row.nodeShortName !== null
? `(${props.row.nodeShortName}${props.row.posMasterNo})`
: ""
}}
<!-- {{
(props.row.posTypeName !== null && (props.row.posTypeName !== null &&
props.row.posTypeName === "บริหาร") || props.row.posTypeName === "บริหาร") ||
props.row.posTypeName === "อำนวยการ" props.row.posTypeName === "อำนวยการ"
? `${props.row.posTypeName}` ? `${props.row.posTypeName}`
: "" : ""
}} --> }} -->
<div> {{
{{ props.row.nodeShortName !== null
props.row.positionExecutive !== null ? `(${props.row.nodeShortName}${props.row.posMasterNo})`
? `${props.row.positionExecutive}${ : ""
props.row.positionExecutiveField }}
? ` (${props.row.positionExecutiveField})` <div>
: "" {{
}` props.row.positionExecutive !== null
: "" ? `${props.row.positionExecutive}${
}} props.row.positionExecutiveField
</div> ? ` (${props.row.positionExecutiveField})`
</div> : ""
<div class="text-html"> }`
{{ findOrgNameHtml(props.row) }} : ""
</div> }}
</div>
<div class="text-html">
{{ findOrgNameHtml(props.row) }}
</div> </div>
</div> </div>
<div v-else> <div v-else>
{{ col.value ? col.value : "-" }} {{ col.value ? col.value : "-" }}
</div> </div>

49
src/modules/05_placement/views/07_appointEmployeeMain.vue
View file

@ -35,6 +35,7 @@ const {
date2Thai, date2Thai,
dialogRemove, dialogRemove,
onSearchDataTable, onSearchDataTable,
findOrgNameHtml,
} = mixin; } = mixin;
const status = ref<string>(""); const status = ref<string>("");
@ -584,41 +585,19 @@ onMounted(async () => {
</div> </div>
<div v-else-if="col.name == 'organizationName'"> <div v-else-if="col.name == 'organizationName'">
<div class="col-4"> {{ props.row.position !== null ? props.row.position : "" }}
<div> {{
{{ props.row.posLevelName !== null
props.row.position !== null ? props.row.position : "" ? `${props.row.posLevelName}`
}}{{ : ""
(props.row.posTypeName !== null && }}
props.row.posTypeName === "บริหาร") || {{
props.row.posTypeName === "อำนวยการ" props.row.nodeShortName !== null
? `${props.row.posTypeName}` ? `(${props.row.nodeShortName}${props.row.posMasterNo})`
: "" : ""
}} }}
{{ <div class="text-html">
props.row.posLevelName !== null {{ findOrgNameHtml(props.row) }}
? `(${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})`
: ""
}}
</div>
</div> </div>
</div> </div>

66
src/modules/05_placement/views/08_otherMain.vue
View file

@ -489,41 +489,37 @@ onMounted(() => {
</div> </div>
<div v-else-if="col.name === 'organizationPositionReturn'"> <div v-else-if="col.name === 'organizationPositionReturn'">
<div class="col-4"> {{ props.row.position !== null ? props.row.position : ""
<div> }}{{
<!-- {{ props.row.posLevelName !== null
(props.row.posTypeName !== null && ? `${props.row.posLevelName}`
props.row.posTypeName === "บริหาร") || : ""
props.row.posTypeName === "อำนวยการ" }}
? `${props.row.posTypeName}` <!-- {{
: "" (props.row.posTypeName !== null &&
}} --> props.row.posTypeName === "บริหาร") ||
{{ props.row.posTypeName === "อำนวยการ"
props.row.position !== null ? props.row.position : "" ? `${props.row.posTypeName}`
}}{{ : ""
props.row.posLevelName !== null }} -->
? `${props.row.posLevelName}` {{
: "" props.row.nodeShortName !== null
}} ? `(${props.row.nodeShortName}${props.row.posMasterNo})`
{{ : ""
props.row.nodeShortName !== null }}
? `(${props.row.nodeShortName}${props.row.posMasterNo})` <div>
: "" {{
}} props.row.positionExecutive !== null
</div> ? `${props.row.positionExecutive}${
<!-- <div> props.row.positionExecutiveField
{{ ? ` (${props.row.positionExecutiveField})`
props.row.nodeName !== null ? props.row.nodeName : "" : ""
}} }`
{{ : ""
props.row.nodeShortName !== null }}
? `(${props.row.nodeShortName}${props.row.posMasterNo})` </div>
: "" <div class="text-html">
}} {{ findChildNameHtml(props.row) }}
</div> -->
<div class="text-html">
{{ findChildNameHtml(props.row) }}
</div>
</div> </div>
</div> </div>