fix leave position commander
This commit is contained in:
parent
0372eb9726
commit
2ba418651b
4 changed files with 18 additions and 9 deletions
|
|
@ -221,11 +221,11 @@ const columns = ref<QTableProps["columns"]>([
|
|||
style: "font-size: 14px",
|
||||
},
|
||||
{
|
||||
name: "positionName",
|
||||
name: "positionSign",
|
||||
align: "left",
|
||||
label: "ตำแหน่ง",
|
||||
label: "ตำแหน่งใต้ลายเซ็น",
|
||||
sortable: true,
|
||||
field: "positionName",
|
||||
field: "positionSign",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
|
|
@ -612,6 +612,9 @@ function onSend() {
|
|||
await http
|
||||
.get(config.API.sendApprove(paramsId))
|
||||
.then(async () => {
|
||||
await http.put(config.API.adminSender(paramsId)).catch((e) => {
|
||||
messageError($q, e);
|
||||
});
|
||||
await fetchDetailLeave(paramsId);
|
||||
success($q, "ส่งไปพิจารณา");
|
||||
})
|
||||
|
|
@ -1107,13 +1110,13 @@ onMounted(async () => {
|
|||
</div>
|
||||
<div class="col-xs-6 row items-start">
|
||||
<div class="col-12 text-weight-bold text-top">
|
||||
ตำแหน่ง
|
||||
ตำแหน่งใต้ลายเซ็น
|
||||
</div>
|
||||
|
||||
<div class="col-12 text-detail">
|
||||
{{
|
||||
rows && rows.approvers[0]?.positionName
|
||||
? rows?.approvers[0].positionName
|
||||
rows && rows.approvers[0]?.positionSign
|
||||
? rows?.approvers[0].positionSign
|
||||
: "-"
|
||||
}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -70,12 +70,15 @@ const columns = ref<QTableProps["columns"]>([
|
|||
style: "font-size: 14px",
|
||||
},
|
||||
{
|
||||
name: "posExecutiveName",
|
||||
name: "positionSign",
|
||||
align: "left",
|
||||
label: "ตำแหน่งทางการบริหาร",
|
||||
label: "ตำแหน่งใต้ลายเซ็น",
|
||||
sortable: true,
|
||||
field: "posExecutiveName",
|
||||
field: "positionSign",
|
||||
headerStyle: "font-size: 14px",
|
||||
format(val, row) {
|
||||
return val ?? row.posExecutiveName;
|
||||
},
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
{
|
||||
|
|
@ -147,6 +150,7 @@ function onSubmit() {
|
|||
firstName: items.firstName,
|
||||
lastName: items.lastName,
|
||||
positionName: items.position,
|
||||
positionSign: items.positionSign ?? items.posExecutiveName,
|
||||
profileId: items.id,
|
||||
keycloakId: items.keycloakId,
|
||||
}));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue