Merge branch 'develop' into dev-tee
This commit is contained in:
setthawutttty
commit
5ac34a4d8d
6 changed files with 85 additions and 102 deletions
|
|
@ -8,4 +8,5 @@ const message = `${env.API_PLACEMENT_URI}/message`;
|
||||||
export default {
|
export default {
|
||||||
msgNotificate: `${message}/my-notifications`,
|
msgNotificate: `${message}/my-notifications`,
|
||||||
msgInbox: `${message}/my-inboxes`,
|
msgInbox: `${message}/my-inboxes`,
|
||||||
|
msgId: (id: string) => `${message}/my-notifications/${id}`,
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -940,7 +940,7 @@ console.log(countCheckedItems);
|
||||||
option-value="value"
|
option-value="value"
|
||||||
:outlined="status == true"
|
:outlined="status == true"
|
||||||
v-model="monthSelect"
|
v-model="monthSelect"
|
||||||
:label="`ระยะเวลากี่เดือน`"
|
:label="`ระยะเวลา (เดือน)`"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-12 col-sm-4">
|
<div class="col-xs-12 col-sm-4">
|
||||||
|
|
|
||||||
|
|
@ -56,8 +56,9 @@ const pass_result = ref<number>();
|
||||||
const evaluate_date = ref<Date>();
|
const evaluate_date = ref<Date>();
|
||||||
const result = ref<any>();
|
const result = ref<any>();
|
||||||
const result_option = ref<any>([
|
const result_option = ref<any>([
|
||||||
{ name: "ผ่าน (สูงกว่าร้อยละ 60)", value: 1 },
|
{ name: "ไม่ต่ำกว่ามาตรฐานที่กำหนด เห็นควรให้รับราชการต่อ", value: 1 },
|
||||||
{ name: "ไม่ผ่าน (ต่ำกว่าร้อยละ 60)", value: 0 },
|
{ name: "ต่ำกว่ามาตรฐานที่กำหนด เห็นควรให้ออกจากราชการ", value: 2 },
|
||||||
|
{ name: "เห็นควรให้ขยายระยะเวลาทดลองปฏิบัติหน้าที่ราชการต่อไปอีก", value: 3 },
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const note = ref<string>("");
|
const note = ref<string>("");
|
||||||
|
|
|
||||||
|
|
@ -83,7 +83,7 @@ const save = async () => {
|
||||||
.catch((e: any) => {
|
.catch((e: any) => {
|
||||||
messageError($q, e);
|
messageError($q, e);
|
||||||
})
|
})
|
||||||
.finally(()=>{
|
.finally(() => {
|
||||||
getSurveyData()
|
getSurveyData()
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
|
@ -100,91 +100,64 @@ watch(answer3, () => {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="row col-12 q-ma-xs">
|
<q-form ref="myForm" class="q-pa-md">
|
||||||
<q-form ref="myForm" class="q-pa-md">
|
<div class="toptitle text-dark col-12 row items-center q-gutter-md">
|
||||||
<div class="toptitle text-dark col-12 row items-center q-gutter-md">
|
<div>แบบสํารวจความคิดเห็นการทดลองปฏิบัติหน้าที่ราชการ</div>
|
||||||
<div>แบบสํารวจความคิดเห็นการทดลองปฏิบัติหน้าที่ราชการ</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-12 row">
|
|
||||||
<div class="col-12 text-top0 items-center">
|
|
||||||
<q-avatar class="bg-grey-2 q-mr-sm" size="28px">1</q-avatar>
|
|
||||||
คุณคิดเห็นอย่างไรกับการทดลองปฏิบัติหน้าที่ราชการ?
|
|
||||||
</div>
|
|
||||||
<div class="col-12">
|
|
||||||
<q-input
|
|
||||||
:disable="!status"
|
|
||||||
label="ความคิดเห็น"
|
|
||||||
class="bg-white"
|
|
||||||
dense
|
|
||||||
borderless
|
|
||||||
outlined
|
|
||||||
v-model="answer1"
|
|
||||||
type="textarea"
|
|
||||||
:rules="[(val: string) => !!val || `${'กรุณากรอกความคิดเห็น'}`]"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-12 row q-mt-md">
|
|
||||||
<div class="col-12 text-top0 items-center">
|
|
||||||
<q-avatar class="bg-grey-2 q-mr-sm" size="28px">2</q-avatar>
|
|
||||||
ปัญหาและอุปสรรคที่พบระหว่างการทดลองปฏิบัติหน้าที่ราชการ
|
|
||||||
</div>
|
|
||||||
<div class="col-12">
|
|
||||||
<q-input
|
|
||||||
:disable="!status"
|
|
||||||
label="ความคิดเห็น"
|
|
||||||
class="bg-white"
|
|
||||||
dense
|
|
||||||
borderless
|
|
||||||
outlined
|
|
||||||
v-model="answer2"
|
|
||||||
type="textarea"
|
|
||||||
:rules="[(val: string) => !!val || `${'กรุณากรอกความคิดเห็น'}`]"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div :class="`col-12 row q-mt-md ${classBordered}`">
|
|
||||||
<div class="text-top0 items-center">
|
|
||||||
<q-avatar class="bg-grey-2 q-mr-sm" size="28px">3</q-avatar>
|
|
||||||
ความพึงพอใจกับการทดลองปฏิบัติหน้าที่ราชการของคุณอยู่ในระดับใด
|
|
||||||
</div>
|
|
||||||
<q-space />
|
|
||||||
<q-rating
|
|
||||||
:disable="!status"
|
|
||||||
v-model="answer3"
|
|
||||||
max="5"
|
|
||||||
size="sm"
|
|
||||||
color="grey"
|
|
||||||
:color-selected="ratingColors"
|
|
||||||
label="ระดับการประเมินพฤติกรรม"
|
|
||||||
>
|
|
||||||
<template v-slot:tip-1>
|
|
||||||
<q-tooltip>ไม่พึงพอใจ</q-tooltip>
|
|
||||||
</template>
|
|
||||||
<template v-slot:tip-2>
|
|
||||||
<q-tooltip>ค่อนข้างพึงพอใจ</q-tooltip>
|
|
||||||
</template>
|
|
||||||
<template v-slot:tip-3>
|
|
||||||
<q-tooltip>พึงพอใจ</q-tooltip>
|
|
||||||
</template>
|
|
||||||
<template v-slot:tip-4>
|
|
||||||
<q-tooltip>พึงพอใจมาก</q-tooltip>
|
|
||||||
</template>
|
|
||||||
<template v-slot:tip-5>
|
|
||||||
<q-tooltip>พึงพอใจมากที่สุด</q-tooltip>
|
|
||||||
</template>
|
|
||||||
</q-rating>
|
|
||||||
</div>
|
|
||||||
<div class="col-12 q-my-md">
|
|
||||||
<q-separator size="3px" color="grey-2" />
|
|
||||||
</div>
|
|
||||||
</q-form>
|
|
||||||
<!-- <Footer /> -->
|
|
||||||
<div class="row col-12">
|
|
||||||
<q-space />
|
|
||||||
<q-btn label="บันทึก" color="secondary" @click="save" v-if="status" />
|
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-12 row">
|
||||||
|
<div class="col-12 text-top0 items-center">
|
||||||
|
<q-avatar class="bg-grey-2 q-mr-sm" size="28px">1</q-avatar>
|
||||||
|
คุณคิดเห็นอย่างไรกับการทดลองปฏิบัติหน้าที่ราชการ?
|
||||||
|
</div>
|
||||||
|
<div class="col-12">
|
||||||
|
<q-input :disable="!status" label="ความคิดเห็น" class="bg-white" dense borderless outlined v-model="answer1"
|
||||||
|
type="textarea" :rules="[(val: string) => !!val || `${'กรุณากรอกความคิดเห็น'}`]" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-12 row q-mt-md">
|
||||||
|
<div class="col-12 text-top0 items-center">
|
||||||
|
<q-avatar class="bg-grey-2 q-mr-sm" size="28px">2</q-avatar>
|
||||||
|
ปัญหาและอุปสรรคที่พบระหว่างการทดลองปฏิบัติหน้าที่ราชการ
|
||||||
|
</div>
|
||||||
|
<div class="col-12">
|
||||||
|
<q-input :disable="!status" label="ความคิดเห็น" class="bg-white" dense borderless outlined v-model="answer2"
|
||||||
|
type="textarea" :rules="[(val: string) => !!val || `${'กรุณากรอกความคิดเห็น'}`]" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div :class="`col-12 row q-mt-md ${classBordered}`">
|
||||||
|
<div class="text-top0 items-center">
|
||||||
|
<q-avatar class="bg-grey-2 q-mr-sm" size="28px">3</q-avatar>
|
||||||
|
ความพึงพอใจกับการทดลองปฏิบัติหน้าที่ราชการของคุณอยู่ในระดับใด
|
||||||
|
</div>
|
||||||
|
<q-space />
|
||||||
|
<q-rating :disable="!status" v-model="answer3" max="5" size="sm" color="grey" :color-selected="ratingColors"
|
||||||
|
label="ระดับการประเมินพฤติกรรม">
|
||||||
|
<template v-slot:tip-1>
|
||||||
|
<q-tooltip>ไม่พึงพอใจ</q-tooltip>
|
||||||
|
</template>
|
||||||
|
<template v-slot:tip-2>
|
||||||
|
<q-tooltip>ค่อนข้างพึงพอใจ</q-tooltip>
|
||||||
|
</template>
|
||||||
|
<template v-slot:tip-3>
|
||||||
|
<q-tooltip>พึงพอใจ</q-tooltip>
|
||||||
|
</template>
|
||||||
|
<template v-slot:tip-4>
|
||||||
|
<q-tooltip>พึงพอใจมาก</q-tooltip>
|
||||||
|
</template>
|
||||||
|
<template v-slot:tip-5>
|
||||||
|
<q-tooltip>พึงพอใจมากที่สุด</q-tooltip>
|
||||||
|
</template>
|
||||||
|
</q-rating>
|
||||||
|
</div>
|
||||||
|
<div class="col-12 q-my-md">
|
||||||
|
<q-separator size="3px" color="grey-2" />
|
||||||
|
</div>
|
||||||
|
</q-form>
|
||||||
|
<!-- <Footer /> -->
|
||||||
|
<div class="row col-12">
|
||||||
|
<q-space />
|
||||||
|
<q-btn label="บันทึก" color="secondary" @click="save" v-if="status" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
@ -208,6 +181,7 @@ watch(answer3, () => {
|
||||||
.q-card {
|
.q-card {
|
||||||
box-shadow: 0px 0px 0px 0px !important;
|
box-shadow: 0px 0px 0px 0px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.border_custom {
|
.border_custom {
|
||||||
border: 2px solid #c10015;
|
border: 2px solid #c10015;
|
||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
|
|
|
||||||
|
|
@ -58,6 +58,8 @@ export const useBrrowDataStore = defineStore("insigniaBrrow", () => {
|
||||||
}));
|
}));
|
||||||
rows.value = list
|
rows.value = list
|
||||||
listInsignia.value = list
|
listInsignia.value = list
|
||||||
|
console.log(listInsignia.value);
|
||||||
|
|
||||||
searchDatatable(insignia.value, employeeClass.value)
|
searchDatatable(insignia.value, employeeClass.value)
|
||||||
}
|
}
|
||||||
const searchDatatable = (type: string, employeeClass: string) => {
|
const searchDatatable = (type: string, employeeClass: string) => {
|
||||||
|
|
@ -70,7 +72,10 @@ export const useBrrowDataStore = defineStore("insigniaBrrow", () => {
|
||||||
} else if (type == '' && employeeClass !== "all") {
|
} else if (type == '' && employeeClass !== "all") {
|
||||||
rows.value = listInsignia.value.filter((e: any) => e.profileType == employeeClass
|
rows.value = listInsignia.value.filter((e: any) => e.profileType == employeeClass
|
||||||
)
|
)
|
||||||
|
} else if (type === '' && employeeClass === "all") {
|
||||||
|
rows.value = listInsignia.value
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const status = (val: string) => {
|
const status = (val: string) => {
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,7 @@ const {
|
||||||
const DataStore = useroleUserDataStore();
|
const DataStore = useroleUserDataStore();
|
||||||
const { fetchroleUser } = DataStore;
|
const { fetchroleUser } = DataStore;
|
||||||
|
|
||||||
|
const id = ref<string>("");
|
||||||
const $q = useQuasar();
|
const $q = useQuasar();
|
||||||
const { tabData, loader } = storeToRefs(store);
|
const { tabData, loader } = storeToRefs(store);
|
||||||
const { changeTab } = store;
|
const { changeTab } = store;
|
||||||
|
|
@ -405,19 +406,20 @@ if (keycloak.tokenParsed != null) {
|
||||||
}
|
}
|
||||||
|
|
||||||
const deleteData = async (id: string) => {
|
const deleteData = async (id: string) => {
|
||||||
await http;
|
console.log("delete=", id);
|
||||||
// .delete(config.API.copyOrderId(id))
|
showLoader();
|
||||||
// .then((res) => {
|
await http
|
||||||
// // const data = res.data.result;
|
.delete(config.API.msgId(id))
|
||||||
// // console.log(res);
|
.then((res) => {
|
||||||
// success($q, "ลบข้อมูลสำเร็จ");
|
success($q, "ลบข้อมูลสำเร็จ");
|
||||||
// })
|
})
|
||||||
// .catch((e) => {
|
.catch((e) => {
|
||||||
// messageError($q, e);
|
messageError($q, e);
|
||||||
// })
|
})
|
||||||
// .finally(async () => {
|
.finally(async () => {
|
||||||
// // hideLoader();
|
getDataNotification();
|
||||||
// });
|
hideLoader();
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
const clickDelete = (id: string) => {
|
const clickDelete = (id: string) => {
|
||||||
|
|
@ -509,7 +511,7 @@ const clickDelete = (id: string) => {
|
||||||
dense
|
dense
|
||||||
icon="mdi-close"
|
icon="mdi-close"
|
||||||
class="mybtn q-mx-xs"
|
class="mybtn q-mx-xs"
|
||||||
@click="clickDelete"
|
@click="clickDelete(n.id)"
|
||||||
></q-btn>
|
></q-btn>
|
||||||
</q-item>
|
</q-item>
|
||||||
<q-separator color="grey-2" />
|
<q-separator color="grey-2" />
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue