hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into dev-tee

Browse source
This commit is contained in:
setthawutttty 2023-09-26 15:24:23 +07:00
commit 016f256d38
52 changed files with 165 additions and 278 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
View file

@ -95,8 +95,7 @@ const fecthAssign = async () => {
showLoader();
await http
.get(config.API.evaluateCreate(assignId.value))
.then(async (res: any) => {
console.log(res);
.then(async (res) => {
if (props.action == "add") {
person.value = res.data.data.person;
commander.value = res.data.data.commander;

7
src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore copy.vue
View file

@ -6,7 +6,7 @@ import { useCounterMixin } from "@/stores/mixin";
import { useRouter, useRoute } from "vue-router";
import http from "@/plugins/http";
import config from "@/app.config";
import criterion from "@/modules/05_placement/components/Other/Criterion.vue"
import criterion from "@/modules/05_placement/components/Other/Criterion.vue";
const router = useRouter();
const routeName = router.currentRoute.value.name;
@ -28,9 +28,7 @@ const {
const route = useRoute();
const assignId = ref<string>(route.params.form.toString());
const personalId = ref<string>(route.params.personalId.toString());
const saveEdit = (id: string) => {
dialogConfirm($q, () => console.log("save"));
};
const edit = () => {
status.value = true;
};
@ -87,7 +85,6 @@ const fecthAssign = async () => {
chairman.value = res.data.data.chairman;
commander.value = res.data.data.commander;
mentors.value = res.data.data.mentors;
console.log(commander.value.name);
})
.catch((e) => {
messageError($q, e);

6
src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue
View file

@ -265,7 +265,7 @@ const savaForm = () => {
alerts[index + 11].value = true;
}
});
console.log(evaluate_expenct_level.value);
dialogMessageNotify($q, "กรุณากรอกข้อมูลให้ครบ");
} else {
@ -346,13 +346,13 @@ ArrayCountbotton.forEach((variable, index) => {
});
watch(lengthevaluate_expenct_level, (newLength) => {
if (newLength === evaluate_expenct_level.value.length) {
console.log(true);
alerts[0].value = false;
}
});
watch(lengthevaluate_ouptut, (newLength) => {
if (newLength === evaluate_ouptut.value.length) {
console.log(true);
alerts[1].value = false;
}
});

6
src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAddCommander.vue
View file

@ -235,8 +235,6 @@ const savaForm = () => {
alerts[index + 11].value = true;
}
});
console.log(evaluate_expenct_level.value);
dialogMessageNotify($q, "กรุณากรอกข้อมูลให้ครบ");
} else {
putformData();
@ -311,13 +309,13 @@ ArrayCountbotton.forEach((variable, index) => {
});
watch(lengthevaluate_expenct_level, (newLength) => {
if (newLength === evaluate_expenct_level.value.length) {
console.log(true);
alerts[0].value = false;
}
});
watch(lengthevaluate_ouptut, (newLength) => {
if (newLength === evaluate_ouptut.value.length) {
console.log(true);
alerts[1].value = false;
}
});