fix: await API fileByFile
This commit is contained in:
parent
9bee07eb7c
commit
0092133ba6
3 changed files with 34 additions and 22 deletions
|
|
@ -9,6 +9,7 @@ import http from "@/plugins/http";
|
||||||
import config from "@/app.config";
|
import config from "@/app.config";
|
||||||
import { useCounterMixin } from "@/stores/mixin";
|
import { useCounterMixin } from "@/stores/mixin";
|
||||||
import { useKpiDataStore } from "@/modules/08_KPI/store";
|
import { useKpiDataStore } from "@/modules/08_KPI/store";
|
||||||
|
import avatar from "@/assets/avatar_user.jpg";
|
||||||
|
|
||||||
import type { FormProfile } from "@/modules/08_KPI/interface/request/index";
|
import type { FormProfile } from "@/modules/08_KPI/interface/request/index";
|
||||||
import type {
|
import type {
|
||||||
|
|
@ -107,11 +108,13 @@ async function getAvatar(id: string) {
|
||||||
.then(async (res) => {
|
.then(async (res) => {
|
||||||
const data = await res.data.result;
|
const data = await res.data.result;
|
||||||
if (data.avatarName) {
|
if (data.avatarName) {
|
||||||
await fetchProfile(id, data.avatarName);
|
fetchProfile(id, data.avatarName);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
messageError($q, e);
|
messageError($q, e);
|
||||||
|
imgProfile.value = avatar;
|
||||||
|
store.dataEvaluation.avartar = avatar;
|
||||||
})
|
})
|
||||||
.finally(() => {
|
.finally(() => {
|
||||||
isLoadAvatar.value = false;
|
isLoadAvatar.value = false;
|
||||||
|
|
@ -119,12 +122,16 @@ async function getAvatar(id: string) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/** ดึงข้อมูล เพื่อเก็บรูปโปรไฟล์ */
|
/** ดึงข้อมูล เพื่อเก็บรูปโปรไฟล์ */
|
||||||
async function fetchProfile(id: string, avatarName: string) {
|
function fetchProfile(id: string, avatarName: string) {
|
||||||
await http
|
http
|
||||||
.get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, avatarName))
|
.get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, avatarName))
|
||||||
.then(async (res) => {
|
.then((res) => {
|
||||||
store.dataEvaluation.avartar = res.data.downloadUrl;
|
store.dataEvaluation.avartar = res.data.downloadUrl;
|
||||||
imgProfile.value = res.data.downloadUrl;
|
imgProfile.value = res.data.downloadUrl;
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
imgProfile.value = avatar;
|
||||||
|
store.dataEvaluation.avartar = avatar;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -208,7 +215,7 @@ async function getOrgOp() {
|
||||||
name: `${i.prefix}${i.firstName} ${i.lastName}`,
|
name: `${i.prefix}${i.firstName} ${i.lastName}`,
|
||||||
}))
|
}))
|
||||||
.find(
|
.find(
|
||||||
(i: EvaOptionType) => i.id == store.dataEvaluation.commanderHighId
|
(i: EvaOptionType) => i.id == store.dataEvaluation.commanderHighId,
|
||||||
);
|
);
|
||||||
isLoadCommander.value = false;
|
isLoadCommander.value = false;
|
||||||
})
|
})
|
||||||
|
|
@ -225,21 +232,21 @@ function filterOption(val: string, update: Function, refData: string) {
|
||||||
case "evaluatorIdOp":
|
case "evaluatorIdOp":
|
||||||
update(() => {
|
update(() => {
|
||||||
evaluatorIdOp.value = evaluatorIdMainOp.value.filter(
|
evaluatorIdOp.value = evaluatorIdMainOp.value.filter(
|
||||||
(v: DataOptions) => v.name.indexOf(val) > -1
|
(v: DataOptions) => v.name.indexOf(val) > -1,
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
case "commanderIdOp":
|
case "commanderIdOp":
|
||||||
update(() => {
|
update(() => {
|
||||||
commanderIdOp.value = commanderIdMainOp.value.filter(
|
commanderIdOp.value = commanderIdMainOp.value.filter(
|
||||||
(v: DataOptions) => v.name.indexOf(val) > -1
|
(v: DataOptions) => v.name.indexOf(val) > -1,
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
case "commanderHighOp":
|
case "commanderHighOp":
|
||||||
update(() => {
|
update(() => {
|
||||||
commanderHighOp.value = commanderHighMainOp.value.filter(
|
commanderHighOp.value = commanderHighMainOp.value.filter(
|
||||||
(v: DataOptions) => v.name.indexOf(val) > -1
|
(v: DataOptions) => v.name.indexOf(val) > -1,
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
|
|
@ -278,7 +285,7 @@ function sendToEvaluatore() {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ยืนยันการส่งข้อตกลงให้ผู้ประเมินอนุมัติ",
|
"ยืนยันการส่งข้อตกลงให้ผู้ประเมินอนุมัติ",
|
||||||
"ต้องการยืนยันส่งข้อตกลงนี้ให้ผู้ประเมินอนุมัติใช่หรือไม่?"
|
"ต้องการยืนยันส่งข้อตกลงนี้ให้ผู้ประเมินอนุมัติใช่หรือไม่?",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -308,7 +315,7 @@ function sendToEvaluateEvaluatore() {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ยืนยันการส่งให้ผู้ประเมินรายงานผลสำเร็จของงาน",
|
"ยืนยันการส่งให้ผู้ประเมินรายงานผลสำเร็จของงาน",
|
||||||
"ต้องการยืนยันส่งให้ผู้ประเมินรายงานผลสำเร็จของงานใช่หรือไม่?"
|
"ต้องการยืนยันส่งให้ผู้ประเมินรายงานผลสำเร็จของงานใช่หรือไม่?",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -338,7 +345,7 @@ function requireEdit() {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ยืนยันการขอแก้ไขข้อตกลง",
|
"ยืนยันการขอแก้ไขข้อตกลง",
|
||||||
"ต้องการยืนยันการขอแก้ไขข้อตกลงนี้ใช่หรือไม่?"
|
"ต้องการยืนยันการขอแก้ไขข้อตกลงนี้ใช่หรือไม่?",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -411,7 +418,7 @@ async function goToSummary() {
|
||||||
store.excusiveIndicator2ScoreVal +
|
store.excusiveIndicator2ScoreVal +
|
||||||
store.competencyScoreVal
|
store.competencyScoreVal
|
||||||
).toFixed(2),
|
).toFixed(2),
|
||||||
}
|
},
|
||||||
)
|
)
|
||||||
.then((res) => {});
|
.then((res) => {});
|
||||||
|
|
||||||
|
|
@ -427,7 +434,7 @@ async function goToSummary() {
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
"ยืนยันการส่งไปสรุปผลการประเมิน",
|
"ยืนยันการส่งไปสรุปผลการประเมิน",
|
||||||
"ต้องการยืนยันส่งไปสรุปผลการประเมินใช่หรือไม่?"
|
"ต้องการยืนยันส่งไปสรุปผลการประเมินใช่หรือไม่?",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -517,7 +524,7 @@ async function downloadReport() {
|
||||||
store.dataEvaluation.prefix +
|
store.dataEvaluation.prefix +
|
||||||
store.dataEvaluation.firstName +
|
store.dataEvaluation.firstName +
|
||||||
" " +
|
" " +
|
||||||
store.dataEvaluation.lastName
|
store.dataEvaluation.lastName,
|
||||||
);
|
);
|
||||||
})
|
})
|
||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
|
|
@ -556,7 +563,7 @@ async function clickUpload(file: any) {
|
||||||
const foundKey: string | undefined = Object.keys(res.data).find(
|
const foundKey: string | undefined = Object.keys(res.data).find(
|
||||||
(key) =>
|
(key) =>
|
||||||
res.data[key]?.fileName !== undefined &&
|
res.data[key]?.fileName !== undefined &&
|
||||||
res.data[key]?.fileName !== ""
|
res.data[key]?.fileName !== "",
|
||||||
);
|
);
|
||||||
foundKey &&
|
foundKey &&
|
||||||
uploadFileDoc(res.data[foundKey]?.uploadUrl, fileUpload.value);
|
uploadFileDoc(res.data[foundKey]?.uploadUrl, fileUpload.value);
|
||||||
|
|
@ -566,7 +573,7 @@ async function clickUpload(file: any) {
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
"ยืนยันการอัปโหลดไฟล์",
|
"ยืนยันการอัปโหลดไฟล์",
|
||||||
"ต้องการยืนยันการอัปโหลดไฟล์นี้หรือไม่ ?"
|
"ต้องการยืนยันการอัปโหลดไฟล์นี้หรือไม่ ?",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -623,7 +630,7 @@ function deleteFile(fileName: string) {
|
||||||
showLoader();
|
showLoader();
|
||||||
http
|
http
|
||||||
.delete(
|
.delete(
|
||||||
config.API.file("แบบกำหนดข้อตกลง", "KPI", id.value) + `/${fileName}`
|
config.API.file("แบบกำหนดข้อตกลง", "KPI", id.value) + `/${fileName}`,
|
||||||
)
|
)
|
||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
messageError($q, e);
|
messageError($q, e);
|
||||||
|
|
|
||||||
|
|
@ -151,6 +151,7 @@ async function getAvatar(id: string) {
|
||||||
})
|
})
|
||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
messageError($q, e);
|
messageError($q, e);
|
||||||
|
profileImg.value = avatar;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -168,14 +169,15 @@ function getList(id: string) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async function getImg(id: string, pathName: string) {
|
function getImg(id: string, pathName: string) {
|
||||||
await http
|
http
|
||||||
.get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, pathName))
|
.get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, pathName))
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
profileImg.value = res.data.downloadUrl;
|
profileImg.value = res.data.downloadUrl;
|
||||||
})
|
})
|
||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
messageError($q, e);
|
profileImg.value = avatar;
|
||||||
|
// messageError($q, e);
|
||||||
hideLoader();
|
hideLoader();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -188,7 +190,7 @@ function onSearch() {
|
||||||
rows.value = onSearchDataTable(
|
rows.value = onSearchDataTable(
|
||||||
filter.value,
|
filter.value,
|
||||||
rowsData.value,
|
rowsData.value,
|
||||||
columns.value ? columns.value : []
|
columns.value ? columns.value : [],
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ async function checkUser() {
|
||||||
await dataStore.getProFileType();
|
await dataStore.getProFileType();
|
||||||
kpiDataStore.dataProfile = data; // Set dataProfile in kpiDataStore
|
kpiDataStore.dataProfile = data; // Set dataProfile in kpiDataStore
|
||||||
if (data.avatarName) {
|
if (data.avatarName) {
|
||||||
await getImg(data.profileId, data.avatarName);
|
getImg(data.profileId, data.avatarName);
|
||||||
} else {
|
} else {
|
||||||
dataStore.profileImg = avatar;
|
dataStore.profileImg = avatar;
|
||||||
}
|
}
|
||||||
|
|
@ -106,6 +106,9 @@ function getImg(id: string, pathName: string) {
|
||||||
.get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, pathName))
|
.get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, pathName))
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
dataStore.profileImg = res.data.downloadUrl;
|
dataStore.profileImg = res.data.downloadUrl;
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
dataStore.profileImg = avatar;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue