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

Merge branch 'nice' into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-04-28 11:08:33 +07:00
commit dae8c1b70e
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -284,7 +284,7 @@ async function fetchDataSigner() {
subject.value = data.subjectDoc2;
assignedPosition.value = data.assignedPosition;
nameOfWork.value = data.subjectDoc2[0];
nameOfWork.value = data.subjectDoc2 ? data.subjectDoc2[0] : '';
nameOfOwner.value = data.authorDoc2;
position.value = data.assignedPosition;
evaluationResult.value = data.evaluationResult;

6
src/modules/12_evaluatePersonal/views/MainPage.vue
View file

@ -383,10 +383,12 @@ onMounted(async () => {
</div>
<div v-else-if="col.name === 'agency'">
<div class="text-html">{{ props.row.agency }}</div>
<div class="text-html">
{{ !props.row.agency ? "-" : props.row.agency }}
</div>
</div>
<div v-else>
{{ col.value ?? "-" }}
{{ !col.value ? "-" : col.value }}
</div>
</q-td>
</q-tr>