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

updated

Browse source
This commit is contained in:
Warunee Tamkoo 2024-05-24 18:06:05 +07:00
parent bf84ecda8a
commit fce4bb8a2d
2 changed files with 33 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/modules/06_retirement/components/DismissOrder/DialogSendToCommand.vue
View file

@ -20,7 +20,7 @@ const {
messageError,
dialogConfirm,
hideLoader,
findOrgName,
date2Thai,
} = mixin;
/** คอลัมน์ */
@ -46,15 +46,6 @@ const columns2 = ref<QTableProps["columns"]>([
return `${row.prefix}${row.firstName} ${row.lastName}`;
},
},
{
name: "position",
align: "left",
label: "ตำแหน่งในสายงาน",
sortable: true,
field: "position",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "positionLevel",
align: "left",
@ -65,27 +56,34 @@ const columns2 = ref<QTableProps["columns"]>([
style: "font-size: 14px",
format(val, row) {
let name = "";
if (row.posTypeName && row.posLevelName) {
name = `${row.posTypeName} (${row.posLevelName})`;
} else if (row.posTypeName) {
name = `${row.posTypeName}`;
} else if (row.posLevelName) {
name = `(${row.posLevelName})`;
if (row.positionTypeOld && row.positionLevelOld) {
name = `${row.positionTypeOld} (${row.positionLevelOld})`;
} else if (row.positionTypeOld) {
name = `${row.positionTypeOld}`;
} else if (row.positionLevelOld) {
name = `(${row.positionLevelOld})`;
} else name = "-";
return name;
},
},
{
name: "org",
name: "organizationPositionOld",
align: "left",
label: "สังกัด",
label: "ตำแหน่ง/สังกัดเดิม",
sortable: true,
field: "org",
field: "organizationPositionOld",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return findOrgName(row);
},
},
{
name: "createdAt",
align: "left",
label: "วันที่ดำเนินการ",
sortable: true,
field: "createdAt",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format: (val) => date2Thai(val),
},
{
name: "status",
@ -103,9 +101,9 @@ const columns2 = ref<QTableProps["columns"]>([
const visibleColumns2 = ref<string[]>([
"no",
"fullname",
"position",
"positionLevel",
"org",
"organizationPositionOld",
"createdAt",
"status",
]);

35
src/modules/06_retirement/components/DismissOrder/DismissOrder.vue
View file

@ -22,7 +22,7 @@ const {
hideLoader,
success,
dialogMessage,
findOrgName,
findOrgNameOld,
} = mixin;
const { statusText } = transferStore;
const modal = ref<boolean>(false);
@ -31,9 +31,8 @@ const modal = ref<boolean>(false);
const visibleColumns = ref<string[]>([
"no",
"fullname",
"position",
"positionLevel",
"org",
"organizationPositionOld",
"createdAt",
"status",
]);
@ -69,15 +68,6 @@ const columns = ref<QTableProps["columns"]>([
return `${row.prefix}${row.firstName} ${row.lastName}`;
},
},
{
name: "position",
align: "left",
label: "ตำแหน่งในสายงาน",
sortable: true,
field: "position",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "positionLevel",
align: "left",
@ -88,27 +78,24 @@ const columns = ref<QTableProps["columns"]>([
style: "font-size: 14px",
format(val, row) {
let name = "";
if (row.posTypeName && row.posLevelName) {
name = `${row.posTypeName} (${row.posLevelName})`;
} else if (row.posTypeName) {
name = `${row.posTypeName}`;
} else if (row.posLevelName) {
name = `(${row.posLevelName})`;
if (row.positionTypeOld && row.positionLevelOld) {
name = `${row.positionTypeOld} (${row.positionLevelOld})`;
} else if (row.positionTypeOld) {
name = `${row.positionTypeOld}`;
} else if (row.positionLevelOld) {
name = `(${row.positionLevelOld})`;
} else name = "-";
return name;
},
},
{
name: "org",
name: "organizationPositionOld",
align: "left",
label: "สังกัด",
label: "ตำแหน่ง/สังกัดเดิม",
sortable: true,
field: "org",
field: "organizationPositionOld",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return findOrgName(row);
},
},
{
name: "createdAt",