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

Merge branch 'develop' into devTee

Browse source 
# Conflicts:
#	src/modules/08_KPI/components/Tab/Dialog/04_FormCompetency.vue
This commit is contained in:
STW_TTTY\stwtt 2024-05-08 10:34:10 +07:00
commit 4704d8b2d0
9 changed files with 124 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue
View file

@ -44,7 +44,7 @@ const formDetail = reactive<any>({
includingName: "",
including: "",
target: "",
unit: null,
unit: "",
weight: null,
achievement1: "",
achievement2: "",
@ -59,6 +59,7 @@ const formDetail = reactive<any>({
strategy: null,
strategyId: "",
strategyName: "",
documentInfoEvidence: "",
});
function fetchIndicators() {
@ -219,7 +220,7 @@ function onSubmit() {
const formBody = {
target: formDetail.target,
unit: Number(formDetail.unit),
unit: formDetail.unit,
weight: Number(formDetail.weight),
meaning: formDetail.meaning,
formula: formDetail.formula,
@ -305,12 +306,8 @@ watch(
<q-card bordered flat class="q-mt-sm no-shadow bg-white col-12">
<div class="row q-px-md q-py-sm items-center bg-grey-1">
<div class="col-4">
<span>รหัสตัวชี้วัด</span>
</div>
<div class="col-4">
<span>ชื่อตัวชี้วัด</span>
</div>
<div class="col-4">ลำดับ/รหัสตัวชี้วัด</div>
<div class="col-4">ชื่อตัวชี้วัด</div>
</div>
<q-separator />
@ -363,7 +360,7 @@ watch(
</div>
<div class="col-12 row">
<div class="col-4 text-grey-6">รหัสตัวชี้วัด</div>
<div class="col-4 text-grey-6">ลำดับ/รหัสตัวชี้วัด</div>
<div class="col-8">{{ formDetail.including }}</div>
</div>
<div class="col-12 row">
@ -399,7 +396,6 @@ watch(
(val) => !!val || `${'กรุณากรอกหน่วยนับ'}`,
]"
hide-bottom-space
mask="#"
reverse-fill-mask
/>
</div>
@ -490,6 +486,19 @@ watch(
class="inputgreen"
/>
</div>
<div class="col-12">
<q-input
v-model="formDetail.documentInfoEvidence"
label="ข้อมูลเอกสารหลักฐาน"
type="textarea"
outlined
dense
:rules="[(val:string) => !!val || `${'กรุณากรอกข้อมูลเอกสารหลักฐาน'}`,]"
hide-bottom-space
class="inputgreen"
/>
</div>
</div>
</div>
</div>

11
src/modules/08_KPI/components/Tab/Dialog/03_FormIndicatorSpecial.vue
View file

@ -33,7 +33,7 @@ const formData = reactive<FormDataAssigned>({
including: "", //รหัสตัวชี้วัด
includingName: "", //ชื่อตัวชี้วัด
target: "", //ค่าเป้าหมาย
unit: null, //หน่วยนับ
unit: "", //หน่วยนับ
weight: null, //น้ำหนัก (ร้อยละ)
meaning: "", //นิยามหรือความหมายของตัวชี้วัด
formula: "", //สูตรคำนวณ
@ -80,7 +80,7 @@ function closeDialog() {
formData.including = "";
formData.includingName = "";
formData.target = "";
formData.unit = null;
formData.unit = "";
formData.achievement1 = "";
formData.achievement2 = "";
formData.achievement3 = "";
@ -95,7 +95,7 @@ function onSubmit() {
dialogConfirm($q, async () => {
showLoader();
formData.weight = Number(formData.weight);
formData.unit = Number(formData.unit);
formData.unit = formData.unit;
formData.kpiUserEvaluationId = store.dataEvaluation.id;
try {
@ -140,11 +140,11 @@ watch(
<q-input
outlined
v-model="formData.including"
label="รหัสตัวชี้วัด"
label="ลำดับ/รหัสตัวชี้วัด"
bg-color="white"
dense
class="inputgreen"
:rules="[(val) => !!val || `${'กรุณากรอกรหัสตัวชี้วัด'}`]"
:rules="[(val) => !!val || `${'กรุณากรอกลำดับ/รหัสตัวชี้วัด'}`]"
hide-bottom-space
lazy-rules
/>
@ -182,7 +182,6 @@ watch(
:rules="[(val:string) => !!val || `${'กรุณากรอกหน่วยนับ'}`,]"
hide-bottom-space
class="inputgreen"
mask="#"
reverse-fill-mask
lazy-rules
/>

16
src/modules/08_KPI/components/Tab/Dialog/04_FormCompetency.vue
View file

@ -29,7 +29,8 @@ const pagination = ref({
page: 1,
rowsPerPage: 20,
});
const weight = ref<number | null>(null);
const weight = ref<number>(100);
const mixin = useCounterMixin();
const {
showLoader,
@ -150,7 +151,7 @@ function closeDialog() {
formDetail.definition = "";
formDetail.criteria = "";
idProps.value = null;
weight.value = null;
// weight.value = null;
expectedLevel.value = null;
dataListCapacityDetails.value = [];
@ -402,6 +403,7 @@ watch(
<div class="col-4 text-grey-6">น้ำหนัก (ร้อยละ)</div>
<div class="col-8">
<q-input
readonly
v-model="weight"
dense
outlined
@ -413,11 +415,9 @@ watch(
/>
</div>
<div class="col-4 text-grey-6">ระดับที่คาดหวัง</div>
<div
v-if="type == 'HEAD' || type == 'GROUP'"
class="col-8"
>
<div class="col-8">
<q-select
:readonly="type == 'HEAD' || type == 'GROUP'"
v-model="expectedLevel"
:options="expectedLevelOp"
dense
@ -429,7 +429,7 @@ watch(
class="inputgreen"
/>
</div>
<div v-else>
<!-- <div v-else>
<q-input
v-model="expectedLevel"
dense
@ -439,7 +439,7 @@ watch(
hide-bottom-space
class="inputgreen"
/>
</div>
</div> -->
</div>
</q-card>
</div>