Merge branch 'develop' into dev

2026-03-06 17:35:35 +07:00 · 2026-03-06 17:35:35 +07:00 · 6656855e0c
commit 6656855e0c
parent fbfc801ef9 6252f4a6ca
1 changed files with 10 additions and 2 deletions
--- a/src/modules/15_development/views/Scholarship.vue
+++ b/src/modules/15_development/views/Scholarship.vue
@ -492,9 +492,17 @@ onMounted(() => {
                flat
                dense
                round
-                :disable="props.row.status !== 'PENDING'"
+                :disable="
+                  props.row.status === 'GRADUATE' ||
+                  props.row.status === 'NOTGRADUATE'
+                "
                icon="edit"
-                :color="props.row.status !== 'PENDING' ? 'grey-6' : 'edit'"
+                :color="
+                  props.row.status === 'GRADUATE' ||
+                  props.row.status === 'NOTGRADUATE'
+                    ? 'grey-6'
+                    : 'edit'
+                "
                @click="onClickAddOrView(true, props.row.id)"
              >
                <q-tooltip>แก้ไขข้อมูล</q-tooltip>