Merge branch 'develop' into AanandaDev

2023-08-31 14:37:45 +07:00 · 2023-08-31 14:37:45 +07:00 · 0c3e5a4a8c
commit 0c3e5a4a8c
parent 5ff5621fcb fbdcc063fa
4 changed files with 666 additions and 266 deletions
--- a/src/modules/06_retirement/components/resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/resign/ResignByid.vue
@ -437,7 +437,9 @@ const statusOrder = (val: boolean) => {
        class="q-gutter-x-sm"
        v-if="
          (roleUser === 'commander' && dataDetail.commanderReject === null) ||
-          (roleUser === 'oligarch' && dataDetail.oligarchReject === null)
+          (roleUser === 'oligarch' &&
+            dataDetail.oligarchReject === null &&
+            dataDetail.commanderReject !== null)
        "
      >
        <q-btn