Merge branch 'develop' into devTee

This commit is contained in:
setthawutttty 2024-12-26 10:15:37 +07:00
commit a97a1189c4
8 changed files with 25 additions and 7 deletions

View file

@ -752,6 +752,7 @@ function onSubmitDate() {
*/
function openModalOrder(val: boolean) {
// object #e.draft == "" &&
rowsOrder.value = rows.value.filter(
(e: any) =>
(DataStore.isStaff &&
@ -762,6 +763,7 @@ function openModalOrder(val: boolean) {
e.statusId !== "REPORT" &&
e.statusId !== "DONE") ||
(DataStore.isOfficer &&
e.bmaOfficer != "บุคคลภายนอก" &&
e.rootId != e.rootIdOld &&
e.draft == "ส่งตัวแล้ว" &&
e.nodeName !== null &&