ปรับ format หน่วยงาน
This commit is contained in:
parent
3ee1ed9073
commit
f883744e3b
1 changed files with 9 additions and 11 deletions
|
|
@ -1031,28 +1031,28 @@ export const useCounterMixin = defineStore("mixin", () => {
|
|||
if (obj) {
|
||||
let name =
|
||||
obj.child4 != null && obj.child3 != null
|
||||
? obj.child4 + "/"
|
||||
? obj.child4 + " "
|
||||
: obj.child4 != null
|
||||
? obj.child4
|
||||
: "";
|
||||
|
||||
name +=
|
||||
obj.child3 != null && obj.child2 != null
|
||||
? obj.child3 + "/"
|
||||
? obj.child3 + " "
|
||||
: obj.child3 !== null
|
||||
? obj.child3
|
||||
: "";
|
||||
|
||||
name +=
|
||||
obj.child2 != null && obj.child1 != null
|
||||
? obj.child2 + "/"
|
||||
? obj.child2 + " "
|
||||
: obj.child2 != null
|
||||
? obj.child2
|
||||
: "";
|
||||
|
||||
name +=
|
||||
obj.child1 != null && obj.root != null
|
||||
? obj.child1 + "/"
|
||||
? obj.child1 + " "
|
||||
: obj.child1 != null
|
||||
? obj.child1
|
||||
: "";
|
||||
|
|
@ -1106,28 +1106,28 @@ export const useCounterMixin = defineStore("mixin", () => {
|
|||
if (obj) {
|
||||
let name =
|
||||
obj.child4Old != null && obj.child3Old != null
|
||||
? obj.child4Old + "/"
|
||||
? obj.child4Old + " "
|
||||
: obj.child4Old != null
|
||||
? obj.child4Old
|
||||
: "";
|
||||
|
||||
name +=
|
||||
obj.child3Old != null && obj.child2Old != null
|
||||
? obj.child3Old + "/"
|
||||
? obj.child3Old + " "
|
||||
: obj.child3Old !== null
|
||||
? obj.child3Old
|
||||
: "";
|
||||
|
||||
name +=
|
||||
obj.child2Old != null && obj.child1Old != null
|
||||
? obj.child2Old + "/"
|
||||
? obj.child2Old + " "
|
||||
: obj.child2Old != null
|
||||
? obj.child2Old
|
||||
: "";
|
||||
|
||||
name +=
|
||||
obj.child1Old != null && obj.rootOld != null
|
||||
? obj.child1Old + "/"
|
||||
? obj.child1Old + " "
|
||||
: obj.child1Old != null
|
||||
? obj.child1Old
|
||||
: "";
|
||||
|
|
@ -1136,8 +1136,6 @@ export const useCounterMixin = defineStore("mixin", () => {
|
|||
} else {
|
||||
return "";
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
function onSearchDataTable(keyword: string, data: any[], columns: any[]) {
|
||||
|
|
@ -1198,6 +1196,6 @@ export const useCounterMixin = defineStore("mixin", () => {
|
|||
findPosMasterNoOld,
|
||||
findOrgNameOld,
|
||||
findPosMasterNo,
|
||||
onSearchDataTable
|
||||
onSearchDataTable,
|
||||
};
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue