Merge branch 'develop' into develop-tee
This commit is contained in:
setthawutttty
commit
89cec7bd6d
4 changed files with 476 additions and 260 deletions
|
|
@ -13,7 +13,7 @@ import { useCounterMixin } from "@/stores/mixin";
|
|||
const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
|
||||
const editvisible = ref<boolean>(false);
|
||||
const myForm = ref<QForm | null>(null);
|
||||
const edit = ref<boolean>(false);
|
||||
const edit = ref<boolean>(true);
|
||||
const visibleColumns = ref<String[]>([]);
|
||||
const store = usePlacementDataStore();
|
||||
const filter = ref<string>("");
|
||||
|
|
@ -71,7 +71,11 @@ const getClass = (val: boolean) => {
|
|||
};
|
||||
};
|
||||
const selectData = (props: TableName) => {
|
||||
<<<<<<< HEAD
|
||||
itemtest.value = props;
|
||||
=======
|
||||
itemPopUp.value = props
|
||||
>>>>>>> bdf1f7f0f73085ea1c343b8e21d3a592bc083c33
|
||||
if (editvisible.value == true) {
|
||||
editRow.value = false;
|
||||
modalEdit.value = true;
|
||||
|
|
@ -247,7 +251,11 @@ const rows = ref<TableName[]>([
|
|||
scoreC: 0,
|
||||
scoreSumFull: 500,
|
||||
scoreSum: 282,
|
||||
<<<<<<< HEAD
|
||||
examResult: "ผ่าน",
|
||||
=======
|
||||
examResult: "ผ่าน"
|
||||
>>>>>>> bdf1f7f0f73085ea1c343b8e21d3a592bc083c33
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
@ -281,7 +289,11 @@ const rows = ref<TableName[]>([
|
|||
scoreC: 0,
|
||||
scoreSumFull: 500,
|
||||
scoreSum: 282,
|
||||
<<<<<<< HEAD
|
||||
examResult: "ผ่าน",
|
||||
=======
|
||||
examResult: "ผ่าน"
|
||||
>>>>>>> bdf1f7f0f73085ea1c343b8e21d3a592bc083c33
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
@ -315,7 +327,11 @@ const rows = ref<TableName[]>([
|
|||
scoreC: 0,
|
||||
scoreSumFull: 500,
|
||||
scoreSum: 282,
|
||||
<<<<<<< HEAD
|
||||
examResult: "ผ่าน",
|
||||
=======
|
||||
examResult: "ผ่าน"
|
||||
>>>>>>> bdf1f7f0f73085ea1c343b8e21d3a592bc083c33
|
||||
},
|
||||
},
|
||||
|
||||
|
|
@ -350,7 +366,11 @@ const rows = ref<TableName[]>([
|
|||
scoreC: 0,
|
||||
scoreSumFull: 500,
|
||||
scoreSum: 282,
|
||||
<<<<<<< HEAD
|
||||
examResult: "ผ่าน",
|
||||
=======
|
||||
examResult: "ผ่าน"
|
||||
>>>>>>> bdf1f7f0f73085ea1c343b8e21d3a592bc083c33
|
||||
},
|
||||
},
|
||||
|
||||
|
|
@ -385,7 +405,11 @@ const rows = ref<TableName[]>([
|
|||
scoreC: 0,
|
||||
scoreSumFull: 500,
|
||||
scoreSum: 282,
|
||||
<<<<<<< HEAD
|
||||
examResult: "ผ่าน",
|
||||
=======
|
||||
examResult: "ผ่าน"
|
||||
>>>>>>> bdf1f7f0f73085ea1c343b8e21d3a592bc083c33
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
@ -419,7 +443,11 @@ const rows = ref<TableName[]>([
|
|||
scoreC: 0,
|
||||
scoreSumFull: 500,
|
||||
scoreSum: 282,
|
||||
<<<<<<< HEAD
|
||||
examResult: "ผ่าน",
|
||||
=======
|
||||
examResult: "ผ่าน"
|
||||
>>>>>>> bdf1f7f0f73085ea1c343b8e21d3a592bc083c33
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
@ -453,6 +481,7 @@ const rows = ref<TableName[]>([
|
|||
scoreC: 0,
|
||||
scoreSumFull: 500,
|
||||
scoreSum: 282,
|
||||
<<<<<<< HEAD
|
||||
examResult: "ผ่าน",
|
||||
},
|
||||
},
|
||||
|
|
@ -488,11 +517,14 @@ const rows = ref<TableName[]>([
|
|||
scoreSumFull: 500,
|
||||
scoreSum: 282,
|
||||
examResult: "ผ่าน",
|
||||
=======
|
||||
examResult: "ผ่าน"
|
||||
>>>>>>> bdf1f7f0f73085ea1c343b8e21d3a592bc083c33
|
||||
},
|
||||
},
|
||||
]);
|
||||
|
||||
const itemtest = ref<object>({});
|
||||
const itemPopUp = ref<object>({});
|
||||
|
||||
const clickCancel = async () => {
|
||||
editvisible.value = false;
|
||||
|
|
@ -531,6 +563,7 @@ const save = () => {
|
|||
</script>
|
||||
<template>
|
||||
<q-form ref="myForm">
|
||||
<<<<<<< HEAD
|
||||
<Table
|
||||
:rows="rows"
|
||||
:columns="columns"
|
||||
|
|
@ -576,6 +609,21 @@ const save = () => {
|
|||
color="positive"
|
||||
class="text-h5"
|
||||
/>
|
||||
=======
|
||||
<Table :rows="rows" :columns="columns" :filter="filter" :visible-columns="visibleColumns" v-model:inputfilter="filter"
|
||||
v-model:inputvisible="visibleColumns" v-model:editvisible="editvisible" :cancel="clickCancel" :history="true"
|
||||
:boss="true" :saveNoDraft="true" :add="save">
|
||||
<template #columns="props">
|
||||
<q-tr :props="props">
|
||||
<q-icon class="q-mr-sm" size="15px" color="primary" name="mdi-bookmark" v-if="props.row.isDirector"></q-icon>
|
||||
|
||||
<q-td v-for="col in props.cols" :key="col.name" :props="props" @click="selectData(props.row)"
|
||||
class="cursor-pointer">
|
||||
<div v-if="col.name == 'BMAOfficer'" class="table_ellipsis">
|
||||
<div>
|
||||
<q-icon v-if="col.value == false" name="mdi-close" color="grey-5" class="text-h5" />
|
||||
<q-icon v-else name="mdi-check" color="positive" class="text-h5" />
|
||||
>>>>>>> bdf1f7f0f73085ea1c343b8e21d3a592bc083c33
|
||||
</div>
|
||||
</div>
|
||||
<div v-else-if="col.name == 'Name'" class="table_ellipsis">
|
||||
|
|
@ -583,6 +631,7 @@ const save = () => {
|
|||
<p>{{ props.row.fullName }}</p>
|
||||
</div>
|
||||
<div v-else-if="col.name == 'Unit'" class="table_ellipsis">
|
||||
<<<<<<< HEAD
|
||||
<div v-if="editvisible && props.row.Status == 'ยังไม่บรรจุ'">
|
||||
<div @click="openAppointModal">
|
||||
<q-input
|
||||
|
|
@ -736,6 +785,72 @@ const save = () => {
|
|||
</q-form>
|
||||
|
||||
<DialogCard v-model:Modal="modal" :getdetail="itemtest" :close="clickClose" />
|
||||
=======
|
||||
|
||||
<div v-if="editvisible && props.row.Status == 'ยังไม่บรรจุ'">
|
||||
<div @click="openAppointModal">
|
||||
<q-input hide-bottom-space outlined dense lazy-rules v-model="props.row.Unit">
|
||||
<template v-slot:prepend>
|
||||
<q-icon name="bookmark" color="primary" />
|
||||
</template>
|
||||
</q-input>
|
||||
</div>
|
||||
</div>
|
||||
<div v-else-if="props.row.Status == 'ยังไม่บรรจุ' || props.row.Status == 'สละสิทธิ์'">-</div>
|
||||
<div v-else>
|
||||
{{ props.row.examResult }}
|
||||
<p>{{ col.value }}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div v-else-if="col.name == 'ReportingDate' && col.value != '-'" class="table_ellipsis">
|
||||
<div v-if="editvisible && props.row.Status == 'ยังไม่บรรจุ'">
|
||||
<datepicker :locale="'th'" autoApply :enableTimePicker="false" week-start="0"
|
||||
v-model="props.row.ReportingDate">
|
||||
<template #year="{ year }">
|
||||
{{ year + 543 }}
|
||||
</template>
|
||||
<template #year-overlay-value="{ value }">
|
||||
{{ parseInt(value + 543) }}
|
||||
</template>
|
||||
<template #trigger>
|
||||
<q-input hide-bottom-space outlined dense lazy-rules :model-value="mixin.date2Thai(col.value)">
|
||||
<template v-slot:prepend>
|
||||
<q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)">
|
||||
</q-icon>
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
</datepicker>
|
||||
</div>
|
||||
<div v-else-if="props.row.Status == 'ยังไม่บรรจุ' || props.row.Status == 'สละสิทธิ์'">-</div>
|
||||
<div v-else>
|
||||
{{ mixin.date2Thai(col.value) }}
|
||||
</div>
|
||||
</div>
|
||||
<div v-else class="table_ellipsis">
|
||||
{{ col.value }}
|
||||
</div>
|
||||
</q-td>
|
||||
<q-td auto-width>
|
||||
<div v-if="props.row.Status === 'บรรจุเเล้ว' || props.row.Status === 'สละสิทธิ์'">
|
||||
<div></div>
|
||||
</div>
|
||||
<div v-else-if="props.row.Status === 'ยังไม่บรรจุ'">
|
||||
<q-btn color="blue" flat dense round size="14px" icon="mdi-account-alert"
|
||||
@click="editDetail(props.row, 'wait')" />
|
||||
<q-btn color="red" flat dense round size="14px" icon="mdi-account-remove"
|
||||
@click="editDetail(props.row, 'cancel')" />
|
||||
</div>
|
||||
<div v-else align="right">
|
||||
<q-btn color="red" flat dense round size="14px" icon="mdi-account-remove"
|
||||
@click="editDetail(props.row, 'cancel')" />
|
||||
</div>
|
||||
</q-td>
|
||||
</q-tr>
|
||||
</template>
|
||||
</Table>
|
||||
</q-form>
|
||||
>>>>>>> bdf1f7f0f73085ea1c343b8e21d3a592bc083c33
|
||||
|
||||
<q-dialog v-model="appointModal" persistent>
|
||||
<q-card style="width: 800px">
|
||||
|
|
@ -743,6 +858,7 @@ const save = () => {
|
|||
<DialogHeader title="เลือกหน่วยงานที่รับบรรจุ" :close="clickClose" />
|
||||
<q-separator />
|
||||
<q-card-section>
|
||||
<<<<<<< HEAD
|
||||
<div class="row q-col-gutter-xs">
|
||||
<div class="col">
|
||||
<q-select
|
||||
|
|
@ -778,11 +894,21 @@ const save = () => {
|
|||
v-model="appoint.PositionType"
|
||||
label="ประเภทตำแหน่ง"
|
||||
/>
|
||||
=======
|
||||
|
||||
<div class="row q-col-gutter-xs">
|
||||
<div class="col">
|
||||
<q-select outlined dense v-model="appoint.Code" label="รหัสส่วนราชการ" />
|
||||
</div>
|
||||
<div class="col">
|
||||
<q-select outlined dense v-model="appoint.UnitName" label="ชื่อหน่วยงาน" />
|
||||
>>>>>>> bdf1f7f0f73085ea1c343b8e21d3a592bc083c33
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row q-col-gutter-xs q-pt-xs">
|
||||
<div class="col">
|
||||
<<<<<<< HEAD
|
||||
<q-select
|
||||
outlined
|
||||
dense
|
||||
|
|
@ -797,11 +923,18 @@ const save = () => {
|
|||
v-model="appoint.PositionTypeManage"
|
||||
label="ด้านทางบริหาร"
|
||||
/>
|
||||
=======
|
||||
<q-select outlined dense v-model="appoint.PositionNo" label="ตำแหน่งเลขที่" />
|
||||
</div>
|
||||
<div class="col">
|
||||
<q-select outlined dense v-model="appoint.PositionType" label="ประเภทตำแหน่ง" />
|
||||
>>>>>>> bdf1f7f0f73085ea1c343b8e21d3a592bc083c33
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row q-col-gutter-xs q-pt-xs">
|
||||
<div class="col">
|
||||
<<<<<<< HEAD
|
||||
<q-select
|
||||
outlined
|
||||
dense
|
||||
|
|
@ -816,10 +949,17 @@ const save = () => {
|
|||
v-model="appoint.Major"
|
||||
label="ด้าน/สาขา"
|
||||
/>
|
||||
=======
|
||||
<q-select outlined dense v-model="appoint.PositionManage" label="ตำแหน่งทางการบริหาร" />
|
||||
</div>
|
||||
<div class="col">
|
||||
<q-select outlined dense v-model="appoint.PositionTypeManage" label="ด้านทางบริหาร" />
|
||||
>>>>>>> bdf1f7f0f73085ea1c343b8e21d3a592bc083c33
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row q-col-gutter-xs q-pt-xs">
|
||||
<<<<<<< HEAD
|
||||
<div class="col-6">
|
||||
<q-select
|
||||
outlined
|
||||
|
|
@ -830,6 +970,33 @@ const save = () => {
|
|||
</div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
=======
|
||||
<div class="col">
|
||||
<q-select outlined dense v-model="appoint.PositionLine" label="ตำแหน่งในสายงาน" />
|
||||
</div>
|
||||
<div class="col">
|
||||
<q-select outlined dense v-model="appoint.Major" label="ด้าน/สาขา" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row q-col-gutter-xs q-pt-xs">
|
||||
<div class="col-6">
|
||||
<q-select outlined dense v-model="appoint.PositionLevel" label="ระดับตำแหน่ง" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</q-card-section>
|
||||
|
||||
<q-separator />
|
||||
<DialogFooter v-model:editvisible="edit" v-model:modalEdit="modalEdit" :save="saveAppoint" />
|
||||
</q-form>
|
||||
</q-card>
|
||||
</q-dialog>
|
||||
|
||||
|
||||
<DialogCard v-model:Modal="modal" :getdetail="itemPopUp" :close="clickClose" />
|
||||
|
||||
>>>>>>> bdf1f7f0f73085ea1c343b8e21d3a592bc083c33
|
||||
|
||||
<q-separator />
|
||||
<DialogFooter
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue