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

Merge branch 'develop' into nice_dev

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-01-19 15:15:20 +07:00
commit 25fedf5eb0
2 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
View file

@ -325,11 +325,12 @@ async function fetchDatadetail() {
prefix: person.prefix,
firstName: person.firstName,
lastName: person.lastName,
position: person.position === null ? '-':person.position,
positionLevel: person.positionLevel === null ? '-':person.positionLevel,
salary: person.salary === null ? '-':person.salary,
position: person.position === null ? "-" : person.position,
positionLevel:
person.positionLevel === null ? "-" : person.positionLevel,
salary: person.salary === null ? "-" : person.salary,
personId: person.personId,
posNo: person.posNo === null ? '-':person.posNo,
posNo: person.posNo === null ? "-" : person.posNo,
organization: person.organization,
isSend: person.isSend,
isSuspend: person.isSuspend,
@ -337,7 +338,9 @@ async function fetchDatadetail() {
statusDiscard: person.statusDiscard,
}));
formData.disciplinaryStatusResult = props.data.disciplinaryStatusResult;
formData.disciplinaryStatusResult = props.data.disciplinaryStatusResult
? props.data.disciplinaryStatusResult
: "NOT_SPECIFIED";
formData.disciplinaryCauseText = props.data.disciplinaryCauseText;
formData.disciplinaryResult = props.data.disciplinaryResult;
formData.disciplinaryExtendHistory = props.data.disciplinaryExtendHistory;
@ -349,11 +352,12 @@ async function fetchDatadetail() {
prefix: person.prefix,
firstName: person.firstName,
lastName: person.lastName,
position: person.position === null ? '-':person.position,
positionLevel: person.positionLevel === null ? '-':person.positionLevel,
salary: person.salary === null ? '-':person.salary,
position: person.position === null ? "-" : person.position,
positionLevel:
person.positionLevel === null ? "-" : person.positionLevel,
salary: person.salary === null ? "-" : person.salary,
personId: person.personId,
posNo: person.posNo === null ? '-':person.posNo,
posNo: person.posNo === null ? "-" : person.posNo,
organization: person.organization,
isSend: person.isSend,
isSuspend: person.isSuspend,

21
src/modules/11_discipline/components/DialogDuty.vue
View file

@ -49,22 +49,19 @@ async function submit() {
if (myForm.value !== null) {
myForm.value.validate().then((success) => {
if (success) {
dialogConfirm(
$q,
async () => {
await props.save(props.id, duty.value, resolution.value);
duty.value = "";
resolution.value = "";
}
);
dialogConfirm($q, async () => {
await props.save(props.id, duty.value, resolution.value);
duty.value = "";
resolution.value = "";
});
}
});
}
}
watch(props, () => {
duty.value = props?.duty;
resolution.value = props?.command;
duty.value = props?.duty === "-" ? "" : props.duty;
resolution.value = props?.command === "-" ? "" : props.command;
});
</script>
@ -81,7 +78,7 @@ watch(props, () => {
dense
class="col-12 q-mb-sm"
debounce="300"
placeholder="หน้าที่"
label="หน้าที่"
:rules="[(val) => !!val || `กรุณากรอกหน้าที่`]"
hide-bottom-space
/>
@ -91,7 +88,7 @@ watch(props, () => {
dense
class="col-12 q-mb-sm"
debounce="300"
placeholder="มติ/คำสั่ง"
label="มติ/คำสั่ง"
:rules="[(val) => !!val || `กรุณากรอก มติ/คำสั่ง`]"
hide-bottom-space
/>