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

updated get tree by system

Browse source
This commit is contained in:
Warunee Tamkoo 2024-08-20 10:39:17 +07:00
parent af56b950b1
commit ffde0fe79c
27 changed files with 128 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/11_discipline/components/1_Complaint/Form.vue
View file

@ -46,7 +46,7 @@ const {
messageError,
hideLoader,
showLoader,
downloadRenameFileByLink
downloadRenameFileByLink,
} = mixin;
const { filterSelector } = complainstStore; // function จาก store complainstStore
@ -141,7 +141,6 @@ function onSubmit() {
});
}
/**
* ลบไฟล์
* @param id id file
@ -283,7 +282,7 @@ async function getActive() {
async function getOc(activeId: string) {
showLoader();
await http
.get(config.API.orgByid(activeId))
.get(config.API.orgByIdSystem(activeId, route.meta.Key as string))
.then(async (res) => {
const data = await res.data.result.map((item: any) => ({
organizationId: item.orgTreeId,
@ -1041,7 +1040,10 @@ function filterOptionFnAgency(val: string, update: Function) {
color="blue"
icon="mdi-download"
@click="
downloadRenameFileByLink(data.pathName, data.fileName)
downloadRenameFileByLink(
data.pathName,
data.fileName
)
"
><q-tooltip>ดาวน์โหลดไฟล์</q-tooltip></q-btn
>

18
src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
View file

@ -49,7 +49,7 @@ const {
success,
messageError,
dialogRemove,
downloadRenameFileByLink
downloadRenameFileByLink,
} = mixin;
const investigateDis = useInvestigateDisStore();
const countNum = ref<number>(1);
@ -465,7 +465,7 @@ async function getActive() {
async function getOc(activeId: string) {
showLoader();
await http
.get(config.API.orgByid(activeId))
.get(config.API.orgByIdSystem(activeId, route.meta.Key as string))
.then(async (res) => {
const data = await res.data.result.map((item: any) => ({
organizationId: item.orgTreeId,
@ -1554,7 +1554,12 @@ onMounted(async () => {
round
color="blue"
icon="mdi-download-outline"
@click="downloadRenameFileByLink(file.pathName, file.fileName)"
@click="
downloadRenameFileByLink(
file.pathName,
file.fileName
)
"
>
<q-tooltip>ดาวน์โหลดไฟล์</q-tooltip>
</q-btn>
@ -1658,7 +1663,12 @@ onMounted(async () => {
round
color="blue"
icon="mdi-download"
@click="downloadRenameFileByLink(file.pathName, file.fileName)"
@click="
downloadRenameFileByLink(
file.pathName,
file.fileName
)
"
>
<q-tooltip>ดาวน์โหลดไฟล์</q-tooltip>
</q-btn>

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

@ -440,7 +440,7 @@ async function getActive() {
async function getOc(activeId: string) {
showLoader();
await http
.get(config.API.orgByid(activeId))
.get(config.API.orgByIdSystem(activeId, route.meta.Key as string))
.then(async (res) => {
organizationOption.value = await res.data.result.map((item: any) => ({
id: item.orgTreeId,
@ -901,7 +901,6 @@ onMounted(async () => {
col.label
}}</span>
</q-th>
</q-tr>
</template>
<template v-slot:body="props">
@ -1006,7 +1005,8 @@ onMounted(async () => {
<template
v-if="
formData.disciplinaryDateInvestigation &&
isReadonly === false &&!checkRoutePermisson
isReadonly === false &&
!checkRoutePermisson
"
v-slot:append
>
@ -1067,7 +1067,8 @@ onMounted(async () => {
<template
v-if="
formData.disciplinaryDateAllegation &&
isReadonly === false &&!checkRoutePermisson
isReadonly === false &&
!checkRoutePermisson
"
v-slot:append
>
@ -1140,7 +1141,7 @@ onMounted(async () => {
<div v-if="extendStatus" class="col-3">
<q-select
:class="inputEdit(isReadonly)"
:readonly="isReadonly||checkRoutePermisson"
:readonly="isReadonly || checkRoutePermisson"
for="#daysExtend"
outlined
dense
@ -1178,7 +1179,8 @@ onMounted(async () => {
<div v-if="!extendStatus" class="col-3">
<datepicker
menu-class-name="modalfix"
:readonly="checkRoutePermisson||
:readonly="
checkRoutePermisson ||
isReadonly ||
formData.disciplinaryExtendHistory.length > 0
"
@ -1201,7 +1203,8 @@ onMounted(async () => {
class="full-width cursor-pointer"
ref="dateRef"
:class="inputEditExtend(isReadonly)"
:readonly="checkRoutePermisson||
:readonly="
checkRoutePermisson ||
isReadonly ||
formData.disciplinaryExtendHistory.length >
0
@ -1229,7 +1232,7 @@ onMounted(async () => {
</template>
<template
v-if="
!checkRoutePermisson &&
!checkRoutePermisson &&
formData.disciplinaryDateStart &&
isReadonly === false &&
formData.disciplinaryExtendHistory
@ -1256,7 +1259,8 @@ onMounted(async () => {
:class="isReadonly ? '' : dateEndInputStyle"
menu-class-name="modalfix"
v-model="formData.disciplinaryDateEnd"
:readonly="checkRoutePermisson||
:readonly="
checkRoutePermisson ||
formData.disciplinaryDateStart === null ||
isReadonly ||
formData.disciplinaryExtendHistory.length > 0
@ -1279,7 +1283,8 @@ onMounted(async () => {
for="#dateEnd"
:class="inputEditExtend(isReadonly)"
ref="dateEndRef"
:readonly="checkRoutePermisson||
:readonly="
checkRoutePermisson ||
formData.disciplinaryDateStart === null ||
isReadonly ||
formData.disciplinaryExtendHistory.length >
@ -1307,7 +1312,8 @@ onMounted(async () => {
</q-icon>
</template>
<template
v-if="!checkRoutePermisson&&
v-if="
!checkRoutePermisson &&
formData.disciplinaryDateEnd &&
isReadonly === false &&
formData.disciplinaryExtendHistory
@ -1360,7 +1366,7 @@ onMounted(async () => {
</div>
<datepicker
:readonly="isReadonly||checkRoutePermisson"
:readonly="isReadonly || checkRoutePermisson"
menu-class-name="modalfix"
for="#dateEvident"
v-model="formData.disciplinaryDateEvident"
@ -1380,7 +1386,7 @@ onMounted(async () => {
</template>
<template #trigger>
<q-input
:readonly="isReadonly||checkRoutePermisson"
:readonly="isReadonly || checkRoutePermisson"
ref="disciplinaryDateEvidentRef"
outlined
dense
@ -1403,7 +1409,9 @@ onMounted(async () => {
</template>
<template
v-if="
formData.disciplinaryDateEvident && isReadonly === false &&!checkRoutePermisson
formData.disciplinaryDateEvident &&
isReadonly === false &&
!checkRoutePermisson
"
v-slot:append
>
@ -1420,7 +1428,7 @@ onMounted(async () => {
</datepicker>
<datepicker
:readonly="isReadonly||checkRoutePermisson"
:readonly="isReadonly || checkRoutePermisson"
menu-class-name="modalfix"
for="#dateResult"
v-model="formData.disciplinaryDateResult"
@ -1441,7 +1449,7 @@ onMounted(async () => {
<template #trigger>
<q-input
:readonly="isReadonly||checkRoutePermisson"
:readonly="isReadonly || checkRoutePermisson"
ref="disciplinaryDateResultRef"
outlined
:class="inputEdit(isReadonly)"
@ -1464,7 +1472,9 @@ onMounted(async () => {
</template>
<template
v-if="
formData.disciplinaryDateResult && isReadonly === false &&!checkRoutePermisson
formData.disciplinaryDateResult &&
isReadonly === false &&
!checkRoutePermisson
"
v-slot:append
>
@ -1491,7 +1501,7 @@ onMounted(async () => {
>
รายชื่อกรรมการเพื่อพิจารณาความผิดทางวินัย
<q-btn
v-if="!isReadonly&&!checkRoutePermisson"
v-if="!isReadonly && !checkRoutePermisson"
flat
round
dense
@ -1522,11 +1532,15 @@ onMounted(async () => {
:titleText="''"
>
<template #columns="props">
<q-tr :props="props" >
<q-tr :props="props">
<q-td class="text-right">
<!-- แก้ไขกรรมการ -->
<q-btn
v-if="!isReadonly && props.row.check === 'props' &&!checkRoutePermisson"
v-if="
!isReadonly &&
props.row.check === 'props' &&
!checkRoutePermisson
"
dense
flat
round
@ -1538,7 +1552,7 @@ onMounted(async () => {
</q-btn>
<q-btn
v-if="!isReadonly&&!checkRoutePermisson"
v-if="!isReadonly && !checkRoutePermisson"
dense
flat
round
@ -1574,7 +1588,7 @@ onMounted(async () => {
<div class="col-xs-12 col-sm-3">
<q-input
:class="inputEdit(isReadonly)"
:readonly="isReadonly||checkRoutePermisson"
:readonly="isReadonly || checkRoutePermisson"
dense
outlined
ref="disciplinaryCaseFaultRef"
@ -1589,7 +1603,7 @@ onMounted(async () => {
<div class="col-xs-12 col-sm-3">
<q-input
:class="inputEdit(isReadonly)"
:readonly="isReadonly||checkRoutePermisson"
:readonly="isReadonly || checkRoutePermisson"
dense
hide-bottom-space
outlined
@ -1604,7 +1618,7 @@ onMounted(async () => {
<div class="col-xs-12 col-sm-3">
<q-select
:class="inputEdit(isReadonly)"
:readonly="isReadonly||checkRoutePermisson"
:readonly="isReadonly || checkRoutePermisson"
dense
outlined
for="#faultLevel"
@ -1647,7 +1661,7 @@ onMounted(async () => {
<div class="col-xs-12 col-sm-3">
<q-input
:class="inputEdit(isReadonly)"
:readonly="isReadonly||checkRoutePermisson"
:readonly="isReadonly || checkRoutePermisson"
dense
for="#refLaw"
hide-bottom-space
@ -1662,7 +1676,7 @@ onMounted(async () => {
<div class="col-xs-12 col-sm-6">
<q-input
:readonly="isReadonly||checkRoutePermisson"
:readonly="isReadonly || checkRoutePermisson"
:class="inputEdit(isReadonly)"
dense
outlined
@ -1678,7 +1692,7 @@ onMounted(async () => {
<div class="col-xs-12 col-sm-6">
<q-input
:readonly="isReadonly||checkRoutePermisson"
:readonly="isReadonly || checkRoutePermisson"
:class="inputEdit(isReadonly)"
dense
outlined
@ -1694,7 +1708,7 @@ onMounted(async () => {
<div class="col-xs-12 col-sm-6">
<q-input
:readonly="isReadonly||checkRoutePermisson"
:readonly="isReadonly || checkRoutePermisson"
:class="inputEdit(isReadonly)"
dense
outlined
@ -1710,7 +1724,7 @@ onMounted(async () => {
<div class="col-xs-12 col-sm-6">
<q-input
:readonly="isReadonly||checkRoutePermisson"
:readonly="isReadonly || checkRoutePermisson"
:class="inputEdit(isReadonly)"
dense
outlined
@ -1745,7 +1759,7 @@ onMounted(async () => {
for="#fault"
outlined
dense
:readonly="isReadonly||checkRoutePermisson"
:readonly="isReadonly || checkRoutePermisson"
ref="disciplinaryStatusResultRef"
v-model="formData.disciplinaryStatusResult"
:options="option"
@ -1773,7 +1787,7 @@ onMounted(async () => {
>
<q-select
:class="inputEdit(isReadonly)"
:readonly="isReadonly||checkRoutePermisson"
:readonly="isReadonly || checkRoutePermisson"
for="#fault"
outlined
dense
@ -1802,7 +1816,7 @@ onMounted(async () => {
<div class="col-12">
<q-input
:class="inputEdit(isReadonly)"
:readonly="isReadonly||checkRoutePermisson"
:readonly="isReadonly || checkRoutePermisson"
class="full-width cursor-pointer"
outlined
ref="disciplinaryResultRef"
@ -1834,7 +1848,7 @@ onMounted(async () => {
:id="id"
type="relevant"
:fetchData="props.fetchData"
:is-readonly="isReadonly||checkRoutePermisson"
:is-readonly="isReadonly || checkRoutePermisson"
:return-count="returnCount"
/>
</div>
@ -1846,7 +1860,7 @@ onMounted(async () => {
:id="id"
type="summaryEvidence"
:fetchData="props.fetchData"
:is-readonly="isReadonly||checkRoutePermisson"
:is-readonly="isReadonly || checkRoutePermisson"
:return-count="returnCount"
/>
</div>
@ -1858,7 +1872,7 @@ onMounted(async () => {
:id="id"
type="recordAccuser"
:fetchData="props.fetchData"
:is-readonly="isReadonly||checkRoutePermisson"
:is-readonly="isReadonly || checkRoutePermisson"
:return-count="returnCount"
/>
</div>
@ -1870,7 +1884,7 @@ onMounted(async () => {
:id="id"
type="witnesses"
:fetchData="props.fetchData"
:is-readonly="isReadonly||checkRoutePermisson"
:is-readonly="isReadonly || checkRoutePermisson"
:return-count="returnCount"
/>
</div>
@ -1882,7 +1896,7 @@ onMounted(async () => {
:id="id"
type="other"
:fetchData="props.fetchData"
:is-readonly="isReadonly||checkRoutePermisson"
:is-readonly="isReadonly || checkRoutePermisson"
:return-count="returnCount"
/>
</div>
@ -1890,7 +1904,10 @@ onMounted(async () => {
</div>
</div>
<div class="col-12"><q-separator /></div>
<div v-if="!isReadonly&&!checkRoutePermisson" class="row col-12 q-pa-sm">
<div
v-if="!isReadonly && !checkRoutePermisson"
class="row col-12 q-pa-sm"
>
<q-space />
<q-btn
for="ButtonOnSubmit"

2
src/modules/11_discipline/components/4_Result/Form.vue
View file

@ -107,7 +107,7 @@ async function getActive() {
async function getOc(activeId: string) {
showLoader();
await http
.get(config.API.orgByid(activeId))
.get(config.API.orgByIdSystem(activeId, route.meta.Key as string))
.then(async (res) => {
organizationOption.value = await res.data.result.map((item: any) => ({
id: item.orgTreeId,