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

บรรจุ แต่งตั้ง ===> ปรับ ui

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-11-29 15:58:37 +07:00
parent 38120c26ad
commit cd3ceaae97
18 changed files with 476 additions and 523 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/modules/05_placement/views/01_Main.vue
View file

@ -47,8 +47,8 @@ const addedExamTypeValues: Set<string> = new Set();
/** บัญชีหมดอายุ */
const expiredAccount = ref<boolean>(false);
const examTimeOP2 = ref<any[]>([]);
const examTypeOP2 = ref<any[]>([]);
const examTimeOP2 = ref<DataOption1[]>(examTypeOP.value);
const examTypeOP2 = ref<DataOption1[]>([]);
const paging = ref<boolean>(true);
const pagination = ref({
@ -407,6 +407,8 @@ onMounted(async () => {
:hide-dropdown-icon="false"
@update:model-value="filterYear"
use-input
hide-selected
fill-input
@filter="filterFnYear"
><template v-slot:no-option>
<q-item>
@ -428,13 +430,13 @@ onMounted(async () => {
placeholder="ค้นหา"
>
<template v-slot:append>
<q-icon v-if="filterKeyword == ''" name="search" />
<q-icon
<q-icon name="search" />
<!-- <q-icon
v-if="filterKeyword !== ''"
name="clear"
class="cursor-pointer"
@click="resetFilter"
/>
/> -->
</template>
</q-input>
@ -468,6 +470,8 @@ onMounted(async () => {
option-value="id"
option-label="name"
lazy-rules
hide-selected
fill-input
hide-bottom-space
:readonly="false"
:borderless="false"
@ -475,6 +479,8 @@ onMounted(async () => {
:hide-dropdown-icon="false"
@update:model-value="searchFilterTable"
@filter="filterFnexamTime"
:clearable="examTime !== 'all' && examTime !== 'ทั้งหมด'"
@clear="(examTime = 'ทั้งหมด'), searchFilterTable()"
use-input
input-debounce="0"
><template v-slot:no-option>
@ -505,6 +511,10 @@ onMounted(async () => {
@update:model-value="searchFilterTable"
@filter="filterFnExamtype"
use-input
hide-selected
fill-input
:clearable="examType !== 'all' && examType !== 'ทั้งหมด'"
@clear="(examType = 'all'), searchFilterTable()"
>
<template v-slot:no-option>
<q-item>

18
src/modules/05_placement/views/02_transferMain.vue
View file

@ -215,13 +215,13 @@ onMounted(async () => {
placeholder="ค้นหา"
>
<template v-slot:append>
<q-icon v-if="filterMain == ''" name="search" />
<q-icon
<q-icon name="search" />
<!-- <q-icon
v-if="filterMain !== ''"
name="clear"
class="cursor-pointer"
@click="resetFilter"
/>
/> -->
</template>
</q-input>
@ -236,7 +236,6 @@ onMounted(async () => {
map-options
:options="columns"
option-value="name"
style="min-width: 140px"
class="col-xs-12 col-sm-3 col-md-2 q-ml-sm"
/>
@ -280,8 +279,15 @@ onMounted(async () => {
{{ props.rowIndex + 1 }}
</div>
<div v-else>
{{}}
<div
v-else
:class="
col.name === 'organizationPositionOld' ||
col.name === 'organization'
? 'table_ellipsis2'
: ''
"
>
{{
col.value == null ? "" : col.value == "" ? "-" : col.value
}}

7
src/modules/05_placement/views/03_receiveMain.vue
View file

@ -374,13 +374,13 @@ onMounted(() => {
placeholder="ค้นหา"
>
<template v-slot:append>
<q-icon v-if="filterKeyword == ''" name="search" />
<q-icon
<q-icon name="search" />
<!-- <q-icon
v-if="filterKeyword !== ''"
name="clear"
class="cursor-pointer"
@click="resetFilter"
/>
/> -->
</template>
</q-input>
<q-select
@ -394,7 +394,6 @@ onMounted(() => {
map-options
:options="columns"
option-value="name"
style="min-width: 140px"
class="col-xs-12 col-sm-3 col-md-2 q-ml-sm"
/>

24
src/modules/05_placement/views/04_helpGovernmentMain.vue
View file

@ -302,13 +302,7 @@ onMounted(() => {
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 name="search" />
</template>
</q-input>
@ -323,7 +317,6 @@ onMounted(() => {
map-options
:options="columns"
option-value="name"
style="min-width: 140px"
class="col-xs-12 col-sm-3 col-md-2 q-ml-sm"
/>
@ -361,16 +354,21 @@ onMounted(() => {
</q-btn>
<q-btn
v-if="
props.row.status !== 'REPORT' &&
props.row.status !== 'DONE' &&
checkPermission($route)?.attrIsDelete
v-if="checkPermission($route)?.attrIsDelete"
:disable="
props.row.status === 'REPORT' ||
props.row.status === 'DONE'
"
icon="delete"
flat
round
dense
color="red"
:color="
props.row.status === 'REPORT' ||
props.row.status === 'DONE'
? 'grey-5'
: 'red'
"
@click.stop.prevent="clickDelete(props.row.id)"
>
<q-tooltip>ลบข้อมูล</q-tooltip>

35
src/modules/05_placement/views/05_repatriateMain.vue
View file

@ -9,15 +9,11 @@ import { useTransferDataStore } from "@/modules/05_placement/store";
import http from "@/plugins/http";
import config from "@/app.config";
/**
* importType
*/
/** importType*/
import type { QTableProps } from "quasar";
import type { officerType } from "@/modules/05_placement/interface/response/officer";
/**
* importComponents
*/
/** importComponents*/
import Dialogbody from "@/modules/05_placement/components/Repatriate/DialogOrders.vue"; //popup ส่งไปออกคำสั่งส่งตัวกลับ
const $q = useQuasar();
@ -266,13 +262,7 @@ onMounted(async () => {
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 name="search" />
</template>
</q-input>
<q-select
@ -287,7 +277,6 @@ onMounted(async () => {
map-options
:options="columns"
option-value="name"
style="min-width: 140px"
/>
</div>
@ -324,16 +313,20 @@ onMounted(async () => {
<q-tooltip>รายละเอียด</q-tooltip>
</q-btn>
<q-btn
v-if="
props.row.status !== 'REPORT' &&
props.row.status !== 'DONE' &&
checkPermission($route)?.attrIsDelete
v-if="checkPermission($route)?.attrIsDelete"
:disable="
props.row.status == 'REPORT' || props.row.status == 'DONE'
"
:color="
props.row.status == 'REPORT' || props.row.status == 'DONE'
? 'grey-5'
: 'red'
"
icon="delete"
flat
round
dense
color="red"
@click.stop.prevent="clickDelete(props.row.id)"
>
<q-tooltip>ลบข้อมูล</q-tooltip>
@ -349,11 +342,11 @@ onMounted(async () => {
:class="
col.name === 'organizationPositionOld' ||
col.name === 'organization'
? 'table_ellipsis'
? 'table_ellipsis2'
: ''
"
>
{{ col.value == null ? "" : col.value }}
{{ !col.value ? "-" : col.value }}
</div>
</q-td>
</q-tr>

9
src/modules/05_placement/views/06_appointPromoteMain.vue
View file

@ -315,13 +315,7 @@ onMounted(() => {
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 name="search" />
</template>
</q-input>
@ -336,7 +330,6 @@ onMounted(() => {
map-options
:options="columns"
option-value="name"
style="min-width: 140px"
class="col-xs-12 col-sm-3 col-md-2 q-ml-sm"
/>

8
src/modules/05_placement/views/07_appointEmployeeMain.vue
View file

@ -325,13 +325,7 @@ onMounted(() => {
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 name="search" />
</template>
</q-input>

35
src/modules/05_placement/views/08_otherMain.vue
View file

@ -12,7 +12,6 @@ import config from "@/app.config";
/** importType*/
import type { QTableProps } from "quasar";
import type { listMain } from "@/modules/05_placement/interface/response/OhterMain";
import type { OpType } from "@/modules/05_placement/interface/response/Main";
/** importcomopnents*/
import Dialogbody from "@/modules/05_placement/components/Other/DialogOrders.vue";
@ -160,14 +159,6 @@ async function fecthlistOthet() {
});
}
/**
* รีเซ็ตข้อมูลในช่อง input
*/
function resetFilter() {
filterKeyword.value = "";
filterKeyword2.value = "";
}
/**
* เปิด popup ส่งไปออกคำสั่งอื่นๆ
*/
@ -248,13 +239,7 @@ onMounted(() => {
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 name="search" />
</template>
</q-input>
<q-select
@ -268,7 +253,6 @@ onMounted(() => {
map-options
:options="columns"
option-value="name"
style="min-width: 140px"
class="col-xs-12 col-sm-3 col-md-2 q-ml-sm"
/>
@ -307,15 +291,18 @@ onMounted(() => {
</q-btn>
<q-btn
v-if="
props.row.status !== 'REPORT' &&
props.row.status !== 'DONE' &&
checkPermission($route)?.attrIsDelete
"
v-if="checkPermission($route)?.attrIsDelete"
flat
:disable="
props.row.status == 'REPORT' || props.row.status == 'DONE'
"
round
dense
color="red"
:color="
props.row.status == 'REPORT' || props.row.status == 'DONE'
? 'grey-5'
: 'red'
"
icon="mdi-delete"
@click.stop="clickDelete(props.row.id)"
>
@ -332,7 +319,7 @@ onMounted(() => {
:class="
col.name === 'organizationPositionOld' ||
col.name === 'organization'
? 'table_ellipsis'
? 'table_ellipsis2'
: ''
"
>