hrms-bangkok/hrms-user
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:
STW_TTTY\stwtt 2024-06-19 10:48:37 +07:00
commit defcfd56da
10 changed files with 125 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/modules/08_KPI/views/form.vue
View file

@ -63,7 +63,7 @@ async function fetchEvaluation() {
.get(config.API.kpiEvaluation + `/${id.value}`)
.then(async (res) => {
const data = res.data.result;
console.log("🚀 ~ .then ~ data:", data)
// console.log("🚀 ~ .then ~ data:", data);
store.dataEvaluation = await data;
formProfile.status = store.convertStatus(data.evaluationStatus);
@ -89,10 +89,10 @@ async function fetchEvaluation() {
async function getProfile() {
await http
.get(config.API.profilePosition())
.get(config.API.orgPosition + `/${store.dataEvaluation.profileId}`)
.then(async (res) => {
const data = res.data.result;
store.dataProfile = await data;
const data = await res.data.result;
store.dataProfile = data;
})
.catch((e) => {
messageError($q, e);
@ -252,8 +252,8 @@ function filterOption(val: any, update: Function, refData: string) {
// }
async function getAll() {
await getProfile();
await fetchEvaluation();
await getProfile();
await getOrgOp();
await store.checkStep();
}
@ -335,7 +335,7 @@ function sendToCommander() {
messageError($q, e);
})
.finally(() => {
hideLoader()
hideLoader();
});
});
}
@ -418,7 +418,8 @@ onMounted(async () => {
store.indicatorWeightTotal != 100) ||
(store.dataEvaluation.posExecutiveName != null &&
(store.indicatorWeight1Total != 100 ||
store.indicatorWeight2Total != 20)) && store.dataEvaluation.evaluationStatus == 'NEW'
store.indicatorWeight2Total != 20) &&
store.dataEvaluation.evaluationStatus == 'NEW')
"
class="text-red"
>*น้ำหนัก(ร้อยละ) ผลสัมฤทธิ์ของงานไม่ถูกต้อง</span
@ -465,7 +466,8 @@ onMounted(async () => {
<q-btn
v-if="
store.rolePerson == 'USER' &&
store.dataEvaluation.evaluationStatus == 'EVALUATING' && store.tabMain == '3'
store.dataEvaluation.evaluationStatus == 'EVALUATING' &&
store.tabMain == '3'
"
unelevated
round
@ -831,7 +833,10 @@ onMounted(async () => {
</q-dialog> -->
<DialogGovernment v-model:modal="modalGovernment" />
<DialogStatus v-model:modal="modalStatus" />
<DialogStatus
v-model:modal="modalStatus"
v-model:is-probation="store.dataProfile.isProbation"
/>
</template>
<style>
.bg-toolbar {