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

fix edit registry excel & org

Browse source
This commit is contained in:
Warunee Tamkoo 2025-06-19 14:23:31 +07:00
parent 152ea8aa38
commit aec36b1b6a
2 changed files with 173 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/04_registryPerson/views/edit/components/Table.vue
View file

@ -447,10 +447,8 @@ function exportToExcel() {
? e.posNumCodeSit ? e.posNumCodeSit
: "", : "",
commandNo: commandNo:
e.posNumCodeSitAbb && e.posNumCodeSit e.commandNo && e.commandYear
? `${e.posNumCodeSit} (${e.posNumCodeSitAbb})` ? `${e.commandNo}/${Number(e.commandYear) + 543}`
: e.posNumCodeSit
? e.posNumCodeSit
: "", : "",
commandDateSign: date2Thai(e.commandDateSign), commandDateSign: date2Thai(e.commandDateSign),
commandCode: store.convertCommandCodeName(e.commandCode), commandCode: store.convertCommandCodeName(e.commandCode),

246
src/stores/mixin.ts
View file

@ -995,33 +995,45 @@ export const useCounterMixin = defineStore("mixin", () => {
function findOrgName(obj: any) { function findOrgName(obj: any) {
if (obj) { if (obj) {
let name = let name =
obj.child4 != null && obj.child3 != null obj.child4 != null &&
obj.child4 !== "" &&
obj.child3 != null &&
obj.child3 !== ""
? obj.child4 + " " ? obj.child4 + " "
: obj.child4 != null : obj.child4 != null && obj.child4 !== ""
? obj.child4 ? obj.child4
: ""; : "";
name += name +=
obj.child3 != null && obj.child2 != null obj.child3 != null &&
obj.child3 !== "" &&
obj.child2 != null &&
obj.child2 !== ""
? obj.child3 + " " ? obj.child3 + " "
: obj.child3 !== null : obj.child3 != null && obj.child3 !== ""
? obj.child3 ? obj.child3
: ""; : "";
name += name +=
obj.child2 != null && obj.child1 != null obj.child2 != null &&
obj.child2 !== "" &&
obj.child1 != null &&
obj.child1 !== ""
? obj.child2 + " " ? obj.child2 + " "
: obj.child2 != null : obj.child2 != null && obj.child2 !== ""
? obj.child2 ? obj.child2
: ""; : "";
name += name +=
obj.child1 != null && obj.root != null obj.child1 != null &&
obj.child1 !== "" &&
obj.root != null &&
obj.root !== ""
? obj.child1 + " " ? obj.child1 + " "
: obj.child1 != null : obj.child1 != null && obj.child1 !== ""
? obj.child1 ? obj.child1
: ""; : "";
name += obj.root != null ? obj.root : ""; name += obj.root != null && obj.root !== "" ? obj.root : "";
return name == "" ? "-" : name; return name == "" ? "-" : name;
} else { } else {
return ""; return "";
@ -1031,33 +1043,45 @@ export const useCounterMixin = defineStore("mixin", () => {
function findOrgNameOld(obj: any) { function findOrgNameOld(obj: any) {
if (obj) { if (obj) {
let name = let name =
obj.child4Old != null && obj.child3Old != null obj.child4Old != null &&
obj.child4Old !== "" &&
obj.child3Old != null &&
obj.child3Old !== ""
? obj.child4Old + " " ? obj.child4Old + " "
: obj.child4Old != null : obj.child4Old != null && obj.child4Old !== ""
? obj.child4Old ? obj.child4Old
: ""; : "";
name += name +=
obj.child3Old != null && obj.child2Old != null obj.child3Old != null &&
obj.child3Old !== "" &&
obj.child2Old != null &&
obj.child2Old !== ""
? obj.child3Old + " " ? obj.child3Old + " "
: obj.child3Old !== null : obj.child3Old != null && obj.child3Old !== ""
? obj.child3Old ? obj.child3Old
: ""; : "";
name += name +=
obj.child2Old != null && obj.child1Old != null obj.child2Old != null &&
obj.child2Old !== "" &&
obj.child1Old != null &&
obj.child1Old !== ""
? obj.child2Old + " " ? obj.child2Old + " "
: obj.child2Old != null : obj.child2Old != null && obj.child2Old !== ""
? obj.child2Old ? obj.child2Old
: ""; : "";
name += name +=
obj.child1Old != null && obj.rootOld != null obj.child1Old != null &&
obj.child1Old !== "" &&
obj.rootOld != null &&
obj.rootOld !== ""
? obj.child1Old + " " ? obj.child1Old + " "
: obj.child1Old != null : obj.child1Old != null && obj.child1Old !== ""
? obj.child1Old ? obj.child1Old
: ""; : "";
name += obj.rootOld != null ? obj.rootOld : ""; name += obj.rootOld != null && obj.rootOld !== "" ? obj.rootOld : "";
return name == "" ? "-" : name; return name == "" ? "-" : name;
} else { } else {
return ""; return "";
@ -1067,33 +1091,48 @@ export const useCounterMixin = defineStore("mixin", () => {
function findOrgChildName(obj: any) { function findOrgChildName(obj: any) {
if (obj) { if (obj) {
let name = let name =
obj.orgChild4Name != null && obj.orgChild3Name != null obj.orgChild4Name != null &&
obj.orgChild4Name !== "" &&
obj.orgChild3Name != null &&
obj.orgChild3Name !== ""
? obj.orgChild4Name + " " ? obj.orgChild4Name + " "
: obj.orgChild4Name != null : obj.orgChild4Name != null && obj.orgChild4Name !== ""
? obj.orgChild4Name ? obj.orgChild4Name
: ""; : "";
name += name +=
obj.orgChild3Name != null && obj.orgChild2Name != null obj.orgChild3Name != null &&
obj.orgChild3Name !== "" &&
obj.orgChild2Name != null &&
obj.orgChild2Name !== ""
? obj.orgChild3Name + " " ? obj.orgChild3Name + " "
: obj.orgChild3Name !== null : obj.orgChild3Name != null && obj.orgChild3Name !== ""
? obj.orgChild3Name ? obj.orgChild3Name
: ""; : "";
name += name +=
obj.orgChild2Name != null && obj.orgChild1Name != null obj.orgChild2Name != null &&
obj.orgChild2Name !== "" &&
obj.orgChild1Name != null &&
obj.orgChild1Name !== ""
? obj.orgChild2Name + " " ? obj.orgChild2Name + " "
: obj.orgChild2Name != null : obj.orgChild2Name != null && obj.orgChild2Name !== ""
? obj.orgChild2Name ? obj.orgChild2Name
: ""; : "";
name += name +=
obj.orgChild1Name != null && obj.orgRootName != null obj.orgChild1Name != null &&
obj.orgChild1Name !== "" &&
obj.orgRootName != null &&
obj.orgRootName !== ""
? obj.orgChild1Name + " " ? obj.orgChild1Name + " "
: obj.orgChild1Name != null : obj.orgChild1Name != null && obj.orgChild1Name !== ""
? obj.orgChild1Name ? obj.orgChild1Name
: ""; : "";
name += obj.orgRootName != null ? obj.orgRootName : ""; name +=
obj.orgRootName != null && obj.orgRootName !== ""
? obj.orgRootName
: "";
return name == "" ? "-" : name; return name == "" ? "-" : name;
} else { } else {
return ""; return "";
@ -1103,17 +1142,20 @@ export const useCounterMixin = defineStore("mixin", () => {
function findPosMasterNo(obj: any) { function findPosMasterNo(obj: any) {
if (obj) { if (obj) {
let shortName = let shortName =
(obj.child4ShortName != null (obj.child4ShortName != null && obj.child4ShortName !== ""
? obj.child4ShortName ? obj.child4ShortName
: obj.child3ShortName != null : obj.child3ShortName != null && obj.child3ShortName !== ""
? obj.child3ShortName ? obj.child3ShortName
: obj.child2ShortName != null : obj.child2ShortName != null && obj.child2ShortName !== ""
? obj.child2ShortName ? obj.child2ShortName
: obj.child1ShortName != null : obj.child1ShortName != null && obj.child1ShortName !== ""
? obj.child1ShortName ? obj.child1ShortName
: obj.rootShortName != null : obj.rootShortName != null && obj.rootShortName !== ""
? obj.rootShortName ? obj.rootShortName
: "") + (obj.posMasterNo != null ? obj.posMasterNo : ""); : "") +
(obj.posMasterNo != null && obj.posMasterNo !== ""
? obj.posMasterNo
: "");
return shortName == "" ? "-" : shortName; return shortName == "" ? "-" : shortName;
} else { } else {
return ""; return "";
@ -1123,33 +1165,45 @@ export const useCounterMixin = defineStore("mixin", () => {
function findOrgNameHtml(obj: any) { function findOrgNameHtml(obj: any) {
if (obj) { if (obj) {
let name = let name =
obj.child4 != null && obj.child3 != null obj.child4 != null &&
obj.child4 !== "" &&
obj.child3 != null &&
obj.child3 !== ""
? obj.child4 + (obj.child3 ? "\n" : "") ? obj.child4 + (obj.child3 ? "\n" : "")
: obj.child4 != null : obj.child4 != null && obj.child4 !== ""
? obj.child4 ? obj.child4
: ""; : "";
name += name +=
obj.child3 != null && obj.child2 != null obj.child3 != null &&
obj.child3 !== "" &&
obj.child2 != null &&
obj.child2 !== ""
? obj.child3 + (obj.child2 ? "\n" : "") ? obj.child3 + (obj.child2 ? "\n" : "")
: obj.child3 !== null : obj.child3 != null && obj.child3 !== ""
? obj.child3 ? obj.child3
: ""; : "";
name += name +=
obj.child2 != null && obj.child1 != null obj.child2 != null &&
obj.child2 !== "" &&
obj.child1 != null &&
obj.child1 !== ""
? obj.child2 + (obj.child1 ? "\n" : "") ? obj.child2 + (obj.child1 ? "\n" : "")
: obj.child2 != null : obj.child2 != null && obj.child2 !== ""
? obj.child2 ? obj.child2
: ""; : "";
name += name +=
obj.child1 != null && obj.root != null obj.child1 != null &&
obj.child1 !== "" &&
obj.root != null &&
obj.root !== ""
? obj.child1 + (obj.root ? "\n" : "") ? obj.child1 + (obj.root ? "\n" : "")
: obj.child1 != null : obj.child1 != null && obj.child1 !== ""
? obj.child1 ? obj.child1
: ""; : "";
name += obj.root != null ? obj.root : ""; name += obj.root != null && obj.root !== "" ? obj.root : "";
return name == "" ? "-" : name; return name == "" ? "-" : name;
} else { } else {
return ""; return "";
@ -1159,33 +1213,45 @@ export const useCounterMixin = defineStore("mixin", () => {
function findOrgNameOldHtml(obj: any) { function findOrgNameOldHtml(obj: any) {
if (obj) { if (obj) {
let name = let name =
obj.child4Old != null && obj.child3Old != null obj.child4Old != null &&
obj.child4Old !== "" &&
obj.child3Old != null &&
obj.child3Old !== ""
? obj.child4Old + (obj.child3Old ? "\n" : "") ? obj.child4Old + (obj.child3Old ? "\n" : "")
: obj.child4Old != null : obj.child4Old != null && obj.child4Old !== ""
? obj.child4Old ? obj.child4Old
: ""; : "";
name += name +=
obj.child3Old != null && obj.child2Old != null obj.child3Old != null &&
obj.child3Old !== "" &&
obj.child2Old != null &&
obj.child2Old !== ""
? obj.child3Old + (obj.child2Old ? "\n" : "") ? obj.child3Old + (obj.child2Old ? "\n" : "")
: obj.child3Old !== null : obj.child3Old != null && obj.child3Old !== ""
? obj.child3Old ? obj.child3Old
: ""; : "";
name += name +=
obj.child2Old != null && obj.child1Old != null obj.child2Old != null &&
obj.child2Old !== "" &&
obj.child1Old != null &&
obj.child1Old !== ""
? obj.child2Old + (obj.child1Old ? "\n" : "") ? obj.child2Old + (obj.child1Old ? "\n" : "")
: obj.child2Old != null : obj.child2Old != null && obj.child2Old !== ""
? obj.child2Old ? obj.child2Old
: ""; : "";
name += name +=
obj.child1Old != null && obj.rootOld != null obj.child1Old != null &&
obj.child1Old !== "" &&
obj.rootOld != null &&
obj.rootOld !== ""
? obj.child1Old + (obj.rootOld ? "\n" : "") ? obj.child1Old + (obj.rootOld ? "\n" : "")
: obj.child1Old != null : obj.child1Old != null && obj.child1Old !== ""
? obj.child1Old ? obj.child1Old
: ""; : "";
name += obj.rootOld != null ? obj.rootOld : ""; name += obj.rootOld != null && obj.rootOld !== "" ? obj.rootOld : "";
return name == "" ? "-" : name; return name == "" ? "-" : name;
} else { } else {
return ""; return "";
@ -1195,33 +1261,48 @@ export const useCounterMixin = defineStore("mixin", () => {
function findOrgChildNameHtml(obj: any) { function findOrgChildNameHtml(obj: any) {
if (obj) { if (obj) {
let name = let name =
obj.orgChild4Name != null && obj.orgChild3Name != null obj.orgChild4Name != null &&
obj.orgChild4Name !== "" &&
obj.orgChild3Name != null &&
obj.orgChild3Name !== ""
? obj.orgChild4Name + (obj.orgChild3Name ? "\n" : "") ? obj.orgChild4Name + (obj.orgChild3Name ? "\n" : "")
: obj.orgChild4Name != null : obj.orgChild4Name != null && obj.orgChild4Name !== ""
? obj.orgChild4Name ? obj.orgChild4Name
: ""; : "";
name += name +=
obj.orgChild3Name != null && obj.orgChild2Name != null obj.orgChild3Name != null &&
obj.orgChild3Name !== "" &&
obj.orgChild2Name != null &&
obj.orgChild2Name !== ""
? obj.orgChild3Name + (obj.orgChild2Name ? "\n" : "") ? obj.orgChild3Name + (obj.orgChild2Name ? "\n" : "")
: obj.orgChild3Name !== null : obj.orgChild3Name != null && obj.orgChild3Name !== ""
? obj.orgChild3Name ? obj.orgChild3Name
: ""; : "";
name += name +=
obj.orgChild2Name != null && obj.orgChild1Name != null obj.orgChild2Name != null &&
obj.orgChild2Name !== "" &&
obj.orgChild1Name != null &&
obj.orgChild1Name !== ""
? obj.orgChild2Name + (obj.orgChild1Name ? "\n" : "") ? obj.orgChild2Name + (obj.orgChild1Name ? "\n" : "")
: obj.orgChild2Name != null : obj.orgChild2Name != null && obj.orgChild2Name !== ""
? obj.orgChild2Name ? obj.orgChild2Name
: ""; : "";
name += name +=
obj.orgChild1Name != null && obj.orgRootName != null obj.orgChild1Name != null &&
obj.orgChild1Name !== "" &&
obj.orgRootName != null &&
obj.orgRootName !== ""
? obj.orgChild1Name + (obj.orgRootName ? "\n" : "") ? obj.orgChild1Name + (obj.orgRootName ? "\n" : "")
: obj.orgChild1Name != null : obj.orgChild1Name != null && obj.orgChild1Name !== ""
? obj.orgChild1Name ? obj.orgChild1Name
: ""; : "";
name += obj.orgRootName != null ? obj.orgRootName : ""; name +=
obj.orgRootName != null && obj.orgRootName !== ""
? obj.orgRootName
: "";
return name == "" ? "-" : name; return name == "" ? "-" : name;
} else { } else {
return ""; return "";
@ -1231,33 +1312,45 @@ export const useCounterMixin = defineStore("mixin", () => {
function findChildNameHtml(obj: any) { function findChildNameHtml(obj: any) {
if (obj) { if (obj) {
let name = let name =
obj.child4 != null && obj.child3 != null obj.child4 != null &&
obj.child4 !== "" &&
obj.child3 != null &&
obj.child3 !== ""
? obj.child4 + (obj.child3 ? "\n" : "") ? obj.child4 + (obj.child3 ? "\n" : "")
: obj.child4 != null : obj.child4 != null && obj.child4 !== ""
? obj.child4 ? obj.child4
: ""; : "";
name += name +=
obj.child3 != null && obj.child2 != null obj.child3 != null &&
obj.child3 !== "" &&
obj.child2 != null &&
obj.child2 !== ""
? obj.child3 + (obj.child2 ? "\n" : "") ? obj.child3 + (obj.child2 ? "\n" : "")
: obj.child3 !== null : obj.child3 != null && obj.child3 !== ""
? obj.child3 ? obj.child3
: ""; : "";
name += name +=
obj.child2 != null && obj.child1 != null obj.child2 != null &&
obj.child2 !== "" &&
obj.child1 != null &&
obj.child1 !== ""
? obj.child2 + (obj.child1 ? "\n" : "") ? obj.child2 + (obj.child1 ? "\n" : "")
: obj.child2 != null : obj.child2 != null && obj.child2 !== ""
? obj.child2 ? obj.child2
: ""; : "";
name += name +=
obj.child1 != null && obj.root != null obj.child1 != null &&
obj.child1 !== "" &&
obj.root != null &&
obj.root !== ""
? obj.child1 + (obj.root ? "\n" : "") ? obj.child1 + (obj.root ? "\n" : "")
: obj.child1 != null : obj.child1 != null && obj.child1 !== ""
? obj.child1 ? obj.child1
: ""; : "";
name += obj.root != null ? obj.root : ""; name += obj.root != null && obj.root !== "" ? obj.root : "";
return name == "" ? "-" : name; return name == "" ? "-" : name;
} else { } else {
return ""; return "";
@ -1267,17 +1360,20 @@ export const useCounterMixin = defineStore("mixin", () => {
function findPosMasterNoOld(obj: any) { function findPosMasterNoOld(obj: any) {
if (obj) { if (obj) {
let shortName = let shortName =
(obj.child4ShortNameOld != null (obj.child4ShortNameOld != null && obj.child4ShortNameOld !== ""
? obj.child4ShortNameOld ? obj.child4ShortNameOld
: obj.child3ShortNameOld != null : obj.child3ShortNameOld != null && obj.child3ShortNameOld !== ""
? obj.child3ShortNameOld ? obj.child3ShortNameOld
: obj.child2ShortNameOld != null : obj.child2ShortNameOld != null && obj.child2ShortNameOld !== ""
? obj.child2ShortNameOld ? obj.child2ShortNameOld
: obj.child1ShortNameOld != null : obj.child1ShortNameOld != null && obj.child1ShortNameOld !== ""
? obj.child1ShortNameOld ? obj.child1ShortNameOld
: obj.rootShortNameOld != null : obj.rootShortNameOld != null && obj.rootShortNameOld !== ""
? obj.rootShortNameOld ? obj.rootShortNameOld
: "") + (obj.posMasterNoOld != null ? obj.posMasterNoOld : ""); : "") +
(obj.posMasterNoOld != null && obj.posMasterNoOld !== ""
? obj.posMasterNoOld
: "");
return shortName == "" ? "-" : shortName; return shortName == "" ? "-" : shortName;
} else { } else {
return ""; return "";