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

เช็คค่าว่าง พ้นราชการ

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-10-10 17:45:44 +07:00
parent 544e899728
commit 1aa4b6290f
7 changed files with 47 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/modules/06_retirement/components/Discharged/dischargedMain.vue
View file

@ -133,7 +133,16 @@ const openModalOrder = () => {
openModal();
const row = filters.value.filter(
(r: ResponseData) =>
r.status == "WAITTING" || r.status == "PENDING" || r.status == "APPROVE"
(r.status == "WAITTING" ||
r.status == "PENDING" ||
r.status == "APPROVE") &&
r.organizationPositionOld &&
r.positionTypeOld &&
r.positionLevelOld &&
r.positionNumberOld &&
r.salary &&
r.organization &&
r.date
);
rows2.value = row;
};
@ -148,7 +157,7 @@ const getData = async () => {
data.map((r: ResponseData) => {
list.push({
createdAt: date2Thai(r.createdAt),
date: new Date(),
date: r.date,
firstName: r.firstName ?? "",
id: r.id ?? "",
isActive: r.isActive ? r.isActive : false,

2
src/modules/06_retirement/components/Discharged/dischargedRegistry.vue
View file

@ -91,7 +91,7 @@ const getData = async () => {
organizationPositionOld.value = data.organizationPositionOld ?? "";
positionTypeOld.value = data.positionTypeOld ?? "";
positionLevelOld.value = data.positionLevelOld ?? "";
posNo.value = data.posNo ?? "";
posNo.value = data.positionNumberOld ?? "";
salary.value = data.salary ?? "";
organization.value = data.organization ?? "";
date.value = data.date !== null ? new Date(data.date) : null;

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

@ -116,7 +116,16 @@ const openModalOrder = () => {
openModal();
const row = filters.value.filter(
(r: ResponseData) =>
r.status == "WAITTING" || r.status == "PENDING" || r.status == "APPROVE"
(r.status == "WAITTING" ||
r.status == "PENDING" ||
r.status == "APPROVE") &&
r.organizationPositionOld &&
r.positionTypeOld &&
r.positionLevelOld &&
r.positionNumberOld &&
r.salary &&
r.organization &&
r.date
);
rows2.value = row;
};
@ -132,7 +141,7 @@ const getData = async () => {
data.map((r: ResponseData) => {
list.push({
createdAt: date2Thai(r.createdAt),
date: new Date(),
date: r.date,
firstName: r.firstName ?? "",
id: r.id ?? "",
isActive: r.isActive ? r.isActive : false,

2
src/modules/06_retirement/components/DismissOrder/outRegistry.vue
View file

@ -92,7 +92,7 @@ const getData = async () => {
organizationPositionOld.value = data.organizationPositionOld ?? "";
positionTypeOld.value = data.positionTypeOld ?? "";
positionLevelOld.value = data.positionLevelOld ?? "";
posNo.value = data.posNo ?? "";
posNo.value = data.positionNumberOld ?? "";
salary.value = data.salary ?? "";
organization.value = data.organization ?? "";
date.value = data.date !== null ? new Date(data.date) : null;

13
src/modules/06_retirement/components/Expulsion/expulsionMain.vue
View file

@ -123,7 +123,16 @@ const openModalOrder = () => {
openModal();
const row = filters.value.filter(
(r: ResponseData) =>
r.status == "WAITTING" || r.status == "PENDING" || r.status == "APPROVE"
(r.status == "WAITTING" ||
r.status == "PENDING" ||
r.status == "APPROVE") &&
r.organizationPositionOld &&
r.positionTypeOld &&
r.positionLevelOld &&
r.positionNumberOld &&
r.salary &&
r.organization &&
r.date
);
rows2.value = row;
};
@ -138,7 +147,7 @@ const getData = async () => {
data.map((r: ResponseData) => {
list.push({
createdAt: date2Thai(r.createdAt),
date: new Date(),
date: r.date,
firstName: r.firstName ?? "",
id: r.id ?? "",
isActive: r.isActive ? r.isActive : false,

2
src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue
View file

@ -94,7 +94,7 @@ const getData = async () => {
organizationPositionOld.value = data.organizationPositionOld ?? "";
positionTypeOld.value = data.positionTypeOld ?? "";
positionLevelOld.value = data.positionLevelOld ?? "";
posNo.value = data.posNo ?? "";
posNo.value = data.positionNumberOld ?? "";
salary.value = data.salary ?? "";
organization.value = data.organization ?? "";
date.value = data.date !== null ? new Date(data.date) : null;

13
src/modules/06_retirement/components/resign/Resign.vue
View file

@ -158,7 +158,16 @@ const openModalOrder = () => {
openModal();
const row = filters.value.filter(
(r: ResponseItems) =>
r.status == "WAITTING" || r.status == "PENDING" || r.status == "APPROVE"
(r.status == "WAITTING" ||
r.status == "PENDING" ||
r.status == "APPROVE") &&
r.organizationPositionOld &&
r.positionTypeOld &&
r.positionLevelOld &&
r.positionNumberOld &&
r.salary &&
r.location &&
r.sendDate
);
rows2.value = row;
};
@ -195,7 +204,7 @@ const fecthlist = async () => {
profileId: r.profileId ?? "",
reason: r.reason ?? "",
salary: r.salary ? r.salary : 0,
sendDate: new Date(),
sendDate: r.sendDate,
status: r.status ?? "",
statustext: statusText(r.status ?? ""),
fullname: `${r.prefix ?? ""}${r.firstName ?? ""} ${r.lastName ?? ""}`,