diff --git a/src/modules/06_evaluate/components/step/step2.vue b/src/modules/06_evaluate/components/step/step2.vue index bfeab2b..70e3757 100644 --- a/src/modules/06_evaluate/components/step/step2.vue +++ b/src/modules/06_evaluate/components/step/step2.vue @@ -272,11 +272,13 @@ function getCommander() { .get(config.API.searchCommander) .then((res) => { const data = res.data.result; - formCommand.author = data.fullname; + formCommand.author = data.fullname; formCommand.commanderFullname = data.commanderFullname; formCommand.commanderPosition = data.commanderPosition; formCommand.commanderAboveFullname = data.commanderAboveFullname; formCommand.commanderAbovePosition = data.commanderAbovePosition; + formCommand.commanderOrg = data.commanderOrg; + formCommand.commanderAboveOrg = data.commanderAboveOrg; }) .catch((e) => { console.log(e); @@ -316,7 +318,6 @@ watch( onMounted(async () => { const user = await tokenParsed(); - try { showLoader(); await Promise.all([ diff --git a/src/modules/06_evaluate/components/step/step6.vue b/src/modules/06_evaluate/components/step/step6.vue index 9907555..f1c21aa 100644 --- a/src/modules/06_evaluate/components/step/step6.vue +++ b/src/modules/06_evaluate/components/step/step6.vue @@ -195,20 +195,22 @@ async function checkDoc() { }); } -function getCommander() { - http - .get(config.API.searchCommander) - .then((res) => { - const data = res.data.result; - formCommand.commanderFullname = data.commanderFullname; - formCommand.commanderPosition = data.commanderPosition; - formCommand.commanderAboveFullname = data.commanderAboveFullname; - formCommand.commanderAbovePosition = data.commanderAbovePosition; - }) - .catch((e) => { - messageError($q, e); - }); -} +// function getCommander() { +// http +// .get(config.API.searchCommander) +// .then((res) => { +// const data = res.data.result; +// formCommand.commanderFullname = data.commanderFullname; +// formCommand.commanderPosition = data.commanderPosition; +// formCommand.commanderAboveFullname = data.commanderAboveFullname; +// formCommand.commanderAbovePosition = data.commanderAbovePosition; +// formCommand.commanderOrg = data.commanderOrg; +// formCommand.commanderAboveOrg = data.commanderAboveOrg; +// }) +// .catch((e) => { +// messageError($q, e); +// }); +// } function onAddSubject() { formCommand.subject.push("");