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

fix filter placemrnt

Browse source
This commit is contained in:
Warunee Tamkoo 2025-06-20 18:12:39 +07:00
parent fc4404a391
commit f7ed037ba6
7 changed files with 172 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/05_placement/views/03_receiveMain.vue
View file

@ -38,6 +38,7 @@ const {
dialogRemove,
onSearchDataTable,
findOrgNameHtml,
findOrgName,
} = mixin;
const status = ref<string>("");
@ -163,7 +164,14 @@ const columns = ref<QTableProps["columns"]>([
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
format: (val, row) => {
return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
// return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
return `${row.position !== null ? row.position : ""}${
row.posLevelName !== null ? `${row.posLevelName}` : ""
} ${
row.nodeShortName !== null
? `(${row.nodeShortName}${row.posMasterNo})`
: ""
} ${findOrgName(row)}`;
},
},
{

22
src/modules/05_placement/views/06_appointPromoteMain.vue
View file

@ -37,6 +37,7 @@ const {
dialogRemove,
onSearchDataTable,
findOrgNameHtml,
findOrgName,
} = useCounterMixin();
const status = ref<string>("");
@ -147,9 +148,24 @@ const columns = ref<QTableProps["columns"]>([
field: "organizationName",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
// format: (val, row) => {
// return `${row.root.position}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
// },
format: (val, row) => {
// return `${row.root.position}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
return `${row.position !== null ? row.position : ""}${
row.posLevelName !== null ? `${row.posLevelName}` : ""
} ${
row.nodeShortName !== null
? `(${row.nodeShortName}${row.posMasterNo})`
: ""
} ${
row.positionExecutive !== null
? `${row.positionExecutive}${
row.positionExecutiveField
? ` (${row.positionExecutiveField})`
: ""
}`
: ""
} ${findOrgName(row)}`;
},
},
{
name: "dateOfBirth",

10
src/modules/05_placement/views/07_appointEmployeeMain.vue
View file

@ -36,6 +36,7 @@ const {
dialogRemove,
onSearchDataTable,
findOrgNameHtml,
findOrgName,
} = mixin;
const status = ref<string>("");
@ -166,7 +167,14 @@ const columns = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format: (val, row) => {
return `${row.root.position}${row.root.posTypeName}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
// return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
return `${row.position !== null ? row.position : ""} ${
row.posLevelName !== null ? `${row.posLevelName}` : ""
} ${
row.nodeShortName !== null
? `(${row.nodeShortName}${row.posMasterNo})`
: ""
} ${findOrgName(row)}`;
},
},
{

12
src/modules/05_placement/views/08_otherMain.vue
View file

@ -35,6 +35,7 @@ const {
dialogRemove,
onSearchDataTable,
findChildNameHtml,
findOrgName,
} = useCounterMixin();
const modal = ref<boolean>(false);
@ -134,8 +135,15 @@ const columns = ref<QTableProps["columns"]>([
label: "ตำแหน่ง/หน่วยงานที่บรรจุกลับ",
sortable: true,
field: "organizationPositionReturn",
format(val, row) {
return row.organizationPositionReturn.replace(/\n/g, " ");
format: (val, row) => {
// return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
return `${row.position !== null ? row.position : ""}${
row.posLevelName !== null ? `${row.posLevelName}` : ""
} ${
row.nodeShortName !== null
? `(${row.nodeShortName}${row.posMasterNo})`
: ""
} ${findOrgName(row)}`;
},
headerStyle: "font-size: 14px",
style: "font-size: 14px",