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
This commit is contained in:
STW_TTTY\stwtt 2024-06-06 10:54:37 +07:00
commit 3e213f0681
7 changed files with 126 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

69
src/modules/03_retire/views/addRetire.vue
View file

@ -374,6 +374,75 @@ function downloadFile(data: string) {
</q-list>
</q-card>
</div>
<div class="col-12 row">
<q-card
bordered
class="row col-12 text-dark q-mt-sm"
v-if="routeName != 'AddRetire'"
>
<div
class="bg-grey-1 q-pa-sm col-12 row items-center text-primary"
>
<div class="q-pl-sm text-weight-bold text-dark">
ผลการพิจารณาของการเจ้าหน้าที่ของหน่วยงาน
</div>
</div>
<q-separator />
<div class="row col-12 q-pa-md">
<div class="col-12 row bg-white q-col-gutter-md">
<div class="col-xs-6 row items-start">
<div class="col-12 text-top">สถานะ</div>
<div class="col-12 text-detail">
{{
dataDetail.officerReject !== null
? statusOrder(dataDetail.officerReject)
: "-"
}}
</div>
</div>
<div class="col-xs-6 row items-start">
<div class="col-12 text-top">
วันสุดท้ายที่ยับยั้ง
</div>
<div class="col-12 text-detail">
{{
dataDetail.officerRejectDate !== null
? date2Thai(dataDetail.officerRejectDate)
: "-"
}}
</div>
</div>
<div class="col-xs-12 row items-start">
<div class="col-12 text-top">
ความคิดเห็นและเหตุผล
</div>
<div
class="col-12 text-detail"
v-if="dataDetail.officerReject === false"
>
{{
dataDetail.officerApproveReason !== null
? dataDetail.officerApproveReason
: "-"
}}
</div>
<div
class="col-12 text-detail"
v-if="dataDetail.officerReject === true"
>
{{
dataDetail.officerRejectReason !== null
? dataDetail.officerRejectReason
: "-"
}}
</div>
</div>
</div>
</div>
</q-card>
</div>
<div class="col-12 row">
<q-card
bordered

1
src/modules/05_leave/views/Main.vue
View file

@ -24,7 +24,6 @@ const $q = useQuasar();
const filterLeaveType = ref(["ลาป่วย", "ลากิจส่วนตัว", "ลาพักผ่อน"]);
const itemPie = ref<LeaveItem[]>([]);
const knob = ref(80);
const columns = ref<QTableProps["columns"]>([
{
name: "no",

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

@ -289,7 +289,7 @@ async function saveStep1() {
fullName: `${formDetail.value.firstName} ${formDetail.value.lastName}`,
position: formDetail.value.position,
oc: formDetail.value.oc,
salary: formDetail.value.salary.toString(),
salary: formDetail.value.salary ? formDetail.value.salary.toString() : null,
positionLevel: formDetail.value.positionLevel,
posNo: formDetail.value.posNo,
birthDate: formDetail.value.birthDate,
@ -596,7 +596,7 @@ onMounted(async () => {
<div class="col-12">
<q-card bordered class="col-12 row caedNone">
<div class="col-xs-12 col-sm-3 row">
<div class="col-12 row no-wrap">
<div class="col-12 row ">
<div class="col-12 q-py-md q-px-lg">
<div class="col-12 row items-center no-wrap">
<div class="toptitle2">

6
src/modules/06_evaluate/components/viewstep/tableStep1.vue
View file

@ -13,7 +13,7 @@ const props = defineProps({
<template>
<div class="q-pa-sm row col-12">
<q-table
<d-table
ref="table"
flat
bordered
@ -23,9 +23,9 @@ const props = defineProps({
:rows-per-page-options="[10, 25, 50, 100]"
virtual-scroll
class="row col-12"
:style="$q.screen.lt.sm ? 'width: 70vw' : 'width: 50vw;'"
:style="$q.screen.lt.sm ? 'width: 80vw' : 'width: 50vw;'"
>
</q-table>
</d-table>
</div>
</template>

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

@ -1,4 +1,3 @@
div
<script setup lang="ts">
import { ref, reactive, defineProps, watch } from "vue";
import { useAppealComplainStore } from "@/modules/07_appealComplain/store";
@ -206,7 +205,7 @@ function onSubmit(data: any) {
</div>
</q-banner>
</div>
<div class="row q-gutter-x-sm">
<div class="row q-col-gutter-sm ">
<div class="col-xs-12 col-md-3">
<q-select
:class="inputEdit(isReadOnly)"

27
src/modules/07_appealComplain/views/Main.vue
View file

@ -379,7 +379,7 @@ onMounted(async () => {
class="col-xs-12 col-sm-3 col-md-2"
/>
</div>
<q-table
<d-table
flat
bordered
dense
@ -436,7 +436,30 @@ onMounted(async () => {
</q-td>
</q-tr>
</template>
</q-table>
<template #item="props">
<div class="q-pa-xs col-xs-12 col-sm-6 col-md-4 col-lg-3">
<q-card bordered flat>
<q-list @click="editPage(props.row.id)">
<q-item
v-for="col in props.cols.filter((col:any) => col.name !== 'desc')"
:key="col.name"
>
<q-item-section>
<q-item-label caption>{{ col.label }}</q-item-label>
<q-item-label v-if="col.name === 'no'">
{{ props.rowIndex + 1 }}
</q-item-label>
<q-item-label v-else>{{ col.value }}</q-item-label>
</q-item-section>
</q-item>
</q-list>
</q-card>
</div>
</template>
</d-table>
</q-card>
</div>
</div>

52
src/modules/08_KPI/views/form.vue
View file

@ -394,7 +394,7 @@ onMounted(async () => {
>*น้ำหนัก(ร้อยละ) ผลสัมฤทธิ์ของงานไม่ถูกต้อง</span
>
<br v-if="!$q.screen.gt.xs" />
<q-btn
v-if="
store.rolePerson == 'USER' &&
@ -502,51 +502,51 @@ onMounted(async () => {
$q.screen.gt.xs ? 'padding-left: 12%' : 'padding-left:5%'
"
>
<div class="row no-wrap">
<div class="col-2">
<div class="column">
<span class="text-grey-6">ตำแหน่งในสายงาน</span>
<span class="text-weight-medium text-dark">{{
<div class="row">
<div class="col-xs-12 col-md-2">
<div :class="$q.screen.gt.sm ? 'column' : 'row'">
<span class="text-grey-6 col">ตำแหน่งในสายงาน</span>
<span class="text-weight-medium text-dark col">{{
store.dataEvaluation.position
}}</span>
</div>
</div>
<div class="col-2">
<div class="column">
<span class="text-grey-6">ประเภทตำแหน่ง</span>
<span class="text-weight-medium text-dark">{{
<div class="col-xs-12 col-md-2">
<div :class="$q.screen.gt.sm ? 'column' : 'row'">
<span class="text-grey-6 col">ประเภทตำแหน่ง</span>
<span class="text-weight-medium text-dark col">{{
store.dataEvaluation.posTypeName
}}</span>
</div>
</div>
<div class="col-2">
<div class="column">
<span class="text-grey-6">ระดับตำแหน่ง</span>
<span class="text-weight-medium text-dark">{{
<div class="col-xs-12 col-md-2">
<div :class="$q.screen.gt.sm ? 'column' : 'row'">
<span class="text-grey-6 col">ระดับตำแหน่ง</span>
<span class="text-weight-medium text-dark col">{{
store.dataEvaluation.posLevelName
}}</span>
</div>
</div>
<div class="col-2">
<div class="column">
<span class="text-grey-6">สถานะการประเมิน</span>
<span class="text-weight-medium text-dark">{{
<div class="col-xs-12 col-md-2">
<div :class="$q.screen.gt.sm ? 'column' : 'row'">
<span class="text-grey-6 col">สถานะการประเมิน</span>
<span class="text-weight-medium text-dark col">{{
formProfile.status
}}</span>
</div>
</div>
<div class="col-2">
<div class="column">
<span class="text-grey-6">ผลการประเมิน</span>
<span class="text-weight-medium text-dark">{{
<div class="col-xs-12 col-md-2">
<div :class="$q.screen.gt.sm ? 'column' : 'row'">
<span class="text-grey-6 col">ผลการประเมิน</span>
<span class="text-weight-medium text-dark col">{{
formProfile.result
}}</span>
</div>
</div>
<div class="col-2">
<div class="column">
<span class="text-grey-6">คะแนนประเมิน</span>
<span class="text-weight-medium text-primary">
<div class="col-xs-12 col-md-2">
<div :class="$q.screen.gt.sm ? 'column' : 'row'">
<span class="text-grey-6 col">คะแนนประเมิน</span>
<span class="text-weight-medium text-primary col">
{{
store.dataEvaluation.posExecutiveName == null
? (