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

Merge branch 'develop' into dev-tee

Browse source
This commit is contained in:
setthawutttty 2023-10-11 13:59:50 +07:00
commit 190be98735
2 changed files with 26 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

79
src/modules/06_retirement/components/resign/Resign.vue
View file

@ -154,13 +154,11 @@ const resetFilter = () => {
filterRef.value.focus();
};
const openModalOrder = () => {
const openModalOrder = async () => {
openModal();
const row = filters.value.filter(
const row = await filters.value.filter(
(r: ResponseItems) =>
(r.status == "WAITTING" ||
r.status == "PENDING" ||
r.status == "APPROVE") &&
(r.status == "REJECT" || r.status == "APPROVE") &&
r.organizationPositionOld &&
r.positionTypeOld &&
r.positionLevelOld &&
@ -236,66 +234,28 @@ const pagination = ref({
<div class="row col-12">
<div class="row col-12 q-col-gutter-sm">
<div>
<q-btn
@click="openModalOrder"
size="14px"
flat
round
color="add"
icon="mdi-account-arrow-right"
>
<q-btn @click="openModalOrder" size="14px" flat round color="add" icon="mdi-account-arrow-right">
<q-tooltip>ส่งไปออกคำสั่งลาออก</q-tooltip>
</q-btn>
</div>
<q-space />
<q-input
class="col-xs-12 col-sm-3 col-md-2"
standout
dense
v-model="filterKeyword"
ref="filterRef"
outlined
debounce="300"
placeholder="ค้นหา"
>
<q-input class="col-xs-12 col-sm-3 col-md-2" standout dense v-model="filterKeyword" ref="filterRef" outlined
debounce="300" placeholder="ค้นหา">
<template v-slot:append>
<q-icon v-if="filterKeyword == ''" name="search" />
<q-icon
v-if="filterKeyword !== ''"
name="clear"
class="cursor-pointer"
@click="resetFilter"
/>
<q-icon v-if="filterKeyword !== ''" name="clear" class="cursor-pointer" @click="resetFilter" />
</template>
</q-input>
<q-select
v-model="visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="columns"
option-value="name"
options-cover
style="min-width: 150px"
class="col-xs-12 col-sm-3 col-md-2"
/>
<q-select v-model="visibleColumns" multiple outlined dense options-dense :display-value="$q.lang.table.columns"
emit-value map-options :options="columns" option-value="name" options-cover style="min-width: 150px"
class="col-xs-12 col-sm-3 col-md-2" />
</div>
<div class="col-12 q-pt-sm">
<d-table
:columns="columns"
:rows="rows"
:filter="filterKeyword"
row-key="id"
:visible-columns="visibleColumns"
v-model:pagination="pagination"
>
<d-table :columns="columns" :rows="rows" :filter="filterKeyword" row-key="id" :visible-columns="visibleColumns"
v-model:pagination="pagination">
<template v-slot:header="props">
<q-tr :props="props">
<q-th v-for="col in props.cols" :key="col.name" :props="props">
@ -304,11 +264,7 @@ const pagination = ref({
</q-tr>
</template>
<template v-slot:body="props">
<q-tr
:props="props"
class="cursor-pointer"
@click="router.push(`/retirement/resign/${props.row.id}`)"
>
<q-tr :props="props" class="cursor-pointer" @click="router.push(`/retirement/resign/${props.row.id}`)">
<q-td key="no" :props="props">
{{ props.rowIndex + 1 }}
</q-td>
@ -347,12 +303,7 @@ const pagination = ref({
</div>
</q-card>
<DialogSendToCommand
v-model:modal="modal"
:closeModal="closeModal"
:rows2="rows2"
v-model:filterKeyword2="filterKeyword2"
:fecthlistRecevice="fecthlist"
/>
<DialogSendToCommand v-model:modal="modal" :closeModal="closeModal" :rows2="rows2"
v-model:filterKeyword2="filterKeyword2" :fecthlistRecevice="fecthlist" />
</template>
<style scoped lang="scss"></style>

16
src/modules/10_order/components/step/step04.vue
View file

@ -77,7 +77,8 @@ const getCommandDetail = async () => {
code.value != "c-pm-19" &&
code.value != "c-pm-20" &&
code.value != "c-pm-21" &&
code.value != "c-pm-22"
code.value != "c-pm-22" &&
code.value != "c-pm-23"
) {
fetchReportAttachment("pdf", orderId.value);
}
@ -274,7 +275,8 @@ const saveUpload = () => {
code.value != "c-pm-19" &&
code.value != "c-pm-20" &&
code.value != "c-pm-21" &&
code.value != "c-pm-22"
code.value != "c-pm-22" &&
code.value != "c-pm-23"
) {
await postfileTailer();
}
@ -309,7 +311,8 @@ const saveDetail = () => {
code.value != "c-pm-19" &&
code.value != "c-pm-20" &&
code.value != "c-pm-21" &&
code.value != "c-pm-22"
code.value != "c-pm-22" &&
code.value != "c-pm-23"
) {
// ดึงรายงานในส่วนของแนบท้ายมาใหม่
await fetchReportAttachment("pdf", orderId.value);
@ -408,6 +411,7 @@ const validateFormUpload = () => {
code.value != "c-pm-20" &&
code.value != "c-pm-21" &&
code.value != "c-pm-22" &&
code.value != "c-pm-23" &&
fileOrder.value !== null &&
fileTailer.value !== null
) {
@ -508,7 +512,8 @@ const viewFileUpload = async (url: string) => {
code != 'c-pm-19' &&
code != 'c-pm-20' &&
code != 'c-pm-21' &&
code != 'c-pm-22'
code != 'c-pm-22' &&
code != 'c-pm-23'
"
@click="setTab('second')"
:class="getClass(tab == 'second')"
@ -688,7 +693,8 @@ const viewFileUpload = async (url: string) => {
code != 'c-pm-19' &&
code != 'c-pm-20' &&
code != 'c-pm-21' &&
code != 'c-pm-22'
code != 'c-pm-22' &&
code != 'c-pm-23'
"
>
<label class="text-file">เอกสารแนบท้าย</label>