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-01 17:20:47 +07:00
parent dbb9e5719b
commit 184e1a8815
12 changed files with 552 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -90,6 +90,50 @@ const columns = ref<QTableProps["columns"]>([
}`;
},
},
{
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: "ตำแหน่งประเภทเดิม",
sortable: true,
field: "positionLevel",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
let name = "";
if (row.positionTypeOld && row.positionLevelOld) {
name = `${row.positionTypeOld} (${row.positionLevelOld})`;
} else if (row.positionTypeOld) {
name = `${row.positionTypeOld}`;
} else if (row.positionLevelOld) {
name = `(${row.positionLevelOld})`;
} else name = "-";
return name;
},
},
{
name: "organizationNameOld",
align: "left",
label: "ตำแหน่ง/สังกัดเดิม",
sortable: true,
field: "organizationNameOld",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format: (val, row) => {
return `${row.organizationPositionOld.replace(/(.*)\s(.*)$/, "$1\n$2")}`;
},
},
{
name: "organizationName",
align: "left",
@ -99,7 +143,7 @@ const columns = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format: (val, row) => {
return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
return `${row.root.position}${row.root.posTypeName}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
},
},
{
@ -161,6 +205,9 @@ const visibleColumns = ref<string[]>([
"no",
"citizenId",
"fullname",
"positionNumberOld",
"positionLevel",
"organizationNameOld",
"organizationName",
"typeCommand",
"dateOfBirth",
@ -178,7 +225,7 @@ const pagination = ref({
async function fecthlistappointment() {
showLoader();
await http
.get(config.API.appointmentMain()+`?status=${status.value}`)
.get(config.API.appointmentMain() + `?status=${status.value}`)
.then((res) => {
let response = res.data.result;
listRecevice.value = response;
@ -544,10 +591,35 @@ onMounted(async () => {
<div v-if="col.name == 'no'">
{{ props.rowIndex + 1 }}
</div>
<div
v-else-if="col.name == 'organizationNameOld'"
class="text-html"
>
{{
props.row.organizationPositionOld !== null
? props.row.organizationPositionOld
: "-"
}}
</div>
<div v-else-if="col.name == 'organizationName'">
<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
@ -555,7 +627,7 @@ onMounted(async () => {
: ""
}}
</div>
<div class="text-weight-light">
<div>
{{
props.row.nodeName !== null ? props.row.nodeName : ""
}}