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

Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into develop

Browse source
This commit is contained in:
Warunee Tamkoo 2024-08-13 16:41:52 +07:00
commit d9b8791706
19 changed files with 294 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/api/14_KPI/api.KPI.ts
View file

@ -57,6 +57,7 @@ export default {
kpiEvaluationCheck: `${kpiEvaluationUser}/check`,
kpiSendToStatus: (id: string) => `${kpiEvaluationUser}/status/${id}`,
kpiReqEdit: (id: string) => `${kpiEvaluation}/edit/${id}`,
kpiReqEditUser: (id: string) => `${kpiEvaluationUser}/edit/${id}`,
/**ประเมิน*/
kpiAchievementDevelop: `${kpiAchievement}/development`,

49
src/modules/06_retirement/components/DismissOrder/DismissOrder.vue
View file

@ -9,6 +9,7 @@ import http from "@/plugins/http";
import config from "@/app.config";
import DialogSendToCommand from "@/modules/06_retirement/components/DismissOrder/DialogSendToCommand.vue";
import type { ResponseData } from "@/modules/06_retirement/interface/response/out";
import { checkPermission } from "@/utils/permissions";
/** use */
const $q = useQuasar();
@ -208,6 +209,10 @@ const pagination = ref({
<div class="col-12">
<div class="row col-12">
<q-btn
v-if="
checkPermission($route)?.attrIsGet &&
checkPermission($route)?.attrIsUpdate
"
@click="openModalOrder"
size="14px"
flat
@ -275,11 +280,43 @@ const pagination = ref({
</q-tr>
</template>
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<q-tr :props="props">
<q-td auto-width>
<q-btn
v-if="checkPermission($route)?.attrIsGet"
flat
dense
round
color="info"
icon="mdi-eye"
@click="
router.push(
`/retirement/dismiss-order-detail/${props.row.id}`
)
"
>
<q-tooltip>รายละเอียด</q-tooltip>
</q-btn>
<q-btn
v-if="
checkPermission($route)?.attrIsGet &&
checkPermission($route)?.attrIsUpdate
"
flat
dense
round
color="edit"
icon="edit"
@click="
router.push(`/retirement/dismiss-order/${props.row.id}`)
"
>
<q-tooltip>แก้ไขข้อมูล</q-tooltip>
</q-btn>
<q-btn
v-if="checkPermission($route)?.attrIsDelete"
dense
size="12px"
flat
round
:color="
@ -296,13 +333,7 @@ const pagination = ref({
<q-tooltip>ลบข้อมูล</q-tooltip>
</q-btn>
</q-td>
<q-td
v-for="col in props.cols"
:key="col.id"
@click="
router.push(`/retirement/dismiss-order/${props.row.id}`)
"
>
<q-td v-for="col in props.cols" :key="col.id">
<div v-if="col.name === 'no'">
{{ props.rowIndex + 1 }}
</div>

3
src/modules/06_retirement/components/DismissOrder/outRegistry.vue
View file

@ -18,6 +18,7 @@ import CardProfile from "@/components/CardProfile.vue";
const $q = useQuasar();
const route = useRoute();
const router = useRouter();
const checkRoutePermisson = ref<boolean>(route.name == "outDetailOnly");
const mixin = useCounterMixin();
const dataId = route.params.id.toString();
const {
@ -181,7 +182,7 @@ onMounted(async () => {
แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย
</div>
<q-space />
<div v-if="status !== 'DONE' && status !== 'REPORT'">
<div v-if="status !== 'DONE' && status !== 'REPORT' && !checkRoutePermisson">
<div class="q-gutter-sm" v-if="!edit">
<q-btn
outline

43
src/modules/06_retirement/components/resign/Deceased.vue
View file

@ -6,6 +6,7 @@ import { useCounterMixin } from "@/stores/mixin";
import { useRouter } from "vue-router";
import http from "@/plugins/http";
import config from "@/app.config";
import { checkPermission } from "@/utils/permissions";
/** Use */
const router = useRouter();
@ -224,22 +225,44 @@ const pagination = ref({
>
<template v-slot:header="props">
<q-tr :props="props">
<q-th auto-width></q-th>
<q-th v-for="col in props.cols" :key="col.name" :props="props">
<span class="text-weight-medium">{{ col.label }}</span>
</q-th>
</q-tr>
</template>
<template v-slot:body="props">
<q-tr
:props="props"
class="cursor-pointer"
@click="nextPage(props.row.id)"
>
<q-td
v-for="col in props.cols"
:key="col.id"
@click.stop.prevent="nextPage(props.row.id)"
>
<q-tr :props="props">
<q-td auto-width>
<q-btn
v-if="checkPermission($route)?.attrIsGet"
flat
dense
round
color="info"
icon="mdi-eye"
@click="
router.push(`/retirement/deceased-detail/${props.row.id}`)
"
>
<q-tooltip>รายละเอียด</q-tooltip>
</q-btn>
<q-btn
v-if="
checkPermission($route)?.attrIsGet &&
checkPermission($route)?.attrIsUpdate
"
flat
dense
round
color="edit"
icon="edit"
@click.stop.prevent="nextPage(props.row.id)"
>
<q-tooltip>แก้ไขข้อมูล</q-tooltip>
</q-btn>
</q-td>
<q-td v-for="col in props.cols" :key="col.id">
<div v-if="col.name === 'no'">
{{ props.rowIndex + 1 }}
</div>

3
src/modules/06_retirement/components/resign/DetailDeceased.vue
View file

@ -19,6 +19,7 @@ import { useCounterMixin } from "@/stores/mixin";
const $q = useQuasar();
const router = useRouter();
const route = useRoute();
const checkRoutePermisson = ref<boolean>(route.name == "deceased-detailOnly");
const mixin = useCounterMixin();
const { showLoader, hideLoader, messageError, date2Thai } = mixin;
const fullName = ref<string>("");
@ -190,7 +191,7 @@ const fileDownload = async (type: string) => {
</div>
</div>
<div class="col-12">
<div class="col-12" v-if="!checkRoutePermisson">
<div class="row">
<q-space />
<q-btn

24
src/modules/06_retirement/router.ts
View file

@ -19,10 +19,14 @@ const deceased = () =>
import("@/modules/06_retirement/components/resign/Deceased.vue");
const detaildeceased = () =>
import("@/modules/06_retirement/components/resign/DetailDeceased.vue");
const detaildeceasedOnly = () =>
import("@/modules/06_retirement/components/resign/DetailDeceased.vue");
const dismissOrder = () =>
import("@/modules/06_retirement/components/DismissOrder/DismissOrder.vue");
const outDetail = () =>
import("@/modules/06_retirement/components/DismissOrder/outRegistry.vue");
const outDetailOnly = () =>
import("@/modules/06_retirement/components/DismissOrder/outRegistry.vue");
// const dischargedMain = () =>
// import("@/modules/06_retirement/components/Discharged/dischargedMain.vue");
// const dischargedDetails = () =>
@ -186,6 +190,16 @@ export default [
Role: "STAFF",
},
},
{
path: "/retirement/deceased-detail/:id",
name: "deceased-detailOnly",
component: detaildeceasedOnly,
meta: {
Auth: true,
Key: "SYS_PASSAWAY",
Role: "STAFF",
},
},
{
path: "/retirement/deceased/detail/:id",
name: "deceased-detailByid",
@ -216,6 +230,16 @@ export default [
Role: "STAFF",
},
},
{
path: "/retirement/dismiss-order-detail/:id",
name: "outDetailOnly",
component: outDetailOnly,
meta: {
Auth: true,
Key: "SYS_DISMISS",
Role: "STAFF",
},
},
// {
// path: "/retirement/discharged",
// name: "discharged",

2
src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue
View file

@ -523,7 +523,7 @@ watch([() => props?.snapShot, () => props.roundFilter], () => {
</q-tr>
</template>
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<q-tr :props="props">
<q-td v-for="col in props.cols" :key="col.name" :props="props">
<div class="table_ellipsis">
{{ col.value }}

43
src/modules/13_salary/components/SalaryEmployeeLists/ProcessStep.vue
View file

@ -1,6 +1,7 @@
<script setup lang="ts">
import { ref, onMounted } from "vue";
import { useQuasar } from "quasar";
import { checkPermission } from "@/utils/permissions";
import axios from "axios";
import http from "@/plugins/http";
@ -248,7 +249,10 @@ onMounted(() => {
<div class="row col-12 q-pa-md">
<q-toolbar style="padding: 0px">
<q-file
v-if="store.statusQuota == 'PENDING'"
v-if="
store.statusQuota == 'PENDING' &&
checkPermission($route)?.attrIsUpdate
"
bg-color="white"
clearable
outlined
@ -274,7 +278,10 @@ onMounted(() => {
<div>
<!-- การเจ้าหน้าที่ของหน่วยงานส่งเอกสารให้ ผอ. หน่วยงานตรวจสอบ -->
<q-btn
v-if="store.statusQuota == 'PENDING'"
v-if="
store.statusQuota == 'PENDING' &&
checkPermission($route)?.attrIsUpdate
"
unelevated
color="public"
label="ส่งเอกสารให้ ผอ. ตรวจสอบ"
@ -283,7 +290,10 @@ onMounted(() => {
<!-- ผอ. หน่วยงานทำการยืนยันและส่งให้ สกจ. -->
<q-btn
v-if="store.statusQuota == 'WAITHEAD1'"
v-if="
store.statusQuota == 'WAITHEAD1' &&
checkPermission($route)?.attrIsUpdate
"
unelevated
color="public"
label="ยืนยันและส่งเอกสารให้ สกจ."
@ -292,7 +302,10 @@ onMounted(() => {
<!-- สกจ. ตรวจสอบเอกสารและข้อมูลรายการเงินเดือนที่แต่ละหน่วยงานส่งมา ไม่มีปรับโควต้า -->
<q-btn
v-if="store.statusQuota == 'WAITOWNER1'"
v-if="
store.statusQuota == 'WAITOWNER1' &&
checkPermission($route)?.attrIsUpdate
"
unelevated
color="green"
label="ยืนยันการตรวจสอบ"
@ -301,7 +314,10 @@ onMounted(() => {
<!-- สกจ. ตรวจสอบเอกสารและข้อมูลรายการเงินเดือนที่แต่ละหน่วยงานส่งมา มีปรับโควต้า -->
<q-btn
v-if="store.statusQuota == 'WAITOWNER1'"
v-if="
store.statusQuota == 'WAITOWNER1' &&
checkPermission($route)?.attrIsUpdate
"
class="q-ml-sm"
unelevated
color="warning"
@ -311,7 +327,10 @@ onMounted(() => {
<!-- ผอ.หน่วยงานส่งคำแนะนำให้การเจ้าหน้าที่หน่วยงาน -->
<q-btn
v-if="store.statusQuota == 'WAITHEAD2'"
v-if="
store.statusQuota == 'WAITHEAD2' &&
checkPermission($route)?.attrIsUpdate
"
unelevated
color="public"
label="ส่งคำแนะนำให้การเจ้าหน้าที่หน่วยงาน"
@ -321,13 +340,19 @@ onMounted(() => {
/>
<q-btn
v-if="store.statusQuota == 'WAITOFFICER2'"
v-if="
store.statusQuota == 'WAITOFFICER2' &&
checkPermission($route)?.attrIsUpdate
"
unelevated
color="public"
label="ส่งไปออกคำสั่ง"
/>
<q-btn
v-if="store.statusQuota == 'REPORT'"
v-if="
store.statusQuota == 'REPORT' &&
checkPermission($route)?.attrIsUpdate
"
unelevated
color="public"
disable
@ -348,6 +373,7 @@ onMounted(() => {
<div class="row">
<div>
<q-btn
v-if="checkPermission($route)?.attrIsGet"
dense
flat
round
@ -361,6 +387,7 @@ onMounted(() => {
</div>
<div>
<q-btn
v-if="checkPermission($route)?.attrIsDelete"
dense
flat
round

48
src/modules/13_salary/components/SalaryEmployeeLists/TabMain.vue
View file

@ -1,6 +1,7 @@
<script setup lang="ts">
import { ref, onMounted, reactive, computed } from "vue";
import { useQuasar } from "quasar";
import { checkPermission } from "@/utils/permissions";
import http from "@/plugins/http";
import config from "@/app.config";
import genReportXLSX from "@/plugins/genreportxlsx";
@ -250,6 +251,7 @@ function fetchDataQuota(id: string) {
* @param id กลุ่ม
*/
function fetchDataPeriod(id: string) {
showLoader();
rows.value = [];
let formData = {
page: formFilter.page.toString(),
@ -273,6 +275,11 @@ function fetchDataPeriod(id: string) {
})
.catch((err) => {
messageError($q, err);
})
.finally(() => {
setTimeout(() => {
hideLoader();
}, 1000);
});
}
@ -356,41 +363,13 @@ onMounted(() => {
});
const isRetire = ref<boolean | string>(false);
const updateIsShowRetire = async () => {
isRetire.value = await !isRetire.value;
const updateIsShowRetire = () => {
isRetire.value = !isRetire.value;
fetchDataPeriodNew();
};
</script>
<template>
<!-- Tab กลุ่ม -->
<!-- <q-tabs
v-model="store.tabGroup"
dense
class="text-grey"
active-color="primary"
active-class="bg-teal-1"
indicator-color="primary"
align="left"
>
<div
v-for="(item, index) in itemsTabGroup"
:key="index"
@click="changeTabGroup"
>
<q-tab :name="item.name" :label="item.lable" />
</div>
<q-space />
<q-btn
dense
flat
icon="info"
class="q-mr-sm"
label="หลักเกณฑ์การพิจารณาเลื่อนขั้นเงินข้าราชการ"
@click="() => (modalDialogInfoCriteria = true)"
/>
</q-tabs> -->
<!-- <q-separator /> -->
<q-tab-panels v-model="store.tabGroup" animated class="bg-grey-1">
<q-tab-panel
@ -403,7 +382,9 @@ const updateIsShowRetire = async () => {
<div class="row col-12 q-pa-md" v-if="store.roundMainCode !== 'SPECIAL'">
<div
:class="`row col-12 ${
store.roundMainCode === 'APR' ? `q-col-gutter-md` : `q-gutter-md`
store.roundMainCode === 'APR'
? `q-col-gutter-md`
: `q-col-gutter-md`
} items-start`"
>
<div
@ -435,7 +416,10 @@ const updateIsShowRetire = async () => {
</div>
<div
class="row col justify-end self-center"
v-if="store.roundMainCode !== 'SPECIAL'"
v-if="
store.roundMainCode !== 'SPECIAL' &&
checkPermission($route)?.attrIsGet
"
>
<q-btn-dropdown color="blue-5" label="ดาวน์โหลด">
<q-list>

25
src/modules/13_salary/components/SalaryEmployeeLists/TableTypeOther.vue
View file

@ -1,6 +1,7 @@
<script setup lang="ts">
import { ref, watch, computed } from "vue";
import { useQuasar } from "quasar";
import { checkPermission } from "@/utils/permissions";
import config from "@/app.config";
import http from "@/plugins/http";
@ -300,7 +301,7 @@ watch(
<template>
<q-toolbar class="text-primary" style="padding: 0px">
<q-btn
v-if="!store.isClosedRound"
v-if="!store.isClosedRound && checkPermission($route)?.attrIsCreate"
flat
round
dense
@ -375,21 +376,28 @@ watch(
</q-tr>
</template>
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<q-tr :props="props">
<q-td>
<q-btn
v-if="!store.isClosedRound"
v-if="
!store.isClosedRound &&
(checkPermission($route)?.attrIsUpdate ||
checkPermission($route)?.attrIsDelete)
"
flat
dense
icon="mdi-dots-vertical"
class="q-pa-none q-ml-xs"
color="grey-13"
size="12px"
color="secondary"
icon="mdi-dots-horizontal-circle-outline"
round
>
<q-menu>
<q-list dense style="min-width: 150px">
<q-item
v-for="(item, index) in store.itemMenu.filter((x:any)=>x.type !== 'moveGroup' && x.type !== 'properties')"
v-for="(item, index) in checkPermission($route)?.attrIsUpdate && !checkPermission($route)?.attrIsDelete
? store.itemMenu.filter((x:any)=>x.type !== 'moveGroup' && x.type !== 'properties' && x.type !== 'delete')
: !checkPermission($route)?.attrIsUpdate && checkPermission($route)?.attrIsDelete
? store.itemMenu.filter((x:any)=> x.type === 'delete')
: store.itemMenu.filter((x:any)=>x.type !== 'moveGroup' && x.type !== 'properties' )"
:key="index"
clickable
v-close-popup
@ -500,7 +508,6 @@ watch(
{{ col.value ? col.value : "-" }}
</div>
</q-td>
</q-tr>
</template>
<template v-slot:pagination="scope">

37
src/modules/13_salary/components/SalaryEmployeeLists/TableTypePending.vue
View file

@ -1,6 +1,7 @@
<script setup lang="ts">
import { ref, watch } from "vue";
import { useQuasar } from "quasar";
import { checkPermission } from "@/utils/permissions";
/** importType*/
import type { QTableProps } from "quasar";
@ -45,7 +46,6 @@ const props = defineProps({
/** ข้อมูล Table*/
const columns = ref<QTableProps["columns"]>([
{
name: "no",
align: "left",
@ -175,7 +175,6 @@ const columns = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
]);
const visibleColumns = ref<string[]>([
"no",
@ -317,7 +316,7 @@ function onClickViewInfo(type: string, id: string) {
<template>
<q-toolbar class="text-primary" style="padding: 0px">
<q-btn
v-if="!store.isClosedRound"
v-if="!store.isClosedRound && checkPermission($route)?.attrIsCreate"
flat
round
dense
@ -350,7 +349,9 @@ function onClickViewInfo(type: string, id: string) {
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="columns"
:options="!checkPermission($route)?.attrIsGet
? columns?.filter((col:any) => col.name !== 'posSalary' && col.name !== 'discipline' && col.name !== 'leave' )
: columns"
option-value="name"
options-cover
style="min-width: 150px"
@ -359,7 +360,9 @@ function onClickViewInfo(type: string, id: string) {
</q-toolbar>
<d-table
ref="table"
:columns="columns"
:columns="!checkPermission($route)?.attrIsGet
? columns?.filter((col:any) => col.name !== 'posSalary' && col.name !== 'discipline' && col.name !== 'leave' )
: columns"
:rows="props.rows"
row-key="id"
flat
@ -376,25 +379,31 @@ function onClickViewInfo(type: string, id: string) {
<q-th v-for="col in props.cols" :key="col.name" :props="props">
<span class="text-weight-medium">{{ col.label }}</span>
</q-th>
</q-tr>
</template>
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<q-tr :props="props" >
<q-td>
<q-btn
v-if="!store.isClosedRound"
v-if="
!store.isClosedRound &&
(checkPermission($route)?.attrIsUpdate ||
checkPermission($route)?.attrIsDelete)
"
flat
dense
icon="mdi-dots-vertical"
class="q-pa-none q-ml-xs"
color="grey-13"
size="12px"
color="secondary"
icon="mdi-dots-horizontal-circle-outline"
round
>
<q-menu>
<q-list dense style="min-width: 150px">
<q-item
v-for="(item, index) in store.itemMenu.filter((x:any)=>x.type !== 'moveGroup')"
v-for="(item, index) in checkPermission($route)?.attrIsUpdate &&!checkPermission($route)?.attrIsDelete
? store.itemMenu.filter((x:any)=>x.type !== 'moveGroup' && x.type !== 'delete')
: !checkPermission($route)?.attrIsUpdate && checkPermission($route)?.attrIsDelete
? store.itemMenu.filter((x:any)=> x.type === 'delete')
: store.itemMenu.filter((x:any)=>x.type !== 'moveGroup')"
:key="index"
clickable
v-close-popup
@ -487,6 +496,7 @@ function onClickViewInfo(type: string, id: string) {
"
>
<q-btn
v-if="checkPermission($route)?.attrIsGet"
flat
dense
icon="info"
@ -502,7 +512,6 @@ function onClickViewInfo(type: string, id: string) {
{{ col.value ? col.value : "-" }}
</div>
</q-td>
</q-tr>
</template>
<template v-slot:pagination="scope">

2
src/modules/13_salary/components/SalaryLists/Dashboard.vue
View file

@ -575,7 +575,7 @@ watch([() => props?.snapShot, () => props.roundFilter], () => {
</q-tr>
</template>
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<q-tr :props="props">
<q-td v-for="col in props.cols" :key="col.name" :props="props">
<div class="table_ellipsis">
{{ col.value }}

43
src/modules/13_salary/components/SalaryLists/ProcessStep.vue
View file

@ -1,6 +1,7 @@
<script setup lang="ts">
import { ref, defineProps, onMounted } from "vue";
import { useQuasar } from "quasar";
import { checkPermission } from "@/utils/permissions";
import axios from "axios";
import http from "@/plugins/http";
import config from "@/app.config";
@ -263,7 +264,10 @@ onMounted(() => {
<div class="row col-12 q-pa-md">
<q-toolbar class="q-pa-none">
<q-file
v-if="store.statusQuota == 'PENDING'"
v-if="
store.statusQuota == 'PENDING' &&
checkPermission($route)?.attrIsUpdate
"
bg-color="white"
clearable
outlined
@ -305,7 +309,10 @@ onMounted(() => {
<div>
<!-- การเจ้าหน้าที่ของหน่วยงานส่งเอกสารให้ ผอ. หน่วยงานตรวจสอบ -->
<q-btn
v-if="store.statusQuota == 'PENDING'"
v-if="
store.statusQuota == 'PENDING' &&
checkPermission($route)?.attrIsUpdate
"
unelevated
color="public"
label="ส่งเอกสารให้ ผอ. ตรวจสอบ"
@ -314,7 +321,10 @@ onMounted(() => {
<!-- ผอ. หน่วยงานทำการยืนยันและส่งให้ สกจ. -->
<q-btn
v-if="store.statusQuota == 'WAITHEAD1'"
v-if="
store.statusQuota == 'WAITHEAD1' &&
checkPermission($route)?.attrIsUpdate
"
unelevated
color="public"
label="ยืนยันและส่งเอกสารให้ สกจ."
@ -323,7 +333,10 @@ onMounted(() => {
<!-- สกจ. ตรวจสอบเอกสารและข้อมูลรายการเงินเดือนที่แต่ละหน่วยงานส่งมา ไม่มีปรับโควต้า -->
<q-btn
v-if="store.statusQuota == 'WAITOWNER1'"
v-if="
store.statusQuota == 'WAITOWNER1' &&
checkPermission($route)?.attrIsUpdate
"
unelevated
color="green"
label="ยืนยันการตรวจสอบ"
@ -332,7 +345,10 @@ onMounted(() => {
<!-- สกจ. ตรวจสอบเอกสารและข้อมูลรายการเงินเดือนที่แต่ละหน่วยงานส่งมา มีปรับโควต้า -->
<q-btn
v-if="store.statusQuota == 'WAITOWNER1'"
v-if="
store.statusQuota == 'WAITOWNER1' &&
checkPermission($route)?.attrIsUpdate
"
class="q-ml-sm"
unelevated
color="warning"
@ -342,7 +358,10 @@ onMounted(() => {
<!-- ผอ.หน่วยงานส่งคำแนะนำให้การเจ้าหน้าที่หน่วยงาน -->
<q-btn
v-if="store.statusQuota == 'WAITHEAD2'"
v-if="
store.statusQuota == 'WAITHEAD2' &&
checkPermission($route)?.attrIsUpdate
"
unelevated
color="public"
label="ส่งคำแนะนำให้การเจ้าหน้าที่หน่วยงาน"
@ -352,13 +371,19 @@ onMounted(() => {
/>
<q-btn
v-if="store.statusQuota == 'WAITOFFICER2'"
v-if="
store.statusQuota == 'WAITOFFICER2' &&
checkPermission($route)?.attrIsUpdate
"
unelevated
color="public"
label="ส่งไปออกคำสั่ง"
/>
<q-btn
v-if="store.statusQuota == 'REPORT'"
v-if="
store.statusQuota == 'REPORT' &&
checkPermission($route)?.attrIsUpdate
"
unelevated
color="public"
disable
@ -378,6 +403,7 @@ onMounted(() => {
<div class="row">
<div>
<q-btn
v-if="checkPermission($route)?.attrIsGet"
dense
flat
round
@ -391,6 +417,7 @@ onMounted(() => {
</div>
<div>
<q-btn
v-if="checkPermission($route)?.attrIsDelete"
dense
flat
round

17
src/modules/13_salary/components/SalaryLists/TabMain.vue
View file

@ -1,5 +1,6 @@
<script setup lang="ts">
import { ref, onMounted, reactive, computed } from "vue";
import { checkPermission } from "@/utils/permissions";
import { useQuasar } from "quasar";
import http from "@/plugins/http";
import config from "@/app.config";
@ -251,6 +252,7 @@ function fetchDataQuota(id: string) {
* @param id กลุ่ม
*/
function fetchDataPeriod(id: string) {
showLoader();
rows.value = [];
let formData = {
page: formFilter.page.toString(),
@ -274,6 +276,11 @@ function fetchDataPeriod(id: string) {
})
.catch((err) => {
messageError($q, err);
})
.finally(() => {
setTimeout(() => {
hideLoader();
}, 1000);
});
}
@ -493,7 +500,9 @@ const updateIsShowRetire = async () => {
<div class="row col-12 q-pa-md" v-if="store.roundMainCode !== 'SPECIAL'">
<div
:class="`row col-12 ${
store.roundMainCode === 'APR' ? `q-col-gutter-md` : `q-gutter-md`
store.roundMainCode === 'APR'
? `q-col-gutter-md`
: `q-col-gutter-md`
} items-start`"
>
<div
@ -526,7 +535,10 @@ const updateIsShowRetire = async () => {
<div
class="row col justify-end self-center"
v-if="store.roundMainCode !== 'SPECIAL'"
v-if="
store.roundMainCode !== 'SPECIAL' &&
checkPermission($route)?.attrIsGet
"
>
<q-btn-dropdown color="blue-5" label="ดาวน์โหลด">
<q-list>
@ -547,7 +559,6 @@ const updateIsShowRetire = async () => {
</q-item>
</q-list>
</q-btn-dropdown>
<!-- <q-btn color="blue-5" icon="download" label="ดาวน์โหลด" /> -->
</div>
</div>
</div>

37
src/modules/13_salary/components/SalaryLists/TableTypeOther.vue
View file

@ -1,6 +1,7 @@
<script setup lang="ts">
import { ref, watch, computed } from "vue";
import { useQuasar } from "quasar";
import { checkPermission } from "@/utils/permissions";
import config from "@/app.config";
import http from "@/plugins/http";
@ -176,7 +177,6 @@ const columns = computed(() => {
return baseColumns.value.filter((column) => column.name !== "remark");
}
}
console.log(baseColumns.value);
return baseColumns.value;
});
@ -289,7 +289,7 @@ watch(
<template>
<q-toolbar class="text-primary" style="padding: 0px">
<q-btn
v-if="!store.isClosedRound"
v-if="!store.isClosedRound && checkPermission($route)?.attrIsCreate"
flat
round
dense
@ -364,21 +364,33 @@ watch(
</q-tr>
</template>
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<q-tr :props="props">
<q-td>
<q-btn
v-if="!store.isClosedRound"
v-if="
!store.isClosedRound &&
(checkPermission($route)?.attrIsUpdate ||
checkPermission($route)?.attrIsDelete)
"
flat
dense
icon="mdi-dots-vertical"
class="q-pa-none q-ml-xs"
color="grey-13"
size="12px"
color="secondary"
icon="mdi-dots-horizontal-circle-outline"
round
>
<q-menu>
<q-list dense style="min-width: 150px">
<q-item
v-for="(item, index) in store.roundCode !== 'SPECIAL' ? store.itemMenu.filter((x:any)=>x.type !== 'properties') :store.itemMenu.filter((x:any)=>x.type !== 'moveGroup' && x.type !== 'properties')"
v-for="(item, index) in store.roundCode !== 'SPECIAL' ? checkPermission($route)?.attrIsUpdate &&!checkPermission($route)?.attrIsDelete
? store.itemMenu.filter((x:any)=>x.type !== 'properties' && x.type !== 'delete')
: !checkPermission($route)?.attrIsUpdate && checkPermission($route)?.attrIsDelete
? store.itemMenu.filter((x:any)=>x.type !== 'properties' && x.type === 'delete')
: store.itemMenu.filter((x:any)=>x.type !== 'properties')
: checkPermission($route)?.attrIsUpdate && !checkPermission($route)?.attrIsDelete
? store.itemMenu.filter((x:any)=>x.type !== 'moveGroup' && x.type !== 'properties' && x.type !== 'delete')
: !checkPermission($route)?.attrIsUpdate && checkPermission($route)?.attrIsDelete
? store.itemMenu.filter((x:any)=>x.type !== 'moveGroup' && x.type !== 'properties' && x.type === 'delete')
: store.itemMenu.filter((x:any)=>x.type !== 'moveGroup' && x.type !== 'properties')"
:key="index"
clickable
v-close-popup
@ -401,11 +413,7 @@ watch(
>
<q-item-section>
<div class="row items-center">
<q-icon
:color="item.color"
size="17px"
:name="item.icon"
/>
<q-icon :color="item.color" size="xs" :name="item.icon" />
<div class="q-pl-md">{{ item.label }}</div>
</div>
</q-item-section>
@ -487,7 +495,6 @@ watch(
{{ col.value ? col.value : "-" }}
</div>
</q-td>
</q-tr>
</template>
<template v-slot:pagination="scope">

42
src/modules/13_salary/components/SalaryLists/TableTypePending.vue
View file

@ -1,6 +1,7 @@
<script setup lang="ts">
import { ref, watch } from "vue";
import { useQuasar } from "quasar";
import { checkPermission } from "@/utils/permissions";
/** importType*/
import type { QTableProps } from "quasar";
@ -45,7 +46,6 @@ const props = defineProps({
/** ข้อมูล Table*/
const columns = ref<QTableProps["columns"]>([
{
name: "no",
align: "left",
@ -163,10 +163,8 @@ const columns = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
]);
const visibleColumns = ref<string[]>([
"no",
"fullName",
"posType",
@ -306,7 +304,7 @@ function onClickViewInfo(type: string, id: string) {
<template>
<q-toolbar class="text-primary" style="padding: 0px">
<q-btn
v-if="!store.isClosedRound"
v-if="!store.isClosedRound && checkPermission($route)?.attrIsCreate"
flat
round
dense
@ -339,7 +337,7 @@ function onClickViewInfo(type: string, id: string) {
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="columns"
:options="!checkPermission($route)?.attrIsGet ? columns?.filter((col:any) => col.name !== 'posSalary' && col.name !== 'discipline' && col.name !== 'leave' ) : columns"
option-value="name"
options-cover
style="min-width: 150px"
@ -348,7 +346,7 @@ function onClickViewInfo(type: string, id: string) {
</q-toolbar>
<d-table
ref="table"
:columns="columns"
:columns="!checkPermission($route)?.attrIsGet ? columns?.filter((col:any) => col.name !== 'posSalary' && col.name !== 'discipline' && col.name !== 'leave' ) : columns"
:rows="props.rows"
row-key="id"
flat
@ -368,21 +366,33 @@ function onClickViewInfo(type: string, id: string) {
</q-tr>
</template>
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<q-tr :props="props">
<q-td>
<q-btn
v-if="!store.isClosedRound"
v-if="
!store.isClosedRound &&
(checkPermission($route)?.attrIsUpdate ||
checkPermission($route)?.attrIsDelete)
"
flat
dense
icon="mdi-dots-vertical"
class="q-pa-none q-ml-xs"
color="grey-13"
size="12px"
color="secondary"
icon="mdi-dots-horizontal-circle-outline"
round
>
<q-menu>
<q-list dense style="min-width: 150px">
<q-item
v-for="(item, index) in store.roundCode !== 'SPECIAL'? store.itemMenu :store.itemMenu.filter((x:any)=>x.type !== 'moveGroup')"
v-for="(item, index) in store.roundCode !== 'SPECIAL'? checkPermission($route)?.attrIsUpdate &&!checkPermission($route)?.attrIsDelete
? store.itemMenu.filter((x:any)=>x.type !== 'delete')
:!checkPermission($route)?.attrIsUpdate && checkPermission($route)?.attrIsDelete
? store.itemMenu.filter((x:any)=>x.type === 'delete')
:store.itemMenu
: checkPermission($route)?.attrIsUpdate &&!checkPermission($route)?.attrIsDelete
? store.itemMenu.filter((x:any)=>x.type !== 'moveGroup' && x.type !== 'delete')
: !checkPermission($route)?.attrIsUpdate && checkPermission($route)?.attrIsDelete
? store.itemMenu.filter((x:any)=>x.type !== 'moveGroup' && x.type === 'delete')
: store.itemMenu.filter((x:any)=>x.type !== 'moveGroup')"
:key="index"
clickable
v-close-popup
@ -408,7 +418,7 @@ function onClickViewInfo(type: string, id: string) {
<div class="row items-center">
<q-icon
:color="item.color"
size="17px"
size="xs"
:name="item.icon"
/>
<div class="q-pl-md">{{ item.label }}</div>
@ -472,12 +482,11 @@ function onClickViewInfo(type: string, id: string) {
"
>
<q-btn
v-if="checkPermission($route)?.attrIsGet"
flat
dense
icon="info"
class="q-pa-none q-ml-xs"
color="info"
size="12px"
@click.pervent="onClickViewInfo(col.name, props.row.profileId)"
>
</q-btn>
@ -487,7 +496,6 @@ function onClickViewInfo(type: string, id: string) {
{{ col.value ? col.value : "-" }}
</div>
</q-td>
</q-tr>
</template>
<template v-slot:pagination="scope">

7
src/modules/13_salary/views/salaryEmployeeLists.vue
View file

@ -53,8 +53,8 @@ const nextPage = ref<number>(1);
/**function เรียกข้อมูลรอบการขึ้นค่าจ้าง*/
function getRound() {
isDisable.value = false;
showLoader();
isDisable.value = false;
http
.get(
config.API.salaryPeriodActive(year.value.toString()) +
@ -100,9 +100,6 @@ function getRound() {
})
.catch((e) => {
messageError($q, e);
})
.finally(() => {
hideLoader();
});
}
@ -238,7 +235,7 @@ function fetchSalalyPeriod(rootId: string, periodId: string, snap: string) {
.finally(() => {
setTimeout(() => {
hideLoader();
}, 800);
}, 1500);
});
}
}

7
src/modules/13_salary/views/salaryLists.vue
View file

@ -1,5 +1,5 @@
<script setup lang="ts">
import { onMounted, ref, nextTick } from "vue";
import { onMounted, ref } from "vue";
import { useQuasar } from "quasar";
import config from "@/app.config";
import http from "@/plugins/http";
@ -47,8 +47,6 @@ const isDisable = ref<boolean>(false);
const page = ref<number>(1);
const pageSize = ref<number>(50);
const lastPage = ref<number>(0);
const loading = ref(false);
const nextPage = ref<number>(1);
/**function เรียกข้อมูลรอบการขึ้นเงินเดือน*/
function getRound() {
@ -100,9 +98,6 @@ function getRound() {
})
.catch((e) => {
messageError($q, e);
})
.finally(() => {
hideLoader();
});
}

2
src/modules/14_KPI/views/detailView.vue
View file

@ -320,7 +320,7 @@ function requireEdit() {
if (id.value) {
showLoader();
http
.put(config.API.kpiReqEdit(id.value), {
.put(config.API.kpiReqEditUser(id.value), {
status: "EVALUATOR",
})
.then((res) => {