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

Merge commit '47327cff40' into develop

Browse source
This commit is contained in:
Tanyalak 2024-01-18 15:02:49 +07:00
commit 1c5a839fda
6 changed files with 187 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/modules/01_dashboard/views/Dashboard.vue
View file

@ -214,9 +214,9 @@ async function onLoad(index: number, done: any) {
flat
bordered
:style="$q.screen.gt.xs ? 'max-height: 74vh' : 'height: 100px;'"
class="q-pb-md col-12"
class="q-pb-sm col-12"
>
<div class="col-12 row q-pa-md">
<div class="col-12 row q-px-md q-pt-md q-pb-sm">
<div class="text-subtitle1 text-weight-bold text-dark">
กล่องข้อความ
</div>
@ -232,13 +232,12 @@ async function onLoad(index: number, done: any) {
<div
v-if="totalInbox != 0"
ref="scrollTargetRef"
class="q-pa-md"
style="max-height: 90%; overflow: auto"
>
<q-infinite-scroll
@load="onLoad"
:offset="250"
class="q-pa-md"
class="q-px-md"
:scroll-target="scrollTargetRef"
>
<div

26
src/modules/05_leave/views/EditPage.vue
View file

@ -18,13 +18,17 @@ import RehabilitationForm from "@/modules/05_leave/components/FormLeave/13_Rehab
import { useCounterMixin } from "@/stores/mixin";
import { useQuasar } from "quasar";
import { useRoute } from "vue-router";
import router from "@/router";
import { useRoute, useRouter } from "vue-router";
import http from "@/plugins/http";
import config from "@/app.config";
import { useLeaveStore } from "@/modules/05_leave/store";
const route = useRoute();
const router = useRouter();
/**
* ตัวแปรที่ใช้
*/
const personalId = ref<string>(route.params.id as string);
const leaveId = ref<string>("");
const dataStore = useLeaveStore();
@ -201,12 +205,12 @@ async function fetchDataDetail(id: string) {
});
}
/**modal */
const model = computed(() => {
return (
dataStore.options.find((x) => x.id == formData.leaveTypeId)?.code ?? ""
);
});
const modelSpecific = computed(() => {
const code = dataStore.options.find(
(x) => x.id == formData.leaveTypeId
@ -225,6 +229,11 @@ const modelSpecific = computed(() => {
}
});
/**
* function บันทึกข้อมูล
* @param formData ข้อมูลใน formdata
* @param isLeave ตัวแปรเช็คว่าใช้หน้า edit หรือไม่
*/
function onSubmit(formData: FormData, isLeave: boolean = true) {
if (isLeave) {
dialogConfirm($q, async () => {
@ -232,6 +241,7 @@ function onSubmit(formData: FormData, isLeave: boolean = true) {
await http
.put(config.API.leaveUserId(personalId.value), formData)
.then(() => {
fetchDataDetail(personalId.value);
success($q, "บันทึกสำเร็จ");
})
.catch((e: any) => {
@ -239,7 +249,6 @@ function onSubmit(formData: FormData, isLeave: boolean = true) {
})
.finally(() => {
hideLoader();
fetchDataDetail(personalId.value);
});
});
} else {
@ -247,6 +256,10 @@ function onSubmit(formData: FormData, isLeave: boolean = true) {
}
}
/**
* funciotn ยื่นใบลา
* @param id id ของใบลา
*/
function onConfirm(id: string) {
dialogConfirm(
$q,
@ -256,15 +269,14 @@ function onConfirm(id: string) {
.put(config.API.leaveUserSendId(personalId.value), { reason: "" })
.then(() => {
success($q, "ยื่นใบลาสำเร็จ");
// router.push("/leave");
})
.catch((e: any) => {
messageError($q, e);
})
.finally(() => {
router.push("/leave");
fetchDataDetail(personalId.value);
hideLoader();
router.push("/leave");
// fetchDataDetail(personalId.value);
});
},
"ยืนยันการยื่นใบลา",

144
src/modules/06_evaluate/components/EvaluateStepMain.vue
View file

@ -607,7 +607,7 @@ onMounted(async () => {
}}
</div>
<q-space />
<div>
<div v-if="route.name !== 'evaluate-add'">
<q-btn
flat
round
@ -635,8 +635,8 @@ onMounted(async () => {
<div class="toptitle2">
{{ store.step }}.{{ store.title[store.step - 1] }}
</div>
<q-space/>
<div >
<q-space />
<div>
<q-btn
v-if="store.step === 1"
:href="externalLink"
@ -651,7 +651,7 @@ onMounted(async () => {
</q-btn>
</div>
</div>
<div class=" col-12 q-pt-sm">
<div class="col-12 q-pt-sm">
<div class="q-col-gutter-md col-12 row">
<div
:class="
@ -664,9 +664,17 @@ onMounted(async () => {
? 'col-12 row'
: 'col-xs-12 col-sm-5 row'
"
>
<q-card flat bordered class="col-12 shadow-0" :style="$q.screen.lt.sm ? '' : 'max-height: 60vh; overflow: scroll;' ">
<q-card
flat
bordered
class="col-12 shadow-0"
:style="
$q.screen.lt.sm
? ''
: 'max-height: 60vh; overflow: scroll;'
"
>
<Step1
v-if="store.step === 1"
@update:spec="updateCheckSpec"
@ -677,21 +685,29 @@ onMounted(async () => {
v-if="store.step === 2"
@update:form="updateformCommand"
/>
<Step3 v-if="store.step === 3" @update:file="updateFilePDF" />
<Step3
v-if="store.step === 3"
@update:file="updateFilePDF"
/>
<Step4 v-if="store.step === 4" />
<Step5 v-if="store.step === 5" />
<Step6
v-if="store.step === 6"
@update:form="updateformCommand"
/>
<Step7 v-if="store.step === 7" @update:file="updateFilePDF" />
<Step7
v-if="store.step === 7"
@update:file="updateFilePDF"
/>
<Step8 v-if="store.step === 8" />
<Step9 v-if="store.step === 9" />
</q-card>
</div>
<div
class="col-xs-12 col-sm-7"
v-if="store.step === 1 || store.step === 3 || store.step === 7"
v-if="
store.step === 1 || store.step === 3 || store.step === 7
"
>
<div class="col-12">
<ViewStep1
@ -712,63 +728,63 @@ onMounted(async () => {
</div>
</div>
</div>
</div>
<div class="q-pt-sm q-gutter-sm" align="right">
<q-btn
v-if="
store.step >= store.currentStep &&
store.statusUpload === false &&
store.step !== 3 &&
store.step !== 4 &&
store.step !== 5 &&
store.step !== 7 &&
store.step !== 8 &&
store.step !== 9
"
unelevated
:label="
store.step === 2 || store.step === 6
? 'บันทึกข้อมูล'
: 'ดำเนินการต่อ'
"
color="public"
@click="onCilckNextStep()"
/>
</div>
<div class="q-pt-sm q-gutter-sm" align="right">
<q-btn
v-if="
store.step >= store.currentStep &&
store.statusUpload === false &&
store.step !== 3 &&
store.step !== 4 &&
store.step !== 5 &&
store.step !== 7 &&
store.step !== 8 &&
store.step !== 9
"
unelevated
:label="
store.step === 2 || store.step === 6
? 'บันทึกข้อมูล'
: 'ดำเนินการต่อ'
"
color="public"
@click="onCilckNextStep()"
/>
<q-btn
v-else-if="
store.step >= store.currentStep &&
(store.step == 3 || store.step == 7)
"
unelevated
label="ยื่นเอกสาร"
color="public"
@click="onCilckNextStep()"
/>
<q-btn
v-else-if="
store.step >= store.currentStep &&
(store.step == 3 || store.step == 7)
"
unelevated
label="ยื่นเอกสาร"
color="public"
@click="onCilckNextStep()"
/>
<q-btn
v-if="
store.step >= store.currentStep &&
store.step == 2 &&
store.statusUpload
"
unelevated
label="ดำเนินการต่อ"
color="public"
@click="onCilckNextStep()"
/>
<q-btn
v-if="
store.step >= store.currentStep &&
store.step == 6 &&
store.statusUpload
"
unelevated
label="ดำเนินการต่อ"
color="public"
@click="onCilckNextStep()"
/>
</div>
<q-btn
v-if="
store.step >= store.currentStep &&
store.step == 2 &&
store.statusUpload
"
unelevated
label="ดำเนินการต่อ"
color="public"
@click="onCilckNextStep()"
/>
<q-btn
v-if="
store.step >= store.currentStep &&
store.step == 6 &&
store.statusUpload
"
unelevated
label="ดำเนินการต่อ"
color="public"
@click="onCilckNextStep()"
/>
</div>
</div>
</q-card>
</div>

4
src/modules/07_appealComplain/views/Form.vue
View file

@ -228,12 +228,12 @@ function onSubmit(data: any) {
:readonly="isReadOnly"
ref="titleRef"
:rules="[
(val) => !!val || 'กรุณากรอกอุทธรณ์/ร้องทุกข์',
(val) => !!val || 'กรุณากรอกเรื่องอุทธรณ์/ร้องทุกข์',
]"
v-model="formData.title"
dense
outlined
label="อุทธรณ์/ร้องทุกข์"
label="เรื่องอุทธรณ์/ร้องทุกข์"
hide-bottom-space
/>
</div>