From fbdcc063fa7aba0031ef10c911304cfc667ecd01 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Thu, 31 Aug 2023 14:25:03 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=E0=B9=80=E0=B8=87=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=99=E0=B9=84?= =?UTF-8?q?=E0=B8=82=20=E0=B8=AD=E0=B8=99=E0=B8=B8=E0=B8=A1=E0=B8=B1?= =?UTF-8?q?=E0=B8=95=E0=B8=B4=E0=B8=AB=E0=B8=A3=E0=B8=B7=E0=B8=AD=E0=B8=A2?= =?UTF-8?q?=E0=B8=B1=E0=B8=9A=E0=B8=A2=E0=B8=B1=E0=B9=89=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/06_retirement/components/resign/ResignByid.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/06_retirement/components/resign/ResignByid.vue b/src/modules/06_retirement/components/resign/ResignByid.vue index 265c8fb24..eb6c9fe79 100644 --- 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) " >