API inbox noti

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-09-08 13:21:07 +07:00
parent 1cb3c891f6
commit 2c5fb8e93c
4 changed files with 32 additions and 48 deletions

View file

@ -4,6 +4,7 @@ import { useCounterMixin } from "@/stores/mixin";
import { useQuasar } from "quasar";
import type { QTableProps } from "quasar";
import { useInsigniaDataStore } from "@/modules/07_insignia/store";
import { useroleUserDataStore } from "@/stores/roleUser";
import http from "@/plugins/http";
import config from "@/app.config";
import { useRouter } from "vue-router";
@ -22,6 +23,7 @@ const {
} = mixin;
const $q = useQuasar();
const DataStore = useInsigniaDataStore();
const roleDataStore = useroleUserDataStore();
const modalNote = ref<boolean>(false);
const modelPopupReject = ref<boolean>(false);
@ -201,9 +203,6 @@ const props = defineProps({
fecthInsigniaByOc: {
type: Function,
},
roleUser: {
type: String,
},
roundName: {
type: String,
},
@ -231,7 +230,7 @@ onMounted(async () => {
});
const checkStatus = computed(() => {
if (
DataStore.roleUser === "insignia1" &&
roleDataStore.insignia1Role &&
(DataStore.requestStatus == "st1" || DataStore.requestStatus == "st4")
) {
return true;
@ -574,7 +573,7 @@ const paginationLabel2 = (start: number, end: number, total: number) => {
<div class="row col-12">
<div class="row col-12 q-col-gutter-sm">
<q-select
v-if="props.roleUser == 'admin'"
v-if="roleDataStore.adminRole"
v-model="organization"
label="หน่วยงาน"
dense
@ -683,7 +682,7 @@ const paginationLabel2 = (start: number, end: number, total: number) => {
v-if="
(DataStore.isLock == false &&
DataStore.requestStatus == 'st5' &&
DataStore.roleUser == 'admin') ||
roleDataStore.adminRole) ||
checkStatus == true
"
>
@ -804,14 +803,14 @@ const paginationLabel2 = (start: number, end: number, total: number) => {
v-if="
(DataStore.isLock == false &&
DataStore.requestStatus == 'st5' &&
DataStore.roleUser == 'admin') ||
roleDataStore.adminRole) ||
checkStatus == true
"
>
<q-btn
v-if="
roleUser == 'admin' ||
(roleUser == 'insignia1' &&
roleDataStore.adminRole ||
(roleDataStore.insignia1Role &&
(requestStatus == 'st1' || requestStatus == 'st4'))
"
icon="mdi-dots-vertical"