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

Bug eva

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-04-08 17:21:01 +07:00
parent e27c26ba0a
commit 0821095838
6 changed files with 244 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/modules/06_evaluate/components/viewstep/viewStep1.vue
View file

@ -86,7 +86,7 @@ async function fetchDetail() {
formDetail.positionLevel = data.posLevelName;
formDetail.posNo = data.posNo ?? "";
formDetail.birthDate = data.birthDate;
formDetail.govAge = data.govAge; // ยังไม่มี
// formDetail.govAge = data.govAge; // ยังไม่มี
formDetail.salary = data.salary;
http.get(config.API.dataUserEducations).then((res) => {
@ -107,11 +107,6 @@ async function fetchDetail() {
http.get(config.API.dataUserSalary).then((res) => {
formDetail.salaries = res.data.result;
// formDetail.salary = formDetail.salaries
// ? formattedNumber(
// formDetail.salaries[formDetail.salaries.length - 1].amount
// )
// : "";
});
http.get(config.API.dataUserCertificate("training")).then((res) => {
@ -130,16 +125,9 @@ async function fetchDetail() {
});
http.get(config.API.dataUserAssessments).then((res) => {
// formDetail.honor = res.data.result
// res.data.result.map((e: any) => ({
// receivedDate: e.createdAt,
// authority: e.issuer,
// detail: e.detail,
// orderNumber: e.refCommandNo,
// doce: e.refCommandDate,
formDetail.assessments = res.data.result;
});
// }));
emit("update:formDeital", formDetail);
})
.catch((err) => {
@ -176,26 +164,27 @@ async function fetchCheckSpec(data: any) {
issueDate: date2Thai(e.issueDate),
issuer: e.issuer,
}));
formDetail.salaries = data.salaries.map((e: any) => ({
amount: e.amount,
date: e.date,
mouthSalaryAmount: e.mouthSalaryAmount ? e.mouthSalaryAmount : 0,
posNo: e.posNo,
position: e.position,
positionSalaryAmount: e.positionSalaryAmount ? e.positionSalaryAmount : 0,
refCommandDate: e.refCommandDate ? e.refCommandDate : "",
salaryClass: e.salaryClass ? e.salaryClass : "",
salaryRef: e.salaryRef ? e.salaryRef : "",
salaryStatus: e.salaryStatus ? e.salariesStatus : "",
//
oc: "-",
lineWork: "-",
side: "-",
positionType: "-",
level: "-",
positionsAdministrative: "-",
aspectAdministrative: "-",
}));
formDetail.salaries = data.salaries
// .map((e: any) => ({
// amount: e.amount,
// date: e.date,
// mouthSalaryAmount: e.mouthSalaryAmount ? e.mouthSalaryAmount : 0,
// posNo: e.posNo,
// position: e.position,
// positionSalaryAmount: e.positionSalaryAmount ? e.positionSalaryAmount : 0,
// refCommandDate: e.refCommandDate ? e.refCommandDate : "",
// salaryClass: e.salaryClass ? e.salaryClass : "",
// salaryRef: e.salaryRef ? e.salaryRef : "",
// salaryStatus: e.salaryStatus ? e.salariesStatus : "",
// //
// oc: "-",
// lineWork: "-",
// side: "-",
// positionType: "-",
// level: "-",
// positionsAdministrative: "-",
// aspectAdministrative: "-",
// }));
formDetail.trainings = data.trainings.map((e: any) => ({
dateOrder: date2Thai(e.dateOrder),
department: e.department,
@ -228,11 +217,11 @@ function getData() {
showLoader();
http
.get(config.API.dataUserGovernment)
.then((res) => {
const data = res.data.result;
.then(async (res) => {
const data = await res.data.result;
formDetail.org = data.org;
formDetail.govAge = data.govAge
? `${data.govAge.year} วัน ${data.govAge.month} เดือน ${data.govAge.year} ปี`
? `${data.govAge.year} ปี ${data.govAge.month} เดือน ${data.govAge.day} วัน`
: "";
})
.catch((e) => {
@ -596,12 +585,13 @@ onMounted(async () => {
<span class="q-ml-lg q-my-sm">ผลงานที่เคยเสนอขอประเมิน (ถ้ามี)</span>
</div>
<div class="col-12"><q-separator /></div>
<div class="col-10">
<div class="col-12 q-pa-sm">-</div>
<!-- <div class="col-10">
<TableData
:columns="columnAssessments"
:row="formDetail.assessments"
/>
</div>
</div> -->
</q-card>
</div>
</q-card>