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

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
setthawutttty 2025-04-08 14:59:17 +07:00
commit 4b2e332849
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/12_evaluatePersonal/components/Detail/step/step8.vue
View file

@ -193,7 +193,7 @@ async function confirmApprove() {
data
)
.then(async () => {
updateEvaluationResult();
await updateEvaluationResult();
await nextStep();
modalConfirm.value = false;
})
@ -328,18 +328,18 @@ async function fetchDataSigner() {
});
}
function updateEvaluationResult() {
async function updateEvaluationResult() {
http
.put(config.API.updateEvaluationResult(id.value), {
result: checkBox.value,
})
.then((res) => {
hideLoader();
})
.then(() => {})
.catch((e) => {
messageError($q, e);
})
.finally(() => {});
.finally(() => {
hideLoader();
});
}
onMounted(async () => {

2
src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue
View file

@ -453,7 +453,7 @@ watch(
}}
</div>
<div v-else-if="col.name === 'posNo'">
{{ `${props.row.orgShortName}${props.row.posMasterNo}` }}
{{ `${props.row.orgShortName} ${props.row.posMasterNo}` }}
</div>
<div v-else-if="col.name === 'fullName'">
{{

2
src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
View file

@ -464,7 +464,7 @@ watch(
}}
</div>
<div v-else-if="col.name === 'posNo'">
{{ `${props.row.orgShortName}${props.row.posMasterNo}` }}
{{ `${props.row.orgShortName} ${props.row.posMasterNo}` }}
</div>
<div v-else-if="col.name === 'fullName'">
{{