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-01-30 10:21:03 +07:00
commit ae3d690966
4 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/05_placement/components/probation/FormEvaluation/Template3.vue
View file

@ -125,7 +125,7 @@ onMounted(() => {
<div class="q-gutter-md" v-else> <div class="q-gutter-md" v-else>
<div class="flex justify-center items-center q-my-md q-gutter-md"> <div class="flex justify-center items-center q-my-md q-gutter-md">
ยังไม่ได้รับการแบบประเมินผล ยังไม่ได้ดำเนินการแบบประเมินผล
</div> </div>
</div> </div>
</template> </template>

2
src/modules/05_placement/components/probation/FormEvaluation/TemplateSummaryScore.vue
View file

@ -83,7 +83,7 @@ onMounted(() => {
<div class="q-gutter-md" v-else> <div class="q-gutter-md" v-else>
<div class="flex justify-center items-center q-my-md q-gutter-md"> <div class="flex justify-center items-center q-my-md q-gutter-md">
ยังไม่ได้รับการแบบประเมินผล ยังไม่ได้ดำเนินการแบบประเมินผล
</div> </div>
</div> </div>
</template> </template>

3
src/modules/15_development/interface/response/Main.ts
View file

@ -167,6 +167,7 @@ interface DataTree {
totalRootPositionNextUse: number | null; totalRootPositionNextUse: number | null;
totalRootPositionNextVacant: number | null; totalRootPositionNextVacant: number | null;
children: DataTree; children: DataTree;
orgTreeDnaId: string;
} }
interface ResHistory { interface ResHistory {
@ -221,5 +222,5 @@ export type {
ResHistory, ResHistory,
ResPrefix, ResPrefix,
ResRisk, ResRisk,
PositionsType PositionsType,
}; };

13
src/modules/15_development/views/MainPage.vue
View file

@ -205,8 +205,8 @@ function onSubmit() {
http http
.post(config.API.developmentMain, formProject) .post(config.API.developmentMain, formProject)
.then(async (res) => { .then(async (res) => {
await closeDialog(); closeDialog();
await router.push(`/development/${res.data.result}`); router.push(`/development/${res.data.result}`);
}) })
.catch((e) => { .catch((e) => {
messageError($q, e); messageError($q, e);
@ -242,12 +242,15 @@ function updateSelected(data: DataTree) {
* function เลือกหน่วยงานที่จะค้นหาโครงกา * function เลือกหน่วยงานที่จะค้นหาโครงกา
*/ */
function updateSelectedTreeMain(data: DataTree) { function updateSelectedTreeMain(data: DataTree) {
if (formQuery.node === data.orgLevel && formQuery.nodeId === data.orgTreeId) { if (
formQuery.node === data.orgLevel &&
formQuery.nodeId === data.orgTreeDnaId
) {
formQuery.node = null; formQuery.node = null;
formQuery.nodeId = null; formQuery.nodeId = null;
} else { } else {
formQuery.node = data.orgLevel; formQuery.node = data.orgLevel;
formQuery.nodeId = data.orgTreeId; formQuery.nodeId = data.orgTreeDnaId;
} }
fetchListProjectNew(); // fetch โครงการ fetchListProjectNew(); // fetch โครงการ
} }
@ -325,7 +328,7 @@ onMounted(() => {
<q-item <q-item
clickable clickable
@click.stop="updateSelectedTreeMain(prop.node)" @click.stop="updateSelectedTreeMain(prop.node)"
:active="formQuery.nodeId === prop.node.orgTreeId" :active="formQuery.nodeId === prop.node.orgTreeDnaId"
active-class="my-list-link text-primary text-weight-medium" active-class="my-list-link text-primary text-weight-medium"
class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list" class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
> >