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

fix: commander popup

Browse source
This commit is contained in:
Warunee Tamkoo 2026-02-25 13:30:30 +07:00
parent e7e767e7f9
commit cb7f021834
9 changed files with 231 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

67
src/modules/05_placement/components/probation/FormAppoint/FormAppoint.vue
View file

@ -103,14 +103,14 @@ const visibleColumns = ref<string[]>([
"positionType",
"actFullName",
]);
const visibleColumnsMember = ref<string[]>([
"no",
const visibleColumnsMemberBase = ref<string[]>([
// "no",
"posNo",
"name",
"position",
"posLevel",
"posType",
"actFullName",
"positionSign",
]);
/** หัวตาราง */
const columns = ref<QTableProps["columns"]>([
@ -173,24 +173,33 @@ const columns = ref<QTableProps["columns"]>([
}`;
},
},
{
name: "actFullName",
align: "left",
label: "รักษาการแทน",
sortable: true,
field: "actFullName",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
// {
// name: "actFullName",
// align: "left",
// label: "รักษาการแทน",
// sortable: true,
// field: "actFullName",
// headerStyle: "font-size: 14px",
// style: "font-size: 14px",
// },
]);
const baseColumnsMember = ref<QTableProps["columns"]>([
// {
// name: "no",
// align: "left",
// label: "ลำดับ",
// sortable: false,
// field: "no",
// headerStyle: "font-size: 14px",
// style: "font-size: 14px",
// },
{
name: "no",
name: "name",
align: "left",
label: "ลำดับ",
sortable: false,
field: "no",
label: "ชื่อ-นามสกุล",
sortable: true,
field: "name",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
@ -203,16 +212,6 @@ const baseColumnsMember = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "name",
align: "left",
label: "ชื่อ-นามสกุล",
sortable: true,
field: "name",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "position",
align: "left",
@ -236,6 +235,15 @@ const baseColumnsMember = ref<QTableProps["columns"]>([
}`;
},
},
{
name: "positionSign",
align: "left",
label: "ตำแหน่งใต้ลายเซ็น",
sortable: true,
field: "positionSign",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
]);
const columnsMember = computed(() => {
@ -250,6 +258,13 @@ const columnsMember = computed(() => {
return baseColumnsMember.value;
});
const visibleColumnsMember = computed(() => {
if (isAct.value || isDirector.value) {
return ["name", "posNo", "positionSign"];
}
return ["name", "posNo", "position", "posLevel", "posType"];
});
/** เพิ่ม คณะกรรมการ */
function onAdd() {
modal.value = true;

55
src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue
View file

@ -31,15 +31,15 @@ const pageSize = ref<number>(10);
const maxPaeg = ref<number>(1);
const total = ref<number>(0);
const columns = ref<QTableProps["columns"]>([
{
name: "citizenId",
align: "left",
label: "เลขประจำตัวประชาชน",
sortable: true,
field: "citizenId",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
// {
// name: "citizenId",
// align: "left",
// label: "เลขประจำตัวประชาชน",
// sortable: true,
// field: "citizenId",
// headerStyle: "font-size: 14px",
// style: "font-size: 14px",
// },
{
name: "posNo",
align: "left",
@ -86,6 +86,39 @@ const columns = ref<QTableProps["columns"]>([
},
]);
const columnsAct = ref<QTableProps["columns"]>([
{
name: "fullName",
align: "left",
label: "ชื่อ-นามสกุล",
sortable: true,
field: "fullName",
format(val, row) {
return `${row.prefix}${row.firstName} ${row.lastName}`;
},
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "posNo",
align: "left",
label: "เลขที่ตำแหน่ง",
sortable: true,
field: "posNo",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "positionSign",
align: "left",
label: "ตำแหน่งใต้ลายเซ็น",
sortable: true,
field: "positionSign",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
]);
function onCloseDialog() {
modal.value = false;
isAct.value = false;
@ -197,7 +230,7 @@ watch(modal, (val) => {
<div class="col-12">
<d-table
flat
:columns="columns"
:columns="isAct ? columnsAct : columns"
:rows="rows"
row-key="key"
dense
@ -246,7 +279,7 @@ watch(modal, (val) => {
:props="props"
>
<div>
{{ col.value ?? "-" }}
{{ col.value ? col.value : "-" }}
</div>
</q-td>
</q-tr>