Merge branch 'develop' into devTee

This commit is contained in:
setthawutttty 2024-10-29 14:21:09 +07:00
commit fb9ee230b6
12 changed files with 75 additions and 66 deletions

View file

@ -32,12 +32,8 @@ const {
success,
} = mixin;
const isOfficer = ref<boolean | null>(null);
const isStaff = ref<boolean | null>(null);
const paramsId = route.params.id;
const myForm = ref<QForm | null>(null);
const roleAdmin = ref<boolean>(false);
const dataProfile = ref<DataProfile>(); //
const edit = ref<boolean>(false);
const status = ref<string>("");
@ -143,27 +139,7 @@ const getClass = (val: boolean) => {
};
};
async function getWorkFlow() {
showLoader();
await http
.get(config.API.workflowKeycloakSystem("ORG_COMMAND"))
.then(async (res) => {
const data = await res.data.result;
isOfficer.value = data.isOfficer;
isStaff.value = data.isStaff;
roleAdmin.value = data.isOfficer;
hideLoader();
})
.catch((e) => {
messageError($q, e);
hideLoader();
})
.finally(() => {});
}
onMounted(async () => {
getWorkFlow();
fetchData();
});
</script>

View file

@ -696,7 +696,7 @@ onMounted(async () => {
ref="workflowRef"
v-model:is-check-data="isCheckData"
:id="transferId"
:sys-name="'PLACEMENT_TRANSFER'"
:sys-name="'SYS_TRANSFER_REQ'"
:onUpdateStatus="onUpdateStatus"
/>
</div>