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

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m21s
Details

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-04-09 10:27:40 +07:00
commit 49b94048af
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/modules/10_registry/components/PositionReview/Table.vue
View file

@ -144,10 +144,10 @@ const baseColumns = ref<QTableColumn[]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(v, row) {
return row.amount
? `${Number(row.amount).toLocaleString()}${
row.amountSpecial !== 0 && row.amountSpecial
? ` (${Number(row.amountSpecial).toLocaleString()})`
return typeof row.amount === "number"
? `${row.amount.toLocaleString()}${
row.amountSpecial !== 0 && typeof row.amountSpecial === "number"
? ` (${row.amountSpecial.toLocaleString()})`
: ""
}`
: "-";
@ -161,7 +161,7 @@ const baseColumns = ref<QTableColumn[]>([
field: "mouthSalaryAmount",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format: (v) => (v ? Number(v).toLocaleString() : "-"),
format: (v) => (typeof v === "number" ? v.toLocaleString() : "-"),
},
{
name: "positionSalaryAmount",
@ -171,7 +171,7 @@ const baseColumns = ref<QTableColumn[]>([
field: "positionSalaryAmount",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format: (v) => (v ? Number(v).toLocaleString() : "-"),
format: (v) => (typeof v === "number" ? v.toLocaleString() : "-"),
},
{
name: "organization",
@ -319,10 +319,12 @@ async function fetchData() {
// tabs.value === "PENDING"
// ? `/${empType.value}/${profileId.value}`
// : `/${empType.value}/done/${profileId.value}`;
// http
// .get(
// `${config.API.profileSalaryTemp}/${empType.value}/done/${profileId.value}`,
// )
http
.get(
`${config.API.profileSalaryTemp}/${empType.value}/done/${profileId.value}`,
)
.get(`${config.API.profileSalaryTemp}/${empType.value}/${profileId.value}`)
.then((res) => {
const data = res.data.result;
rowsMain.value = data;