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:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-04-02 14:29:20 +07:00
parent 6f0cfce70b
commit 1a109fd5e3
2 changed files with 128 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

87
src/modules/05_placement/components/Other/DialogOrders.vue
View file

@ -53,16 +53,18 @@ const dataMapToSend = computed(() => {
lastName: i.lastName,
citizenId: i.citizenId,
remarkVertical: i.reason,
position: i.positionOld,
posType: i.positionTypeOld,
posLevel: i.positionLevelOld,
position: i.position,
posType: i.posTypeName,
posLevel: i.posLevelName,
}));
});
const visibleColumns2 = ref<string[]>([
"no",
"fullname",
"positionNumberOld",
"positionLevel",
"organizationPositionOld",
"organizationPositionReturn",
"createdAt",
"status",
]);
@ -85,13 +87,29 @@ const columns2 = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return `${row.prefix}${row.firstName} ${row.lastName}`;
return `${row.prefix === null ? "" : row.prefix}${row.firstName} ${
row.lastName
}`;
},
},
{
name: "positionNumberOld",
align: "left",
label: "ตำแหน่งเลขที่เดิม",
sortable: true,
field: "positionNumberOld",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return row.positionNumberOld;
},
},
{
name: "positionLevel",
align: "left",
label: "ประเภทตำแหน่ง",
label: "ตำแหน่งประเภทเดิม",
sortable: true,
field: "positionLevel",
headerStyle: "font-size: 14px",
@ -120,6 +138,19 @@ const columns2 = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "organizationPositionReturn",
align: "left",
label: "ตำแหน่ง/หน่วยงานที่บรรจุกลับ",
sortable: true,
field: "organizationPositionReturn",
format(val, row) {
return row.organizationPositionOld.replace(/\n/g, " ");
},
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "createdAt",
align: "left",
@ -315,7 +346,51 @@ watch(
v-else-if="col.name === 'organizationPositionOld'"
class="text-html"
>
{{ props.row.organizationPositionOld ?? '-' }}
{{ props.row.organizationPositionOld ?? "-" }}
</div>
<div
v-else-if="col.name === 'organizationPositionReturn'"
>
<div class="col-4">
<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})`
: ""
}}
</div>
</div>
</div>
<div v-else>

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

@ -45,9 +45,10 @@ const filterKeyword2 = ref<string>(""); //คำค้นหารายกา
const visibleColumns = ref<string[]>([
"no",
"fullname",
"organizationPositionReturn",
"positionNumberOld",
"positionLevel",
"organizationPositionOld",
"organizationPositionReturn",
"createdAt",
"status",
]);
@ -77,21 +78,22 @@ const columns = ref<QTableProps["columns"]>([
},
{
name: "organizationPositionReturn",
name: "positionNumberOld",
align: "left",
label: "ตำแหน่ง/หน่วยงานที่บรรจุกลับ",
label: "ตำแหน่งเลขที่เดิม",
sortable: true,
field: "organizationPositionReturn",
format(val, row) {
return row.organizationPositionOld.replace(/\n/g, " ");
},
field: "positionNumberOld",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return row.positionNumberOld;
},
},
{
name: "positionLevel",
align: "left",
label: "ประเภทตำแหน่ง",
label: "ตำแหน่งประเภทเดิม",
sortable: true,
field: "positionLevel",
headerStyle: "font-size: 14px",
@ -120,6 +122,19 @@ const columns = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "organizationPositionReturn",
align: "left",
label: "ตำแหน่ง/หน่วยงานที่บรรจุกลับ",
sortable: true,
field: "organizationPositionReturn",
format(val, row) {
return row.organizationPositionOld.replace(/\n/g, " ");
},
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "createdAt",
align: "left",
@ -455,9 +470,31 @@ onMounted(() => {
{{ props.rowIndex + 1 }}
</div>
<div
v-else-if="col.name === 'organizationPositionOld'"
class="text-html"
>
{{ props.row.organizationPositionOld ?? "-" }}
</div>
<div v-else-if="col.name === 'organizationPositionReturn'">
<div class="col-4">
<div class="text-weight-medium">
<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
@ -465,7 +502,7 @@ onMounted(() => {
: ""
}}
</div>
<div class="text-weight-light">
<div>
{{
props.row.nodeName !== null ? props.row.nodeName : ""
}}
@ -478,13 +515,6 @@ onMounted(() => {
</div>
</div>
<div
v-else-if="col.name === 'organizationPositionOld'"
class="text-html"
>
{{ props.row.organizationPositionOld ?? "-" }}
</div>
<div v-else>
{{ col.value ? col.value : "-" }}
</div>