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

Merge branch 'devA' into develop

Browse source
This commit is contained in:
AnandaTon 2023-09-15 13:01:53 +07:00
commit dba71fc972
3 changed files with 83 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/modules/05_placement/components/AppointMent/Detail.vue
View file

@ -32,7 +32,7 @@ const title = ref<ResponseTitle>({
positionTypeOld: "", positionTypeOld: "",
}); });
const appointment = ref<any>([]); const appointment = ref<any>([]);
const myform = ref<any>();
const edit = ref<boolean>(false); const edit = ref<boolean>(false);
const profileId = ref<string>(""); const profileId = ref<string>("");
const organizationPositionOld = ref<string>(""); const organizationPositionOld = ref<string>("");
@ -83,8 +83,14 @@ const fecthappointmentByid = async () => {
hideLoader(); hideLoader();
}); });
}; };
const clickSave = () => { const clickSave = async () => {
console.log(reason.value);
await myform.value.validate().then(async (success: boolean) => {
if (success) {
dialogConfirm($q, () => putAppointment()); dialogConfirm($q, () => putAppointment());
} else {
}
});
}; };
const putAppointment = async () => { const putAppointment = async () => {
console.log("บันทึกข้อมูล"); console.log("บันทึกข้อมูล");
@ -242,7 +248,7 @@ const getClass = (val: boolean) => {
</div> </div>
</div> </div>
<div class="col-12"><q-separator /></div> <div class="col-12"><q-separator /></div>
<q-form ref="myForm"> <q-form ref="myform">
<div class="row col-12 q-pa-md"> <div class="row col-12 q-pa-md">
<div class="col-12"> <div class="col-12">
<div class="text-weight-bold text-grey">วุฒิการศึกษา</div> <div class="text-weight-bold text-grey">วุฒิการศึกษา</div>
@ -289,7 +295,7 @@ const getClass = (val: boolean) => {
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row "> <div class="col-xs-6 col-sm-3 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -305,7 +311,7 @@ const getClass = (val: boolean) => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row "> <div class="col-xs-6 col-sm-3 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -321,7 +327,7 @@ const getClass = (val: boolean) => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row "> <div class="col-xs-6 col-sm-3 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -337,7 +343,7 @@ const getClass = (val: boolean) => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row "> <div class="col-xs-6 col-sm-3 row">
<div class="col-12"> <div class="col-12">
<!-- <q-input :class="getClass(edit)" :outlined="edit" dense lazy-rules :readonly="!edit" :borderless="!edit" <!-- <q-input :class="getClass(edit)" :outlined="edit" dense lazy-rules :readonly="!edit" :borderless="!edit"
v-model="salary" :rules="[(val) => !!val || `${'กรุณากรอกเงินเดือน'}`]" hide-bottom-space v-model="salary" :rules="[(val) => !!val || `${'กรุณากรอกเงินเดือน'}`]" hide-bottom-space
@ -345,6 +351,7 @@ const getClass = (val: boolean) => {
<CurrencyInput <CurrencyInput
v-model="salary" v-model="salary"
:edit="edit" :edit="edit"
:rules="[(val) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
:options="{ :options="{
currency: 'THB', currency: 'THB',
}" }"

22
src/modules/05_placement/components/Other/Detail.vue
View file

@ -54,6 +54,7 @@ const responseData = ref<ResponseDataDetail>({
const edit = ref<boolean>(false); const edit = ref<boolean>(false);
const organizationPositionOld = ref<string>(""); const organizationPositionOld = ref<string>("");
const positionTypeOld = ref<string>(""); const positionTypeOld = ref<string>("");
const myform = ref<any>();
const positionLevelOld = ref<string>(""); const positionLevelOld = ref<string>("");
const posNo = ref<string>(""); const posNo = ref<string>("");
const salary = ref<number>(0); const salary = ref<number>(0);
@ -123,8 +124,13 @@ const fecthOther = async () => {
edit.value = false; edit.value = false;
}); });
}; };
const clickEdit = () => { const clickEdit = async () => {
await myform.value.validate().then(async (success: boolean) => {
if (success) {
dialogConfirm($q, () => saveOther()); dialogConfirm($q, () => saveOther());
} else {
}
});
}; };
const saveOther = async () => { const saveOther = async () => {
// showLoader(); // showLoader();
@ -201,7 +207,7 @@ const getClass = (val: boolean) => {
<q-img :src="avatar" v-if="avatar !== ''" /> <q-img :src="avatar" v-if="avatar !== ''" />
<q-img src="@/assets/avatar_user.jpg" v-else /> <q-img src="@/assets/avatar_user.jpg" v-else />
</div> </div>
<div class="col-xs-6 col-sm-3 row "> <div class="col-xs-6 col-sm-3 row">
<div class="col-12 q-pl-md"> <div class="col-12 q-pl-md">
<div class="col-12 text-top">ตำแหน่งในสายงาน</div> <div class="col-12 text-top">ตำแหน่งในสายงาน</div>
<div class="col-12 text-detail"> <div class="col-12 text-detail">
@ -209,7 +215,7 @@ const getClass = (val: boolean) => {
</div> </div>
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row "> <div class="col-xs-6 col-sm-3 row">
<div class="col-12"> <div class="col-12">
<div class="col-12 text-top">ระดับ</div> <div class="col-12 text-top">ระดับ</div>
<div class="col-12 text-detail"> <div class="col-12 text-detail">
@ -275,7 +281,7 @@ const getClass = (val: boolean) => {
</div> </div>
</div> </div>
<div class="col-12"><q-separator /></div> <div class="col-12"><q-separator /></div>
<q-form ref="myForm"> <q-form ref="myform">
<div class="row col-12 q-pa-md"> <div class="row col-12 q-pa-md">
<div class="col-12 row bg-white q-col-gutter-md"> <div class="col-12 row bg-white q-col-gutter-md">
<div class="col-xs-12 row items-center"> <div class="col-xs-12 row items-center">
@ -300,7 +306,7 @@ const getClass = (val: boolean) => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row "> <div class="col-xs-6 col-sm-3 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -316,7 +322,7 @@ const getClass = (val: boolean) => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row "> <div class="col-xs-6 col-sm-3 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -332,7 +338,7 @@ const getClass = (val: boolean) => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row "> <div class="col-xs-6 col-sm-3 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -348,7 +354,7 @@ const getClass = (val: boolean) => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row "> <div class="col-xs-6 col-sm-3 row">
<div class="col-12"> <div class="col-12">
<!-- <q-input <!-- <q-input
:class="getClass(edit)" :class="getClass(edit)"

5
src/modules/05_placement/components/Transfer/transferRegistry.vue
View file

@ -381,10 +381,9 @@
dense dense
lazy-rules lazy-rules
:borderless="!edit" :borderless="!edit"
:readonly="!edit"
:model-value="date !== null ? date2Thai(date) : null" :model-value="date !== null ? date2Thai(date) : null"
:rules="[ :rules="[(val) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`]"
(val) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`,
]"
hide-bottom-space hide-bottom-space
:label="`${'ตั้งแต่วัน'}`" :label="`${'ตั้งแต่วัน'}`"
> >