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

- แก้ไขรายการย้าย

Browse source 
- แก้ bug ส่งย้ายไปออกคำสั่ง
This commit is contained in:
Warunee Tamkoo 2023-08-30 19:23:57 +07:00
parent 04e58b1b8b
commit 6c8040e365
4 changed files with 195 additions and 587 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/interface/request/main/main.ts
View file

@ -204,61 +204,61 @@ const menuList = readonly<any[]>([
children: [
{
key: 6.1,
label: "รายชื่อผู้สอบผ่าน" /* รายชื่อผู้สอบผ่าน */,
label: "รายชื่อผู้สอบผ่าน",
path: "placement",
role: "placement",
},
// {
// key: 6.2,
// label: "ออกคำสั่ง" /* ออกคำสั่งบรรจุ */,
// label: "ออกคำสั่ง",
// path: "Orderplacement",
// role: "placement",
// },
{
key: 6.3,
label: "การทดลองงาน" /* การทดลองงาน */,
label: "การทดลองงาน",
path: "probation",
role: "probation",
},
{
key: 6.4,
label: "รายการขอโอน" /* */,
label: "รายการขอโอน",
path: "transfer",
role: "placement",
},
{
key: 6.5,
label: "รายการรับโอน" /* */,
label: "รายการรับโอน",
path: "receive",
role: "placement",
},
{
key: 6.6,
label: "รายการช่วยราชการ" /* */,
label: "รายการช่วยราชการ",
path: "help-government",
role: "placement",
},
{
key: 6.7,
label: "รายการส่งตัวกลับ" /* */,
label: "รายการส่งตัวกลับ",
path: "repatriate",
role: "placement",
},
{
key: 6.8,
label: "รายการแต่งตั้ง-เลื่อน" /* */,
label: "รายการแต่งตั้ง-เลื่อน-ย้าย",
path: "appoint-promote",
role: "placement",
},
// {
// key: 6.9,
// label: "รายการย้าย" /* */,
// label: "รายการย้าย",
// path: "relocation",
// role: "placement",
// },
{
key: 6.1,
label: "รายการอื่นๆ" /* */,
label: "รายการอื่นๆ",
path: "other",
role: "placement",
},

20
src/modules/04_registry/components/Profile.vue
View file

@ -172,15 +172,15 @@
<q-item clickable v-close-popup @click="appointPost">
<q-item-section style="min-width: 0px" avatar class="q-py-sm">
</q-item-section>
<q-item-section>แต่งตั้ง-เลื่อน</q-item-section>
<q-item-section>แต่งตั้ง-เลื่อน-ย้าย</q-item-section>
</q-item>
<q-separator />
<q-item clickable v-close-popup @click="relocationPost">
<!-- <q-item clickable v-close-popup @click="relocationPost">
<q-item-section style="min-width: 0px" avatar class="q-py-sm">
</q-item-section>
<q-item-section>ย้าย</q-item-section>
</q-item>
<q-separator />
<q-separator /> -->
<q-item clickable v-close-popup @click="clickPassaway">
<q-item-section style="min-width: 0px" avatar class="q-py-sm">
</q-item-section>
@ -1042,13 +1042,13 @@ const appointPost = async () => {
});
};
const relocationPost = async () => {
dialogConfirm($q, async () => {
const formData = new FormData();
formData.append("id", profileId.value);
await http.post(config.API.placemenRelocation, formData);
});
};
// const relocationPost = async () => {
// dialogConfirm($q, async () => {
// const formData = new FormData();
// formData.append("id", profileId.value);
// await http.post(config.API.placemenRelocation, formData);
// });
// };
const outPost = async () => {
dialogConfirm($q, async () => {

355
src/modules/05_placement/components/AppointMent/Main.vue
View file

@ -290,59 +290,31 @@ const clickAddlist = () => {
dialogConfirm($q, () => createdAppoint());
};
const createdAppoint = async () => {
if (type.value == "c6de09ef-c1f8-4a39-aa31-c7ed88df01d9") {
let pId: string[] = [];
selected.value.forEach((e: any) => {
pId.push(e.personalId);
let pId: string[] = [];
selected.value.forEach((e: any) => {
pId.push(e.personalId);
});
let data = {
id: pId,
};
// console.log(data);
showLoader();
await http
.put(config.API.apppointmentReport(type.value), data)
.then((res: any) => {
console.log(res);
success($q, "บันทึกสำเร็จ");
})
.catch((e: any) => {
// console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
fecthlistappointment();
selected.value = [];
modal.value = false;
});
let data = {
id: pId,
};
console.log(data);
showLoader();
await http
.post(config.API.relocationMainReport(), data)
.then((res: any) => {
console.log(res);
success($q, "บันทึกสำเร็จ");
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(async () => {
hideLoader();
fecthlistappointment();
selected.value = [];
modal.value = false;
});
} else {
let pId: string[] = [];
selected.value.forEach((e: any) => {
pId.push(e.personalId);
});
let data = {
id: pId,
};
console.log(data);
showLoader();
await http
.put(config.API.apppointmentReport(type.value), data)
.then((res: any) => {
console.log(res);
success($q, "บันทึกสำเร็จ");
})
.catch((e: any) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
fecthlistappointment();
selected.value = [];
modal.value = false;
});
}
};
const closeModalTree = async () => {
@ -389,65 +361,27 @@ const pagination = ref({
<q-tooltip>เพิ่มข้อมูล</q-tooltip>
</q-btn> -->
<q-btn
@click="popup()"
size="14px"
flat
round
color="add"
icon="mdi-account-arrow-right"
>
<q-btn @click="popup()" size="14px" flat round color="add" icon="mdi-account-arrow-right">
<q-tooltip>ส่งไปออกคำสั่งแต่งตั้ง-เลื่อน-ย้าย</q-tooltip>
</q-btn>
<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-ml-sm"
/>
<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-ml-sm" />
</div>
<div class="col-12 q-pt-sm">
<d-table
:columns="columns"
:rows="rows"
:filter="filterKeyword"
row-key="citizenId"
:visible-columns="visibleColumns"
v-model:pagination="pagination"
>
<d-table :columns="columns" :rows="rows" :filter="filterKeyword" row-key="citizenId"
: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">
@ -461,31 +395,16 @@ const pagination = ref({
<q-td key="no" :props="props" @click="nextPage(props.row)">
{{ props.rowIndex + 1 }}
</q-td>
<q-td
key="citizenId"
:props="props"
@click="nextPage(props.row)"
>
<q-td key="citizenId" :props="props" @click="nextPage(props.row)">
{{ props.row.citizenId }}
</q-td>
<q-td
key="fullname"
:props="props"
@click="nextPage(props.row)"
>
<q-td key="fullname" :props="props" @click="nextPage(props.row)">
{{ props.row.fullname }}
</q-td>
<q-td
key="organizationName"
:props="props"
@click="nextPage(props.row)"
>
<div
v-if="
props.row.orgName !== null ||
props.row.positionPath !== null
"
>
<q-td key="organizationName" :props="props" @click="nextPage(props.row)">
<div v-if="props.row.orgName !== null ||
props.row.positionPath !== null
">
<div class="col-4">
<div class="text-weight-medium">
{{
@ -493,20 +412,20 @@ const pagination = ref({
}}
{{
props.row.organizationShortName !== null
? `(${props.row.organizationShortName})`
: ""
? `(${props.row.organizationShortName})`
: ""
}}
</div>
<div class="text-weight-light">
{{
props.row.positionPath !== null
? props.row.positionPath
: "-"
? props.row.positionPath
: "-"
}}
{{
props.row.positionNumber !== null
? `(${props.row.positionNumber})`
: ""
? `(${props.row.positionNumber})`
: ""
}}
</div>
</div>
@ -517,69 +436,29 @@ const pagination = ref({
</div>
</div>
</q-td>
<q-td
key="birthday"
:props="props"
@click="nextPage(props.row)"
>
<q-td key="birthday" :props="props" @click="nextPage(props.row)">
{{ props.row.birthday }}
</q-td>
<q-td
key="createdAt"
:props="props"
@click="nextPage(props.row)"
>
<q-td key="createdAt" :props="props" @click="nextPage(props.row)">
{{ props.row.createdAt }}
</q-td>
<q-td key="status" :props="props" @click="nextPage(props.row)">
{{ props.row.status }}
</q-td>
<q-td auto-width>
<q-btn
v-if="
props.row.status !== 'ส่งรายชื่อไปออกคำสั่ง' &&
props.row.status !== 'ออกคำสั่งแล้ว'
"
icon="mdi-dots-vertical"
size="12px"
color="grey-7"
flat
round
dense
>
<q-menu
transition-show="jump-down"
transition-hide="jump-up"
>
<q-btn v-if="props.row.status !== 'ส่งรายชื่อไปออกคำสั่ง' &&
props.row.status !== 'ออกคำสั่งแล้ว'
" icon="mdi-dots-vertical" size="12px" color="grey-7" flat round dense>
<q-menu transition-show="jump-down" transition-hide="jump-up">
<q-list dense style="min-width: 100px">
<q-item
clickable
v-close-popup
@click="openModalTree(props.row.personalId)"
>
<q-item-section
style="min-width: 0px"
avatar
class="q-py-sm"
>
<q-icon
color="primary"
size="xs"
name="mdi-bookmark-outline"
/>
<q-item clickable v-close-popup @click="openModalTree(props.row.personalId)">
<q-item-section style="min-width: 0px" avatar class="q-py-sm">
<q-icon color="primary" size="xs" name="mdi-bookmark-outline" />
</q-item-section>
<q-item-section>เลือกหน่วยงาน/ตำแหน่ง</q-item-section>
</q-item>
<q-item
clickable
v-close-popup
@click="clickDelete(props.row.personalId)"
>
<q-item-section
style="min-width: 0px"
avatar
class="q-py-sm"
>
<q-item clickable v-close-popup @click="clickDelete(props.row.personalId)">
<q-item-section style="min-width: 0px" avatar class="q-py-sm">
<q-tooltip>ลบข้อมูล</q-tooltip>
<q-icon color="red" size="xs" name="mdi-delete" />
</q-item-section>
@ -599,86 +478,36 @@ const pagination = ref({
<q-dialog v-model="modal">
<q-card style="width: 1200px; max-width: 80vw">
<DialogHeader
title="ส่งไปรายการแต่งตั้ง - เลื่อน - ย้าย"
:close="clickClose"
/>
<DialogHeader title="ส่งไปรายการแต่งตั้ง - เลื่อน - ย้าย" :close="clickClose" />
<q-separator />
<q-card-section class="q-pt-none">
<div class="row justify-between">
<div class="col-5">
<q-toolbar style="padding: 0">
<q-select
outlined
dense
v-model="type"
:options="optionsType"
label="คำสั่งแต่งตั่ง - เลื่อน - ย้าย"
style="width: 400px; max-width: auto"
emit-value
map-options
option-label="name"
option-value="id"
/>
<q-select outlined dense v-model="type" :options="optionsType" label="คำสั่งแต่งตั่ง-เลื่อน-ย้าย"
style="width: 400px; max-width: auto" emit-value map-options option-label="name" option-value="id" />
</q-toolbar>
</div>
<div class="col-5">
<q-toolbar style="padding: 0">
<q-input
borderless
outlined
dense
debounce="300"
v-model="filterKeyword2"
placeholder="ค้นหา"
style="width: 850px; max-width: auto"
>
<q-input borderless outlined dense debounce="300" v-model="filterKeyword2" placeholder="ค้นหา"
style="width: 850px; max-width: auto">
<template v-slot:append>
<q-icon v-if="filterKeyword2 == ''" name="search" />
<q-icon
v-if="filterKeyword2 !== ''"
name="clear"
class="cursor-pointer"
@click="resetFilter"
/>
<q-icon v-if="filterKeyword2 !== ''" name="clear" class="cursor-pointer" @click="resetFilter" />
</template>
</q-input>
<q-select
v-model="visibleColumns2"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="columns2"
option-value="name"
options-cover
style="min-width: 150px"
class="gt-xs q-ml-sm"
/>
<q-select v-model="visibleColumns2" multiple outlined dense options-dense
:display-value="$q.lang.table.columns" emit-value map-options :options="columns2" option-value="name"
options-cover style="min-width: 150px" class="gt-xs q-ml-sm" />
</q-toolbar>
</div>
</div>
<d-table
:columns="columns2"
:rows="rows2"
:filter="filterKeyword2"
row-key="personalId"
flat
:visible-columns="visibleColumns2"
selection="multiple"
v-model:selected="selected"
>
<d-table :columns="columns2" :rows="rows2" :filter="filterKeyword2" row-key="personalId" flat
:visible-columns="visibleColumns2" selection="multiple" v-model:selected="selected">
<template v-slot:header-selection="scope">
<q-checkbox
keep-color
color="primary"
dense
v-model="scope.selected"
/>
<q-checkbox keep-color color="primary" dense v-model="scope.selected" />
</template>
<!-- <template v-slot:body-selection="scope">
<q-checkbox
@ -691,12 +520,7 @@ const pagination = ref({
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<q-td>
<q-checkbox
keep-color
color="primary"
dense
v-model="props.selected"
/>
<q-checkbox keep-color color="primary" dense v-model="props.selected" />
</q-td>
<q-td key="no" :props="props">
{{ props.rowIndex + 1 }}
@ -707,36 +531,29 @@ const pagination = ref({
<q-td key="fullname" :props="props" @click="nextPage(props.row)">
{{ props.row.fullname }}
</q-td>
<q-td
key="organizationName"
:props="props"
@click="nextPage(props.row)"
>
<div
v-if="
props.row.orgName !== null ||
props.row.positionPath !== null
"
>
<q-td key="organizationName" :props="props" @click="nextPage(props.row)">
<div v-if="props.row.orgName !== null ||
props.row.positionPath !== null
">
<div class="col-4">
<div class="text-weight-medium">
{{ props.row.orgName !== null ? props.row.orgName : "-" }}
{{
props.row.organizationShortName !== null
? `(${props.row.organizationShortName})`
: ""
? `(${props.row.organizationShortName})`
: ""
}}
</div>
<div class="text-weight-light">
{{
props.row.positionPath !== null
? props.row.positionPath
: "-"
? props.row.positionPath
: "-"
}}
{{
props.row.positionNumber !== null
? `(${props.row.positionNumber})`
: ""
? `(${props.row.positionNumber})`
: ""
}}
</div>
</div>
@ -756,22 +573,12 @@ const pagination = ref({
</q-card-section>
<q-card-actions align="right" class="bg-white text-teal">
<q-btn
label="ส่งไปออกคำสั่ง"
@click="clickAddlist"
color="public"
:disable="checkSelected"
/>
<q-btn label="ส่งไปออกคำสั่ง" @click="clickAddlist" color="public" :disable="checkSelected" />
</q-card-actions>
</q-card>
</q-dialog>
<DialogOrgTree
v-model:modal="modalTree"
:close="closeModalTree"
:personal="personal"
:personalId="personalId"
/>
<DialogOrgTree v-model:modal="modalTree" :close="closeModalTree" :personal="personal" :personalId="personalId" />
<!-- :personalId="personalId" -->
</template>
<style scoped lang="scss"></style>

387
src/modules/05_placement/components/Receive/receiveMain.vue
View file

@ -39,7 +39,7 @@ const modal = ref<boolean>(false);
const popup = () => {
const row = filters.value.filter(
(r: ResponseRow) =>
r.status == "WAITTING" || r.status == "PENDING" || r.status == "APPROVE"
(r.status == "WAITTING" || r.status == "PENDING" || r.status == "APPROVE") && r.positionNumber != null
);
rows2.value = row;
modal.value = true;
@ -72,8 +72,8 @@ const visibleColumns2 = ref<string[]>([
const filterKeyword = ref<string>("");
const filterKeyword2 = ref<string>("");
const filterRef = ref<any>(null);
const files = ref<any>();
const fileDocDataUpload = ref<File[]>([]);
const files = ref<any>();
const fileDocDataUpload = ref<File[]>([]);
const listRecevice = ref<any[]>([]);
const filters = ref<ResponseRow[]>([]);
const rows = ref<ResponseRow[]>([
@ -318,7 +318,7 @@ const fileUploadDoc = async (files: any) => {
});
};
const addUpload= async () => {
const addUpload = async () => {
// showLoader();
// await http
// .post(config.API.listRoundInsignia())
@ -334,8 +334,8 @@ const addUpload= async () => {
};
const SaveData = async () => {
await addUpload();
await clickCloseUpload();
await addUpload();
await clickCloseUpload();
};
const resetFilter = () => {
@ -440,64 +440,27 @@ const saveOrder = async () => {
<q-tooltip>เพิ่มข้อมูล</q-tooltip>
</q-btn>
<q-btn
@click="popup()"
size="14px"
flat
round
color="add"
icon="mdi-account-arrow-right"
>
<q-btn @click="popup()" size="14px" flat round color="add" icon="mdi-account-arrow-right">
<q-tooltip>ส่งไปออกคำสั่งรับโอน</q-tooltip>
</q-btn>
<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-ml-sm"
/>
<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-ml-sm" />
</div>
<div class="col-12 q-pt-sm">
<d-table
:columns="columns"
:rows="rows"
:filter="filterKeyword"
row-key="fullname"
:visible-columns="visibleColumns"
>
<d-table :columns="columns" :rows="rows" :filter="filterKeyword" row-key="fullname"
:visible-columns="visibleColumns">
<template v-slot:header="props">
<q-tr :props="props">
<q-th v-for="col in props.cols" :key="col.name" :props="props">
@ -511,31 +474,16 @@ const saveOrder = async () => {
<q-td key="no" :props="props" @click="nextPage(props.row)">
{{ props.rowIndex + 1 }}
</q-td>
<q-td
key="citizenId"
:props="props"
@click="nextPage(props.row)"
>
<q-td key="citizenId" :props="props" @click="nextPage(props.row)">
{{ props.row.citizenId }}
</q-td>
<q-td
key="fullname"
:props="props"
@click="nextPage(props.row)"
>
<q-td key="fullname" :props="props" @click="nextPage(props.row)">
{{ props.row.fullname }}
</q-td>
<q-td
key="organizationName"
:props="props"
@click="nextPage(props.row)"
>
<div
v-if="
props.row.orgName !== null ||
props.row.positionPath !== null
"
>
<q-td key="organizationName" :props="props" @click="nextPage(props.row)">
<div v-if="props.row.orgName !== null ||
props.row.positionPath !== null
">
<div class="col-4">
<div class="text-weight-medium">
{{
@ -543,20 +491,20 @@ const saveOrder = async () => {
}}
{{
props.row.organizationShortName !== null
? `(${props.row.organizationShortName})`
: ""
? `(${props.row.organizationShortName})`
: ""
}}
</div>
<div class="text-weight-light">
{{
props.row.positionPath !== null
? props.row.positionPath
: "-"
? props.row.positionPath
: "-"
}}
{{
props.row.positionNumber !== null
? `(${props.row.positionNumber})`
: ""
? `(${props.row.positionNumber})`
: ""
}}
</div>
</div>
@ -567,124 +515,53 @@ const saveOrder = async () => {
</div>
</div>
</q-td>
<q-td
key="birthday"
:props="props"
@click="nextPage(props.row)"
>
<q-td key="birthday" :props="props" @click="nextPage(props.row)">
{{ props.row.birthday }}
</q-td>
<q-td
key="dateText"
:props="props"
@click="nextPage(props.row)"
>
<q-td key="dateText" :props="props" @click="nextPage(props.row)">
{{ props.row.dateText }}
</q-td>
<q-td
key="statusText"
:props="props"
@click="nextPage(props.row)"
>
<q-td key="statusText" :props="props" @click="nextPage(props.row)">
{{ props.row.statusText }}
</q-td>
<q-td auto-width>
<q-btn
icon="mdi-dots-vertical"
size="12px"
color="grey-7"
flat
round
dense
>
<q-menu
transition-show="jump-down"
transition-hide="jump-up"
>
<q-btn icon="mdi-dots-vertical" size="12px" color="grey-7" flat round dense>
<q-menu transition-show="jump-down" transition-hide="jump-up">
<q-list dense style="min-width: 100px">
<q-item
clickable
v-close-popup
@click="openModalTree(props.row.personalId)"
:disable="
props.row.status == 'REPORT' ||
props.row.status == 'DONE'
"
>
<q-item-section
style="min-width: 0px"
avatar
class="q-py-sm"
>
<q-icon
:color="
props.row.status == 'REPORT' ||
<q-item clickable v-close-popup @click="openModalTree(props.row.personalId)" :disable="props.row.status == 'REPORT' ||
props.row.status == 'DONE'
">
<q-item-section style="min-width: 0px" avatar class="q-py-sm">
<q-icon :color="props.row.status == 'REPORT' ||
props.row.status == 'DONE'
? 'grey'
: 'primary'
"
size="xs"
name="mdi-bookmark-outline"
/>
? 'grey'
: 'primary'
" size="xs" name="mdi-bookmark-outline" />
</q-item-section>
<q-item-section
>เลือกหน่วยงานที่รับโอน</q-item-section
>
<q-item-section>เลือกหน่วยงานที่รับโอน</q-item-section>
</q-item>
<q-item
clickable
v-close-popup
@click="openUpload(props.row.personalId)"
:disable="
props.row.status == 'REPORT' ||
props.row.status == 'DONE'
"
>
<q-item-section
style="min-width: 0px"
avatar
class="q-py-sm"
>
<q-icon
:color="
props.row.status == 'REPORT' ||
<q-item clickable v-close-popup @click="openUpload(props.row.personalId)" :disable="props.row.status == 'REPORT' ||
props.row.status == 'DONE'
">
<q-item-section style="min-width: 0px" avatar class="q-py-sm">
<q-icon :color="props.row.status == 'REPORT' ||
props.row.status == 'DONE'
? 'grey'
: 'blue'
"
size="xs"
name="attach_file"
/>
? 'grey'
: 'blue'
" size="xs" name="attach_file" />
</q-item-section>
<q-item-section
>อัพโหลดเอกสาร</q-item-section
>
<q-item-section>อัพโหลดเอกสาร</q-item-section>
</q-item>
<q-item
clickable
v-close-popup
@click="openDelete(props.row.personalId)"
:disable="
props.row.status == 'REPORT' ||
props.row.status == 'DONE'
"
>
<q-item-section
style="min-width: 0px"
avatar
class="q-py-sm"
>
<q-item clickable v-close-popup @click="openDelete(props.row.personalId)" :disable="props.row.status == 'REPORT' ||
props.row.status == 'DONE'
">
<q-item-section style="min-width: 0px" avatar class="q-py-sm">
<q-tooltip>ลบข้อมูล</q-tooltip>
<q-icon
:color="
props.row.status == 'REPORT' ||
<q-icon :color="props.row.status == 'REPORT' ||
props.row.status == 'DONE'
? 'grey'
: 'red'
"
size="xs"
name="mdi-delete"
/>
? 'grey'
: 'red'
" size="xs" name="mdi-delete" />
</q-item-section>
<q-item-section>ลบ</q-item-section>
</q-item>
@ -708,61 +585,24 @@ const saveOrder = async () => {
<div class="row justify-end">
<div class="col-5">
<q-toolbar style="padding: 0">
<q-input
borderless
outlined
dense
debounce="300"
v-model="filterKeyword2"
placeholder="ค้นหา"
style="width: 850px; max-width: auto"
>
<q-input borderless outlined dense debounce="300" v-model="filterKeyword2" placeholder="ค้นหา"
style="width: 850px; max-width: auto">
<template v-slot:append>
<q-icon v-if="filterKeyword2 == ''" name="search" />
<q-icon
v-if="filterKeyword2 !== ''"
name="clear"
class="cursor-pointer"
@click="resetFilter"
/>
<q-icon v-if="filterKeyword2 !== ''" name="clear" class="cursor-pointer" @click="resetFilter" />
</template>
</q-input>
<q-select
v-model="visibleColumns2"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="columns2"
option-value="name"
options-cover
style="min-width: 150px"
class="gt-xs q-ml-sm"
/>
<q-select v-model="visibleColumns2" multiple outlined dense options-dense
:display-value="$q.lang.table.columns" emit-value map-options :options="columns2" option-value="name"
options-cover style="min-width: 150px" class="gt-xs q-ml-sm" />
</q-toolbar>
</div>
</div>
<d-table
:columns="columns2"
:rows="rows2"
:filter="filterKeyword2"
row-key="personalId"
flat
:visible-columns="visibleColumns2"
selection="multiple"
v-model:selected="selected"
>
<d-table :columns="columns2" :rows="rows2" :filter="filterKeyword2" row-key="personalId" flat
:visible-columns="visibleColumns2" selection="multiple" v-model:selected="selected">
<template v-slot:header-selection="scope">
<q-checkbox
keep-color
color="primary"
dense
v-model="scope.selected"
/>
<q-checkbox keep-color color="primary" dense v-model="scope.selected" />
</template>
<!-- <template v-slot:body-selection="scope">
<q-checkbox
@ -775,12 +615,7 @@ const saveOrder = async () => {
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<q-td>
<q-checkbox
keep-color
color="primary"
dense
v-model="props.selected"
/>
<q-checkbox keep-color color="primary" dense v-model="props.selected" />
</q-td>
<q-td key="no" :props="props">
{{ props.rowIndex + 1 }}
@ -791,36 +626,29 @@ const saveOrder = async () => {
<q-td key="fullname" :props="props" @click="nextPage(props.row)">
{{ props.row.fullname }}
</q-td>
<q-td
key="organizationName"
:props="props"
@click="nextPage(props.row)"
>
<div
v-if="
props.row.orgName !== null ||
props.row.positionPath !== null
"
>
<q-td key="organizationName" :props="props" @click="nextPage(props.row)">
<div v-if="props.row.orgName !== null ||
props.row.positionPath !== null
">
<div class="col-4">
<div class="text-weight-medium">
{{ props.row.orgName !== null ? props.row.orgName : "-" }}
{{
props.row.organizationShortName !== null
? `(${props.row.organizationShortName})`
: ""
? `(${props.row.organizationShortName})`
: ""
}}
</div>
<div class="text-weight-light">
{{
props.row.positionPath !== null
? props.row.positionPath
: "-"
? props.row.positionPath
: "-"
}}
{{
props.row.positionNumber !== null
? `(${props.row.positionNumber})`
: ""
? `(${props.row.positionNumber})`
: ""
}}
</div>
</div>
@ -837,11 +665,7 @@ const saveOrder = async () => {
<q-td key="dateText" :props="props" @click="nextPage(props.row)">
{{ props.row.dateText }}
</q-td>
<q-td
key="statusText"
:props="props"
@click="nextPage(props.row)"
>
<q-td key="statusText" :props="props" @click="nextPage(props.row)">
{{ props.row.statusText }}
</q-td>
</q-tr>
@ -850,12 +674,7 @@ const saveOrder = async () => {
</q-card-section>
<q-card-actions align="right" class="bg-white text-teal">
<q-btn
label="ส่งไปออกคำสั่ง"
@click="saveOrder"
:disable="checkSelected"
color="public"
/>
<q-btn label="ส่งไปออกคำสั่ง" @click="saveOrder" :disable="checkSelected" color="public" />
</q-card-actions>
</q-card>
</q-dialog>
@ -867,46 +686,28 @@ const saveOrder = async () => {
<q-separator />
<q-card-section class="q-pt-none">
<div class="col-12 row items-center q-col-gutter-sm">
<div class="col-12">
<q-file
outlined
dense
v-model="files"
@added="fileUploadDoc"
label="อัพโหลดเอกสาร"
lazy-rules
>
<!-- :rules="[
<div class="col-12">
<q-file outlined dense v-model="files" @added="fileUploadDoc" label="อัพโหลดเอกสาร" lazy-rules>
<!-- :rules="[
(val) => val || 'กรุณาเลือกไฟล์หนังสือถึงหน่วยงานที่รับโอน',
]" -->
<template v-slot:prepend>
<q-icon name="attach_file" />
</template>
</q-file>
</div>
<template v-slot:prepend>
<q-icon name="attach_file" />
</template>
</q-file>
</div>
</div>
</q-card-section>
<q-card-actions class="text-primary q-py-sm">
<q-space />
<q-btn
flat
round
color="public"
@click="SaveData"
icon="mdi-content-save-outline"
>
<q-tooltip>บันทึก</q-tooltip>
</q-btn>
</q-card-actions>
<q-space />
<q-btn flat round color="public" @click="SaveData" icon="mdi-content-save-outline">
<q-tooltip>บันทึก</q-tooltip>
</q-btn>
</q-card-actions>
</q-card>
</q-dialog>
<DialogOrgTree
v-model:modal="modalTree"
:close="closeModalTree"
:personal="personal"
:personalId="personalId"
/>
<DialogOrgTree v-model:modal="modalTree" :close="closeModalTree" :personal="personal" :personalId="personalId" />
<!-- :personalId="personalId" -->
</template>
<style scoped lang="scss"></style>