Merge branch 'develop' into devTee

This commit is contained in:
STW_TTTY\stwtt 2024-07-10 09:36:09 +07:00
commit 00e284ec09
5 changed files with 10 additions and 6 deletions

View file

@ -71,9 +71,9 @@ const clickBack = () => {
const statusOrder = (val: boolean) => {
switch (val) {
case true:
return "ยับยั้งการลาออก";
return "ยับยั้ง";
case false:
return "อนุมัติการลาออก";
return "อนุญาต";
}
};

View file

@ -243,7 +243,7 @@ onMounted(() => {
<q-space />
<q-btn
v-if="store.dataEvaluation.evaluationStatus === 'COMPLETE'"
v-if="store.dataEvaluation.evaluationStatus === 'KP7'"
outline
flat
dense

View file

@ -66,7 +66,7 @@ const splitterModel = ref<number>(12);
store.tabOpen < 4 ||
(store.tabOpen == 4 &&
store.rolePerson === 'USER' &&
store.dataEvaluation.evaluationStatus != 'COMPLETE')
store.dataEvaluation.evaluationStatus != 'KP7')
"
/>
<q-tab name="5" label="ไฟล์เอกสาร" />

View file

@ -327,6 +327,10 @@ export const useKpiDataStore = defineStore("KPIDate", () => {
tabOpen.value = 4;
tabMain.value = "4";
break;
case "KP7":
tabOpen.value = 4;
tabMain.value = "4";
break;
default:
tabOpen.value = 1;
tabMain.value = "1";