Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 5m56s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 5m56s
This commit is contained in:
commit
a7def886ee
1 changed files with 1 additions and 1 deletions
|
|
@ -799,13 +799,13 @@ function openModalOrder(val: boolean) {
|
||||||
e.statusId !== "DONE") ||
|
e.statusId !== "DONE") ||
|
||||||
(DataStore.isOfficer &&
|
(DataStore.isOfficer &&
|
||||||
e.root === "สำนักปลัดกรุงเทพมหานคร" &&
|
e.root === "สำนักปลัดกรุงเทพมหานคร" &&
|
||||||
e.rootId != e.rootIdOld &&
|
|
||||||
e.draft == "ส่งตัวแล้ว" &&
|
e.draft == "ส่งตัวแล้ว" &&
|
||||||
e.nodeName !== null &&
|
e.nodeName !== null &&
|
||||||
e.reportingDate !== null &&
|
e.reportingDate !== null &&
|
||||||
e.statusId !== "REPORT" &&
|
e.statusId !== "REPORT" &&
|
||||||
e.statusId !== "DONE")
|
e.statusId !== "DONE")
|
||||||
);
|
);
|
||||||
|
|
||||||
modalOrder.value = val;
|
modalOrder.value = val;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue