Merge branch 'develop' into devTee
This commit is contained in:
commit
224ad5cf2c
1 changed files with 1 additions and 10 deletions
|
|
@ -148,18 +148,10 @@ function getMenuItems(row: any) {
|
|||
store.typeOrganizational === "current"
|
||||
) {
|
||||
return listMenu.value.filter(
|
||||
(item) =>
|
||||
item.type !== "DEL" &&
|
||||
item.type !== "CONDITION" &&
|
||||
item.type !== "INHERIT"
|
||||
(item) => item.type !== "DEL" && item.type !== "INHERIT"
|
||||
);
|
||||
} else if (store.typeOrganizational === "current") {
|
||||
return listMenu.value.filter((item) => item.type !== "INHERIT");
|
||||
} else if (
|
||||
row.positionIsSelected != "ว่าง" &&
|
||||
store.typeOrganizational === "draft"
|
||||
) {
|
||||
return listMenu.value.filter((item) => item.type !== "CONDITION");
|
||||
} else {
|
||||
return listMenu.value;
|
||||
}
|
||||
|
|
@ -602,7 +594,6 @@ async function fetchDataCondition() {
|
|||
}
|
||||
|
||||
function onClickAction(type: string, data: PosMaster2) {
|
||||
|
||||
switch (type) {
|
||||
case "EDIT":
|
||||
onClickPosition(type, data.id, data);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue