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

Merge branch 'develop'

Browse source
This commit is contained in:
Warunee Tamkoo 2025-07-21 15:51:36 +07:00
commit 760556e558
10 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/modules/02_transfer/views/AddTransfer.vue
View file

@ -46,7 +46,7 @@ async function createTransfer() {
const formData = new FormData(); const formData = new FormData();
formData.append("Organization", tranferOrg.value); formData.append("Organization", tranferOrg.value);
formData.append("Reason", noteReason.value); formData.append("Reason", noteReason.value);
formData.append("file", files.value); formData.append("file", files.value ? files.value : null);
await http await http
.post(config.API.listtransfer(), formData) .post(config.API.listtransfer(), formData)
.then((res) => { .then((res) => {
@ -161,10 +161,7 @@ onMounted(() => {
class="col-xs-12 col-sm-12 inputgreen" class="col-xs-12 col-sm-12 inputgreen"
outlined outlined
dense dense
lazy-rules
hide-bottom-space
accept=".pdf" accept=".pdf"
:rules="[(val: string) => !!val || 'กรุณาเลือกไฟล์เอกสารเพิ่มเติม']"
label="เอกสารเพิ่มเติม" label="เอกสารเพิ่มเติม"
> >
<template v-slot:prepend> <template v-slot:prepend>
@ -172,7 +169,10 @@ onMounted(() => {
></q-file> ></q-file>
</div> </div>
<div class="col-12 row" v-if="routeName != 'addTransfer'"> <div
class="col-12 row"
v-if="routeName != 'addTransfer' && files && files.length > 0"
>
<q-card bordered flat class="full-width"> <q-card bordered flat class="full-width">
<div <div
class="bg-grey-1 q-pa-sm col-12 row items-center text-primary" class="bg-grey-1 q-pa-sm col-12 row items-center text-primary"
@ -189,12 +189,14 @@ onMounted(() => {
</q-item-section> </q-item-section>
<q-item-section avatar> <q-item-section avatar>
<q-btn <q-btn
color="teal-5" color="blue"
round round
flat flat
icon="mdi-download" icon="mdi-download"
@click="fileOpen(file.pathName)" @click="fileOpen(file.pathName)"
></q-btn> >
<q-tooltip> ดาวน์โหลดไฟล์ </q-tooltip>
</q-btn>
</q-item-section> </q-item-section>
</q-item> </q-item>
</q-list> </q-list>

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

@ -161,7 +161,7 @@ async function onSubmit() {
dateLeave.value !== null ? dateToISO(dateLeave.value) : "" dateLeave.value !== null ? dateToISO(dateLeave.value) : ""
); );
formData.append("Reason", noteReason.value); formData.append("Reason", noteReason.value);
formData.append("file", files.value); formData.append("file", files.value ? files.value : null);
if (noteReason.value == "OTHER") { if (noteReason.value == "OTHER") {
formData.append("remark", remark.value); formData.append("remark", remark.value);
} }
@ -470,10 +470,7 @@ onMounted(async () => {
class="col-xs-12 col-sm-12 inputgreen" class="col-xs-12 col-sm-12 inputgreen"
outlined outlined
dense dense
lazy-rules
hide-bottom-space
accept=".pdf" accept=".pdf"
:rules="[(val: string) => !!val || 'กรุณาเลือกเอกสารเพิ่มเติม']"
label="เอกสารเพิ่มเติม" label="เอกสารเพิ่มเติม"
> >
<template v-slot:prepend> <template v-slot:prepend>
@ -481,7 +478,10 @@ onMounted(async () => {
></q-file> ></q-file>
</div> </div>
<div class="col-12 row" v-if="routeName != 'AddRetire'"> <div
class="col-12 row"
v-if="routeName != 'AddRetire' && files && files.length > 0"
>
<q-card bordered flat class="row col-12 text-dark q-mt-sm"> <q-card bordered flat class="row col-12 text-dark q-mt-sm">
<div <div
class="bg-grey-1 q-pa-sm col-12 row items-center text-primary" class="bg-grey-1 q-pa-sm col-12 row items-center text-primary"

3
src/modules/03_retire/views/result.vue
View file

@ -176,8 +176,7 @@ function saveForm() {
suggestFriendsReason.value == "")) || suggestFriendsReason.value == "")) ||
futureWork.value.length === 0 || futureWork.value.length === 0 ||
(futureWork.value === 1 && (futureWork.value === 1 &&
(futureWorkReason.value == null || futureWorkReason.value == "")) || (futureWorkReason.value == null || futureWorkReason.value == ""))
suggestion.value.length < 1
) { ) {
hasError = true; hasError = true;
} else { } else {

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

@ -335,7 +335,7 @@ watch(
flat flat
icon="mdi-download" icon="mdi-download"
outline outline
color="primary" color="blue"
@click="downLoadFile(file.pathName)" @click="downLoadFile(file.pathName)"
> >
<q-tooltip>ดาวห์โหลดเอกสาร</q-tooltip> <q-tooltip>ดาวห์โหลดเอกสาร</q-tooltip>

2
src/modules/11_probation/component/01_Assign.vue
View file

@ -1065,7 +1065,7 @@ onMounted(async () => {
flat flat
dense dense
icon="mdi-download" icon="mdi-download"
color="primary" color="blue"
> >
<q-tooltip>ดาวน์โหลด</q-tooltip> <q-tooltip>ดาวน์โหลด</q-tooltip>
<q-menu> <q-menu>

2
src/modules/11_probation/component/06_EvaluateResult.vue
View file

@ -269,7 +269,7 @@ onMounted(async () => {
dense dense
round round
icon="mdi-download" icon="mdi-download"
color="primary" color="blue"
> >
<q-tooltip>ดาวน์โหลด</q-tooltip> <q-tooltip>ดาวน์โหลด</q-tooltip>
<q-menu> <q-menu>

2
src/modules/11_probation/component/editPage/01_result.vue
View file

@ -549,7 +549,7 @@ onMounted(async () => {
> >
</q-select> </q-select>
<q-space /> <q-space />
<q-btn flat rounded dense icon="mdi-download" color="primary"> <q-btn flat rounded dense icon="mdi-download" color="blue">
<q-tooltip>ดาวน์โหลด</q-tooltip> <q-tooltip>ดาวน์โหลด</q-tooltip>
<q-menu> <q-menu>
<q-list style="min-width: 150px"> <q-list style="min-width: 150px">

2
src/modules/13_portfolio/views/Add.vue
View file

@ -263,7 +263,7 @@ onMounted(() => {
</q-item-section> </q-item-section>
<q-item-section avatar> <q-item-section avatar>
<q-btn <q-btn
color="teal-5" color="blue"
round round
flat flat
icon="mdi-download" icon="mdi-download"

2
src/modules/14_IDP/views/main.vue
View file

@ -420,7 +420,7 @@ onMounted(async () => {
round round
dense dense
flat flat
color="primary" color="blue"
size="12px" size="12px"
@click.pervent="onDownloadFile(props.row.id)" @click.pervent="onDownloadFile(props.row.id)"
> >

2
src/modules/14_IDP/views/registry.vue
View file

@ -524,7 +524,7 @@ onMounted(() => {
/> />
<q-btn <q-btn
v-else v-else
color="primary" color="blue"
flat flat
dense dense
rounded rounded