Merge branch 'develop' into devTee

This commit is contained in:
setthawutttty 2025-09-10 12:05:09 +07:00
commit 224ad5cf2c

View file

@ -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);