Merge branch 'develop' into warunee-dev
# Conflicts: # src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore copy.vue # src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue
This commit is contained in:
commit
556264c5f2
59 changed files with 1785 additions and 282 deletions
|
|
@ -108,6 +108,7 @@ const edit = () => {
|
|||
};
|
||||
const cancel = () => {
|
||||
status.value = false;
|
||||
getAssign()
|
||||
};
|
||||
|
||||
const filterData = (options: any[], excludedGroups: any[]) => {
|
||||
|
|
|
|||
|
|
@ -76,6 +76,7 @@ const edit = () => {
|
|||
|
||||
const cancel = () => {
|
||||
status.value = false;
|
||||
fecthAssign()
|
||||
};
|
||||
|
||||
const props = defineProps({
|
||||
|
|
@ -94,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;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -36,6 +36,7 @@ const edit = () => {
|
|||
};
|
||||
const cancel = () => {
|
||||
status.value = false;
|
||||
fecthAssign()
|
||||
};
|
||||
const evaluate_no = ref<number>();
|
||||
const evaluate_id = ref<string>("");
|
||||
|
|
|
|||
|
|
@ -76,11 +76,13 @@ const edit = () => {
|
|||
|
||||
const cancel = () => {
|
||||
status.value = false;
|
||||
props.fecthAssign?.(assignId.value)
|
||||
};
|
||||
const props = defineProps({
|
||||
tab: String,
|
||||
data: Object,
|
||||
action: String,
|
||||
fecthAssign: Function,
|
||||
});
|
||||
|
||||
const fecthFormdata = async () => {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -88,11 +88,13 @@ const edit = () => {
|
|||
|
||||
const cancel = () => {
|
||||
status.value = false;
|
||||
props.fecthAssign?.(assignId.value)
|
||||
};
|
||||
const props = defineProps({
|
||||
tab: String,
|
||||
data: Object,
|
||||
action: String,
|
||||
fecthAssign: Function,
|
||||
});
|
||||
|
||||
const fecthFormdata = async () => {
|
||||
|
|
|
|||
|
|
@ -140,6 +140,7 @@ const addData = () => {
|
|||
:key="item.no"
|
||||
>
|
||||
<FormSaveResult
|
||||
:fecthAssign="fecthAssign"
|
||||
:tab="tab"
|
||||
:data="probationStore.evaluate.find((x: any) => x.no === dataArrayNumber)"
|
||||
action="edit"
|
||||
|
|
|
|||
|
|
@ -142,19 +142,12 @@ const addData = () => {
|
|||
:key="item.no"
|
||||
>
|
||||
<FormSaveResultCommader
|
||||
:fecthAssign="fecthAssign"
|
||||
:tab="tab"
|
||||
:data="probationStore.evaluate.find((x: any) => x.no === dataArrayNumber)"
|
||||
action="edit"
|
||||
/>
|
||||
</q-tab-panel>
|
||||
|
||||
<!-- <q-page-container>
|
||||
<FormSaveResult
|
||||
:tab="tab"
|
||||
:data="probationStore.evaluate.find((x: any) => x.no === dataArrayNumber)"
|
||||
action="edit"
|
||||
/>
|
||||
</q-page-container> -->
|
||||
</q-tab-panels>
|
||||
|
||||
<div class="q-gutter-md" v-else-if="probationStore.tabs.length == 0">
|
||||
|
|
|
|||
|
|
@ -64,9 +64,6 @@ const result_option = ref<any>([
|
|||
const note = ref<string>("");
|
||||
const date = ref<Date>(new Date());
|
||||
|
||||
const saveEdit = (id: string) => {
|
||||
dialogConfirm($q, () => console.log("save"));
|
||||
};
|
||||
const edit = () => {
|
||||
status.value = true;
|
||||
};
|
||||
|
|
@ -349,24 +346,24 @@ onMounted(() => {
|
|||
</div>
|
||||
<div class="row col-12 q-gutter-lg q-mt-md">
|
||||
<div class="col-xs-12 col-sm-6">
|
||||
<div class="col-12 text-top0 items-center">
|
||||
ผลการพัฒนาข้าราชการที่อยู่ระหว่างการทดลองปฏิบัติหน้าที่ราชการ
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<q-select
|
||||
class="col-12"
|
||||
dense
|
||||
v-model="develop_result"
|
||||
outlined
|
||||
:options="result_option"
|
||||
option-label="name"
|
||||
option-value="value"
|
||||
map-options
|
||||
emit-value
|
||||
:disable="!status"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 text-top0 items-center">
|
||||
ผลการพัฒนาข้าราชการที่อยู่ระหว่างการทดลองปฏิบัติหน้าที่ราชการ
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<q-select
|
||||
class="col-12"
|
||||
dense
|
||||
v-model="develop_result"
|
||||
outlined
|
||||
:options="result_option"
|
||||
option-label="name"
|
||||
option-value="value"
|
||||
map-options
|
||||
emit-value
|
||||
:disable="!status"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-sm-11">
|
||||
<div class="col-12 text-top0 row items-center">
|
||||
|
|
@ -434,7 +431,9 @@ onMounted(() => {
|
|||
dense
|
||||
:disable="!status"
|
||||
class="full-width datepicker"
|
||||
:model-value="evaluate_date != null ? date2Thai(evaluate_date) : null"
|
||||
:model-value="
|
||||
evaluate_date != null ? date2Thai(evaluate_date) : null
|
||||
"
|
||||
:rules="[(val) => !!val || `${'วัน เดือน ปี ที่ประเมิน'}`]"
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
|
|
@ -472,8 +471,8 @@ onMounted(() => {
|
|||
.q-rating__icon {
|
||||
text-shadow: transparent !important;
|
||||
}
|
||||
.color-txt{
|
||||
color: black!important;;
|
||||
.color-txt {
|
||||
color: black !important;
|
||||
}
|
||||
.q-card {
|
||||
box-shadow: 0px 0px 0px 0px !important;
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ const getSurveyData = async () => {
|
|||
}
|
||||
})
|
||||
.catch((e) => {
|
||||
console.log(e);
|
||||
messageError($q,e)
|
||||
});
|
||||
};
|
||||
const classBordered = ref<string>("");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue