fixing column บรรจุ แต่งตั้ง ย้าย

This commit is contained in:
Warunee Tamkoo 2024-05-24 14:58:40 +07:00
parent bb2d03e499
commit 9cde68ab4f
74 changed files with 620 additions and 626 deletions

View file

@ -958,6 +958,42 @@ export const useCounterMixin = defineStore("mixin", () => {
}
}
function findOrgNameOld(obj: any) {
if (obj) {
let name =
obj.child4Old != null && obj.child3Old != null
? obj.child4Old + "/"
: obj.child4Old != null
? obj.child4Old
: "";
name +=
obj.child3Old != null && obj.child2Old != null
? obj.child3Old + "/"
: obj.child3Old !== null
? obj.child3Old
: "";
name +=
obj.child2Old != null && obj.child1Old != null
? obj.child2Old + "/"
: obj.child2Old != null
? obj.child2Old
: "";
name +=
obj.child1Old != null && obj.rootOld != null
? obj.child1Old + "/"
: obj.child1Old != null
? obj.child1Old
: "";
name += obj.rootOld != null ? obj.rootOld : "";
return name == "" ? "-" : name;
} else {
return "";
}
}
function findPosMasterNo(obj: any) {
if (obj) {
let shortName =
@ -978,6 +1014,26 @@ export const useCounterMixin = defineStore("mixin", () => {
}
}
function findPosMasterNoOld(obj: any) {
if (obj) {
let shortName =
(obj.child4ShortNameOld != null
? obj.child4ShortNameOld
: obj.child3ShortNameOld != null
? obj.child3ShortNameOld
: obj.child2ShortNameOld != null
? obj.child2ShortNameOld
: obj.child1ShortNameOld != null
? obj.child1ShortNameOld
: obj.rootShortNameOld != null
? obj.rootShortNameOld
: "") + (obj.posMasterNoOld != null ? obj.posMasterNoOld : "");
return shortName == "" ? "-" : shortName;
} else {
return "";
}
}
return {
calAge,
date2Thai,
@ -1016,6 +1072,8 @@ export const useCounterMixin = defineStore("mixin", () => {
convertDateDisplay,
diffDay,
findOrgName,
findOrgNameOld,
findPosMasterNo,
findPosMasterNoOld,
};
});