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

fix การแสดง เลขที่คำสั่ง

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-07-18 10:35:49 +07:00
parent 11631b733b
commit 6097caf22d
3 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/modules/10_registry/02_Government/07_Position.vue
View file

@ -176,6 +176,11 @@ const baseColumns = ref<QTableColumn[]>([
label: "ตำแหน่งทางการบริหาร",
sortable: true,
field: "positionExecutive",
format(val, row) {
return !row.positionExecutiveField
? val
: `${val} (${row.positionExecutiveField})`;
},
headerStyle: "font-size: 14px",
style: "font-size: 14px",
sort: (a: string, b: string) =>
@ -189,7 +194,9 @@ const baseColumns = ref<QTableColumn[]>([
field: "commandNo",
format(val, row) {
return row.commandNo && row.commandYear
? `${row.commandNo}/${Number(row.commandYear) + 543}`
? row.commandType !== "C-PM-47"
? `${row.commandNo}/${Number(row.commandYear) + 543}`
: `${row.commandNo}`
: "";
},
headerStyle: "font-size: 14px",

9
src/modules/10_registry/03_Salary/01_Salary.vue
View file

@ -160,6 +160,11 @@ const baseColumns = ref<QTableColumn[]>([
label: "ตำแหน่งทางการบริหาร",
sortable: true,
field: "positionExecutive",
format(val, row) {
return !row.positionExecutiveField
? val
: `${val} (${row.positionExecutiveField})`;
},
headerStyle: "font-size: 14px",
style: "font-size: 14px",
sort: (a: string, b: string) =>
@ -173,7 +178,9 @@ const baseColumns = ref<QTableColumn[]>([
field: "commandNo",
format(val, row) {
return row.commandNo && row.commandYear
? `${row.commandNo}/${Number(row.commandYear) + 543}`
? row.commandType !== "C-PM-47"
? `${row.commandNo}/${Number(row.commandYear) + 543}`
: `${row.commandNo}`
: "";
},
headerStyle: "font-size: 14px",

1
src/modules/10_registry/interface/index/Main.ts
View file

@ -196,6 +196,7 @@ interface SalaryFormType {
refCommandNo: string | null;
templateDoc: string;
order: number;
commandType: string;
}
interface NopaidFormType {