fixing code workflow & get assign

This commit is contained in:
Warunee Tamkoo 2024-10-29 12:33:18 +07:00
parent 2bcbbe8c9f
commit 082debf2e5
7 changed files with 11 additions and 33 deletions

View file

@ -53,8 +53,8 @@ const typeSelectPerson = ref<string>("");
// disable step 3 // disable step 3
const displayArray = <string[]>[ const displayArray = <string[]>[
"REGISTRY_PROFILE", "REGISTRY_PROFILE",
"RETIREMENT_RESIFNATION", "SYS_RETIREMENT",
"LEAVE_LIST", "SYS_LEAVE_LIST",
]; ];
async function fetchCheckState() { async function fetchCheckState() {

View file

@ -30,7 +30,6 @@ import DialogCreateCommandORG from "@/modules/18_command/components/DialogCreate
const $q = useQuasar(); const $q = useQuasar();
const { showLoader, hideLoader, messageError, date2Thai } = useCounterMixin(); const { showLoader, hideLoader, messageError, date2Thai } = useCounterMixin();
const store = useOrganizational(); const store = useOrganizational();
const keycloakSystem = ref<string>("ORG_COMMAND");
/** ตัวแปร*/ /** ตัวแปร*/
const modalNewStructure = ref<boolean>(false); // const modalNewStructure = ref<boolean>(false); //
@ -130,7 +129,7 @@ function onClickHistory(id: string, name: string) {
async function workflowSystem() { async function workflowSystem() {
showLoader(); showLoader();
http http
.get(config.API.workflowKeycloakSystem(keycloakSystem.value)) .get(config.API.workflowKeycloakSystem("SYS_ORG"))
.then((res) => { .then((res) => {
const data = res.data.result; const data = res.data.result;
store.isOfficer = data.isOfficer; store.isOfficer = data.isOfficer;

View file

@ -32,12 +32,8 @@ const {
success, success,
} = mixin; } = mixin;
const isOfficer = ref<boolean | null>(null);
const isStaff = ref<boolean | null>(null);
const paramsId = route.params.id; const paramsId = route.params.id;
const myForm = ref<QForm | null>(null); const myForm = ref<QForm | null>(null);
const roleAdmin = ref<boolean>(false);
const dataProfile = ref<DataProfile>(); // const dataProfile = ref<DataProfile>(); //
const edit = ref<boolean>(false); const edit = ref<boolean>(false);
const status = ref<string>(""); 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 () => { onMounted(async () => {
getWorkFlow();
fetchData(); fetchData();
}); });
</script> </script>

View file

@ -836,7 +836,7 @@ onMounted(async () => {
ref="workflowRef" ref="workflowRef"
v-model:is-check-data="isCheckData" v-model:is-check-data="isCheckData"
:id="id" :id="id"
sys-name="RETIREMENT_RESIFNATION" sys-name="SYS_RETIREMENT"
/> />
</div> </div>

View file

@ -808,7 +808,7 @@ onMounted(async () => {
ref="workflowRef" ref="workflowRef"
:id="paramsId" :id="paramsId"
v-model:is-check-data="isCheckData" v-model:is-check-data="isCheckData"
sys-name="LEAVE_LIST" sys-name="SYS_LEAVE_LIST"
/> />
</div> </div>
</div> </div>

View file

@ -709,7 +709,11 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
<!-- Workflow --> <!-- Workflow -->
<div class="col-xs-12 col-sm-12"> <div class="col-xs-12 col-sm-12">
<WorkFlow ref="workflowRef" :id="paramsId" sys-name="LEAVE_LIST" /> <WorkFlow
ref="workflowRef"
:id="paramsId"
sys-name="SYS_LEAVE_LIST"
/>
</div> </div>
</div> </div>
</div> </div>

View file

@ -29,7 +29,6 @@ const { showLoader, hideLoader, messageError, dialogRemove } =
useCounterMixin(); useCounterMixin();
/** โครงสร้าง*/ /** โครงสร้าง*/
const keycloakSystem = ref<string>("ORG_COMMAND");
const expanded = ref<Array<string>>([]); const expanded = ref<Array<string>>([]);
const filter = ref<string>(""); const filter = ref<string>("");
const nodeTree = ref<DataTree[]>([]); const nodeTree = ref<DataTree[]>([]);
@ -261,7 +260,7 @@ function onDelete(id: string) {
function getWorkFlow() { function getWorkFlow() {
showLoader(); showLoader();
http http
.get(config.API.workflowKeycloakSystem(keycloakSystem.value)) .get(config.API.workflowKeycloakSystem("SYS_ACTING"))
.then((res) => { .then((res) => {
const data = res.data.result; const data = res.data.result;
storeActing.isOfficer = data.isOfficer; storeActing.isOfficer = data.isOfficer;