Merge branch 'develop' into dev-tee

This commit is contained in:
setthawutttty 2023-10-02 09:44:05 +07:00
commit 244d5eb2c0

View file

@ -599,7 +599,7 @@ const uploadFile = async (event: any) => {
@click="directorApproved"
/>
<q-btn
v-if="requestStatus == 'st6' && roleDataStore.adminRole"
v-if="requestStatus == 'st6' && roleDataStore.adminRole && !DataStore.isLock"
dense
unelevated
label="ตีกลับ"