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

Merge branch 'nice' into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-03-26 14:43:26 +07:00
commit 5fe741c35f
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/18_command/components/Step/2_ListPersons.vue
View file

@ -80,7 +80,7 @@ const baseColumns = ref<QTableProps["columns"]>([
align: "left", align: "left",
label: "เลขประจำตัวประชาชน", label: "เลขประจำตัวประชาชน",
field: "citizenId", field: "citizenId",
sortable: true, sortable: false,
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
style: "font-size: 14px", style: "font-size: 14px",
}, },
@ -89,7 +89,7 @@ const baseColumns = ref<QTableProps["columns"]>([
align: "left", align: "left",
label: "ชื่อ-นามสกุล", label: "ชื่อ-นามสกุล",
field: "fullName", field: "fullName",
sortable: true, sortable: false,
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
style: "font-size: 14px", style: "font-size: 14px",
format(val, row) { format(val, row) {
@ -101,7 +101,7 @@ const baseColumns = ref<QTableProps["columns"]>([
align: "left", align: "left",
label: "ตำแหน่ง", label: "ตำแหน่ง",
field: "position", field: "position",
sortable: true, sortable: false,
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
style: "font-size: 14px", style: "font-size: 14px",
}, },
@ -110,7 +110,7 @@ const baseColumns = ref<QTableProps["columns"]>([
align: "left", align: "left",
label: "ประเภทตำแหน่ง", label: "ประเภทตำแหน่ง",
field: "positionType", field: "positionType",
sortable: true, sortable: false,
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
style: "font-size: 14px", style: "font-size: 14px",
format(val, row) { format(val, row) {
@ -127,7 +127,7 @@ const baseColumns = ref<QTableProps["columns"]>([
format(val) { format(val) {
return val ? val.toLocaleString() : "-"; return val ? val.toLocaleString() : "-";
}, },
sortable: true, sortable: false,
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
style: "font-size: 14px", style: "font-size: 14px",
}, },
@ -286,6 +286,8 @@ async function getPersonList() {
position.value = data.positionDetail; position.value = data.positionDetail;
rows.value = data.commandRecives; rows.value = data.commandRecives;
rowsMain.value = data.commandRecives; rowsMain.value = data.commandRecives;
onSearchData();
}) })
.catch((e) => { .catch((e) => {
messageError($q, e); messageError($q, e);