Merge branch 'develop' of github.com:Frappet/BMA-EHR-USER into develop
* 'develop' of github.com:Frappet/BMA-EHR-USER: งานที่ได้รับมอบหมายพิเศษ
This commit is contained in:
commit
613fbece2e
4 changed files with 203 additions and 66 deletions
|
|
@ -70,6 +70,7 @@ function fetchEvaluation() {
|
|||
.get(config.API.kpiEvaluation + `/${id.value}`)
|
||||
.then((res) => {
|
||||
const data = res.data.result;
|
||||
|
||||
store.dataEvaluation = data;
|
||||
formProfile.status = store.convertStatus(data.evaluationStatus);
|
||||
formProfile.result = store.convertResults(data.evaluationResults);
|
||||
|
|
@ -94,6 +95,7 @@ function getProfile() {
|
|||
.get(config.API.profilePosition())
|
||||
.then((res) => {
|
||||
const data = res.data.result;
|
||||
|
||||
store.dataProfile = data;
|
||||
store.checkCompetency();
|
||||
store.checkCompetencyDefaultCompetencyLevel();
|
||||
|
|
@ -282,7 +284,7 @@ async function clearScore() {
|
|||
|
||||
async function getAll() {
|
||||
await fetchEvaluation();
|
||||
await (store.dataProfile === null ? getProfile() : "");
|
||||
await getProfile(); // await (store.dataProfile === null ? getProfile() : "");
|
||||
await getOrgOp();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue