Merge branch 'nice' into develop
This commit is contained in:
commit
5fe741c35f
1 changed files with 7 additions and 5 deletions
|
|
@ -80,7 +80,7 @@ const baseColumns = ref<QTableProps["columns"]>([
|
|||
align: "left",
|
||||
label: "เลขประจำตัวประชาชน",
|
||||
field: "citizenId",
|
||||
sortable: true,
|
||||
sortable: false,
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
|
|
@ -89,7 +89,7 @@ const baseColumns = ref<QTableProps["columns"]>([
|
|||
align: "left",
|
||||
label: "ชื่อ-นามสกุล",
|
||||
field: "fullName",
|
||||
sortable: true,
|
||||
sortable: false,
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
format(val, row) {
|
||||
|
|
@ -101,7 +101,7 @@ const baseColumns = ref<QTableProps["columns"]>([
|
|||
align: "left",
|
||||
label: "ตำแหน่ง",
|
||||
field: "position",
|
||||
sortable: true,
|
||||
sortable: false,
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
|
|
@ -110,7 +110,7 @@ const baseColumns = ref<QTableProps["columns"]>([
|
|||
align: "left",
|
||||
label: "ประเภทตำแหน่ง",
|
||||
field: "positionType",
|
||||
sortable: true,
|
||||
sortable: false,
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
format(val, row) {
|
||||
|
|
@ -127,7 +127,7 @@ const baseColumns = ref<QTableProps["columns"]>([
|
|||
format(val) {
|
||||
return val ? val.toLocaleString() : "-";
|
||||
},
|
||||
sortable: true,
|
||||
sortable: false,
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
|
|
@ -286,6 +286,8 @@ async function getPersonList() {
|
|||
position.value = data.positionDetail;
|
||||
rows.value = data.commandRecives;
|
||||
rowsMain.value = data.commandRecives;
|
||||
|
||||
onSearchData();
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue