diff --git a/src/components/Dialogs/DialogOrgSelect.vue b/src/components/Dialogs/DialogOrgSelect.vue
index 56ac10518..5f81fb073 100644
--- a/src/components/Dialogs/DialogOrgSelect.vue
+++ b/src/components/Dialogs/DialogOrgSelect.vue
@@ -41,6 +41,7 @@ const {
date2Thai,
dialogMessageNotify,
onSearchDataTable,
+ convertDateToAPI,
} = mixin;
/** props*/
@@ -508,7 +509,7 @@ function onSubmit() {
posLevelId: selectedPos.value[0].posLevelId, //ชื่อตำแหน่ง
posLevelName: selectedPos.value[0].posLevelName, //ชื่อตำแหน่ง
posExecutiveName: selectedPos.value[0].posExecutiveName, //ชื่อตำแหน่ง
- reportingDate: datePos.value,
+ reportingDate: convertDateToAPI(datePos.value),
posmasterId: dataPosMaster.id,
typeCommand: type.value,
positionExecutiveField: selectedPos.value[0].positionExecutiveField, //ด้านทางการบริหาร
@@ -787,6 +788,7 @@ onMounted(async () => {
>
+
{
borderless
:enableTimePicker="false"
week-start="0"
- :min-date="datePos"
>
{{ year + 543 }}
diff --git a/src/components/Dialogs/DialogOrgSelectEmployee.vue b/src/components/Dialogs/DialogOrgSelectEmployee.vue
index fde333830..e22af075a 100644
--- a/src/components/Dialogs/DialogOrgSelectEmployee.vue
+++ b/src/components/Dialogs/DialogOrgSelectEmployee.vue
@@ -41,6 +41,7 @@ const {
date2Thai,
dialogMessageNotify,
onSearchDataTable,
+ convertDateToAPI,
} = mixin;
const route = useRoute();
@@ -480,7 +481,7 @@ function onSubmit() {
posTypeName: selectedPos.value[0].posTypeName, //ชื่อตำแหน่ง
posLevelId: selectedPos.value[0].posLevelId, //ชื่อตำแหน่ง
posLevelName: selectedPos.value[0].posLevelName, //ชื่อตำแหน่ง
- reportingDate: datePos.value,
+ reportingDate: convertDateToAPI(datePos.value),
posmasterId: dataPosMaster.id,
typeCommand: type.value,
};
@@ -755,6 +756,7 @@ onMounted(() => {
>
+
{
borderless
:enableTimePicker="false"
week-start="0"
- :min-date="datePos"
>
{{ year + 543 }}
diff --git a/src/modules/03_recruiting/components/Table.vue b/src/modules/03_recruiting/components/Table.vue
index 7c7f200c8..b5f2877f6 100644
--- a/src/modules/03_recruiting/components/Table.vue
+++ b/src/modules/03_recruiting/components/Table.vue
@@ -1,13 +1,20 @@
+
-
สอบไม่ผ่าน
@@ -184,6 +198,24 @@ watch(
+
([]);
const rowsData = ref([]);
const importId = ref(route.params.id as string); // Period Import Id
const filter = ref(""); //search data table
+const examResult = ref(""); // สถานะการสอบ
const visibleColumns = ref([
"examID",
"profileID",
@@ -60,7 +61,7 @@ const visibleColumns = ref([
"examAttribute",
"examScore",
"examResult",
- "exam_order",
+ "number",
"applyDate",
]);
const columns = ref([
@@ -68,21 +69,16 @@ const columns = ref([
name: "examID",
align: "left",
label: "เลขประจำตัวสอบ",
- sortable: true,
+ sortable: false,
field: "examID",
headerStyle: "font-size: 14px; min-width: 20px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, {
- numeric: true,
- sensitivity: "base",
- }),
},
{
name: "profileID",
align: "left",
label: "เลขประจำตัวประชาชน",
- sortable: true,
+ sortable: false,
field: "profileID",
headerStyle: "font-size: 14px; min-width: 20px",
style: "font-size: 14px; ",
@@ -91,7 +87,7 @@ const columns = ref([
name: "fullName",
align: "left",
label: "ชื่อ-นามสกุล",
- sortable: true,
+ sortable: false,
field: "personName",
headerStyle: "font-size: 14px; min-width: 250px",
style: "font-size: 14px; ",
@@ -100,7 +96,7 @@ const columns = ref([
name: "hddPosition",
align: "left",
label: "บัญชีสอบ",
- sortable: true,
+ sortable: false,
field: "hddPosition",
headerStyle: "font-size: 14px; min-width: 250px",
style: "font-size: 14px; ",
@@ -109,161 +105,106 @@ const columns = ref([
name: "dateOfBirth",
align: "left",
label: "วัน เดือน ปีเกิด",
- sortable: true,
+ sortable: false,
field: "dateOfBirth",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, {
- numeric: true,
- sensitivity: "base",
- }),
},
{
name: "gender",
align: "left",
label: "เพศ",
- sortable: true,
+ sortable: false,
field: "gender",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, {
- numeric: true,
- sensitivity: "base",
- }),
},
{
name: "position_name",
align: "left",
label: "ตำแหน่งที่สมัคร",
- sortable: true,
+ sortable: false,
field: "position_name",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, {
- numeric: true,
- sensitivity: "base",
- }),
},
{
name: "position_type",
align: "left",
label: "ประเภทที่สมัคร",
- sortable: true,
+ sortable: false,
field: "position_type",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, {
- numeric: true,
- sensitivity: "base",
- }),
},
{
name: "position_level",
align: "left",
label: "ระดับที่สมัคร",
- sortable: true,
+ sortable: false,
field: "position_level",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, {
- numeric: true,
- sensitivity: "base",
- }),
},
{
name: "university",
align: "left",
label: "สถานศึกษา",
- sortable: true,
+ sortable: false,
field: "university",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, {
- numeric: true,
- sensitivity: "base",
- }),
},
{
name: "degree",
align: "left",
label: "วุฒิการศึกษา",
- sortable: true,
+ sortable: false,
field: "degree",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, {
- numeric: true,
- sensitivity: "base",
- }),
},
{
name: "major",
align: "left",
label: "สาขาวิชาเอก",
- sortable: true,
+ sortable: false,
field: "major",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, {
- numeric: true,
- sensitivity: "base",
- }),
},
{
name: "certificateNo",
align: "left",
label: "เลขที่ใบประกอบวิชาชีพ",
- sortable: true,
+ sortable: false,
field: "certificateNo",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, {
- numeric: true,
- sensitivity: "base",
- }),
},
{
name: "certificateIssueDate",
align: "left",
label: "วันที่ได้รับใบประกอบวิชาชีพฯ",
- sortable: true,
+ sortable: false,
field: "certificateIssueDate",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, {
- numeric: true,
- sensitivity: "base",
- }),
},
{
name: "examAttribute",
align: "left",
label: "สถานะการคัดกรองคุณสมบัติ",
- sortable: true,
+ sortable: false,
field: "examAttribute",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, {
- numeric: true,
- sensitivity: "base",
- }),
},
{
name: "examScore",
align: "left",
label: "คะแนนรวม",
- sortable: true,
+ sortable: false,
field: "examScore",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
@@ -276,18 +217,13 @@ const columns = ref([
field: "examResult",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, {
- numeric: true,
- sensitivity: "base",
- }),
},
{
- name: "exam_order",
+ name: "number",
align: "center",
label: "ลำดับที่สอบได้",
- sortable: true,
- field: "exam_order",
+ sortable: false,
+ field: "number",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
@@ -295,15 +231,10 @@ const columns = ref([
name: "applyDate",
align: "left",
label: "วันที่สมัครสอบ",
- sortable: true,
+ sortable: false,
field: "applyDate",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, {
- numeric: true,
- sensitivity: "base",
- }),
},
]);
const modalCandidates = ref(false); // dialog บรรจุผู้ผ่านการสอบแข่งขัน
@@ -369,7 +300,7 @@ async function fetchData() {
.post(config.API.getExamResultById(importId.value), {
examAttribute: "",
keyword: filter.value,
- examResult: "",
+ examResult: examResult.value ? examResult.value : "",
page: initialPagination.value.page,
pageSize: initialPagination.value.rowsPerPage,
})
@@ -393,17 +324,17 @@ async function fetchData() {
}
const data = res.data.result.data;
+ let result: RecruitDetailResponse[] = [];
if (data.length > 0) {
- let result: RecruitDetailResponse[] = [];
if (data.length > 0) {
data.map((r: RecruitDetailResponse) => {
r.personName = `${r.prefix}${r.fullName}`;
result.push(r);
});
}
- rows.value = result;
- rowsData.value = result;
}
+ rows.value = result;
+ rowsData.value = result;
})
.catch((e) => {
messageError($q, e);
@@ -444,7 +375,7 @@ function onSubmitCandidates(date: Date) {
.then(() => {
success($q, "นำผู้ผ่านสอบแข่งขันเข้าสู่ระบบบรรจุ");
modalCandidates.value = false;
- router.go(-1);
+ // router.go(-1);
})
.catch((e) => {
messageError($q, e);
@@ -535,6 +466,7 @@ onMounted(async () => {
v-model:totalList="totalList"
v-model:total="total"
v-model:pagination="initialPagination"
+ v-model:exam-result="examResult"
:nornmalData="false"
:conclude="true"
:fetchData="fetchData"
@@ -582,8 +514,8 @@ onMounted(async () => {
-
- {{ col.value ? col.value : " " }}
+
+ {{ col.value ? col.value : "" }}
{{ col.value ? col.value : "-" }}
diff --git a/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue b/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue
index 04ea13ceb..f0df46aef 100644
--- a/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue
+++ b/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue
@@ -43,6 +43,7 @@ const totalList = ref
(0);
const importId = ref(route.params.id as string); // Period Import Id
const filter = ref(""); //search data table
+const examResult = ref(""); // กรองผลการสอบ
const visibleColumns = ref([
"examID",
"profileID",
@@ -59,7 +60,7 @@ const visibleColumns = ref([
"examAttribute",
"examScore",
"examResult",
- "exam_order",
+ "number",
"applyDate",
]);
const columns = ref([
@@ -67,18 +68,16 @@ const columns = ref([
name: "examID",
align: "left",
label: "เลขประจำตัวสอบ",
- sortable: true,
+ sortable: false,
field: "examID",
headerStyle: "font-size: 14px; min-width: 20px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
name: "profileID",
align: "left",
label: "เลขประจำตัวประชาชน",
- sortable: true,
+ sortable: false,
field: "profileID",
headerStyle: "font-size: 14px; min-width: 20px",
style: "font-size: 14px; ",
@@ -87,7 +86,7 @@ const columns = ref([
name: "fullName",
align: "left",
label: "ชื่อ-นามสกุล",
- sortable: true,
+ sortable: false,
field: "personName",
headerStyle: "font-size: 14px; min-width: 250px",
style: "font-size: 14px; ",
@@ -96,7 +95,7 @@ const columns = ref([
name: "hddPosition",
align: "left",
label: "บัญชีสอบ",
- sortable: true,
+ sortable: false,
field: "hddPosition",
headerStyle: "font-size: 14px; min-width: 250px",
style: "font-size: 14px; ",
@@ -105,106 +104,88 @@ const columns = ref([
name: "dateOfBirth",
align: "left",
label: "วัน เดือน ปีเกิด",
- sortable: true,
+ sortable: false,
field: "dateOfBirth",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
name: "gender",
align: "left",
label: "เพศ",
- sortable: true,
+ sortable: false,
field: "gender",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
name: "position_name",
align: "left",
label: "ตำแหน่งที่สมัคร",
- sortable: true,
+ sortable: false,
field: "position_name",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
name: "university",
align: "left",
label: "สถานศึกษา",
- sortable: true,
+ sortable: false,
field: "university",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
name: "degree",
align: "left",
label: "วุฒิการศึกษา",
- sortable: true,
+ sortable: false,
field: "degree",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
name: "major",
align: "left",
label: "สาขาวิชาเอก",
- sortable: true,
+ sortable: false,
field: "major",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
name: "certificateNo",
align: "left",
label: "เลขที่ใบประกอบวิชาชีพ",
- sortable: true,
+ sortable: false,
field: "certificateNo",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
name: "certificateIssueDate",
align: "left",
label: "วันที่ได้รับใบประกอบวิชาชีพฯ",
- sortable: true,
+ sortable: false,
field: "certificateIssueDate",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
name: "examAttribute",
align: "left",
label: "สถานะการคัดกรองคุณสมบัติ",
- sortable: true,
+ sortable: false,
field: "examAttribute",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
name: "examScore",
align: "left",
label: "คะแนนรวม",
- sortable: true,
+ sortable: false,
field: "examScore",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
@@ -213,19 +194,17 @@ const columns = ref([
name: "examResult",
align: "left",
label: "ผลการสอบ",
- sortable: true,
+ sortable: false,
field: "examResult",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
- name: "exam_order",
+ name: "number",
align: "center",
label: "ลำดับที่สอบได้",
- sortable: true,
- field: "exam_order",
+ sortable: false,
+ field: "number",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
@@ -233,12 +212,10 @@ const columns = ref([
name: "applyDate",
align: "left",
label: "วันที่สมัครสอบ",
- sortable: true,
+ sortable: false,
field: "applyDate",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
- sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
]);
const rows = ref([]);
@@ -310,7 +287,7 @@ async function fetchData() {
.post(config.API.getDisableExamResultById(importId.value), {
examAttribute: "",
keyword: filter.value,
- examResult: "",
+ examResult: examResult.value ? examResult.value : "",
page: initialPagination.value.page,
pageSize: initialPagination.value.rowsPerPage,
})
@@ -369,7 +346,7 @@ async function onSubmitCandidates(date: Date) {
.then(() => {
success($q, "นำผู้ผ่านคัดเลือกคนพิการเข้าสู่ระบบบรรจุ");
modalCandidates.value = false;
- router.go(-1);
+ // router.go(-1);
})
.catch((e) => {
messageError($q, e);
@@ -469,6 +446,7 @@ onMounted(async () => {
v-model:inputfilter="filter"
v-model:total="total"
v-model:inputvisible="visibleColumns"
+ v-model:exam-result="examResult"
:nornmalData="false"
:conclude="true"
:fetchData="fetchData"
@@ -516,8 +494,8 @@ onMounted(async () => {
-
- {{ col.value ? col.value : " " }}
+
+ {{ col.value ? col.value : "" }}
{{ col.value ? col.value : "-" }}
diff --git a/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue b/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue
index b1fda246c..e96d954e3 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue
@@ -147,7 +147,8 @@ const baseColumns = ref
([
sortable: true,
field: "place",
headerStyle: "font-size: 14px",
- style: "font-size: 14px",
+ style: "font-size: 14px; width: 250px;",
+ classes: "text-html",
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
@@ -169,7 +170,7 @@ const baseColumns = ref([
sortable: true,
field: "department",
headerStyle: "font-size: 14px",
- style: "font-size: 14px",
+ style: "font-size: 14px; ",
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
@@ -550,7 +551,7 @@ onMounted(() => {
-
+
{{ col.value ? col.value : "-" }}
diff --git a/src/modules/05_placement/components/PersonalList/CardPosition.vue b/src/modules/05_placement/components/PersonalList/CardPosition.vue
index f26733d93..4c9b0a277 100644
--- a/src/modules/05_placement/components/PersonalList/CardPosition.vue
+++ b/src/modules/05_placement/components/PersonalList/CardPosition.vue
@@ -481,6 +481,7 @@ onMounted(async () => {
>
+
{
borderless
:enableTimePicker="false"
week-start="0"
- :min-date="date"
>
{{ year + 543 }}