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

36
src/modules/18_command/components/Step/Dialog1_AddOperetor.vue
View file

@ -31,19 +31,10 @@ const rows = ref<DataOperators[]>([]);
const visibleColumns = ref<string[]>([
"posNo",
"fullName",
"posExecutiveName",
"actFullName",
"positionSign",
// "actFullName",
]);
const columns = ref<QTableProps["columns"]>([
{
name: "posNo",
align: "left",
label: "เลขที่ตำแหน่ง",
sortable: true,
field: "posNo",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "fullName",
align: "left",
@ -57,11 +48,20 @@ const columns = ref<QTableProps["columns"]>([
style: "font-size: 14px",
},
{
name: "posExecutiveName",
name: "posNo",
align: "left",
label: "ตำแหน่งทางการบริหาร",
label: "เลขที่ตำแหน่ง",
sortable: true,
field: "posExecutiveName",
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",
},
@ -95,7 +95,7 @@ function onSubmit() {
posType: data.posType ?? "",
posLevel: data.posLevel ?? "",
position: data.position ?? "",
positionExecutive: data.posExecutiveName ?? "",
positionExecutive: data.positionSign ?? "",
roleName: roleName.value.trim(),
};
showLoader();
@ -274,7 +274,9 @@ watch(modal, (newVal) => {
:key="col.name"
:props="props"
>
<span class="text-weight-medium">{{ getColumnLabel(col, isAct) }}</span>
<span class="text-weight-medium">{{
getColumnLabel(col, isAct)
}}</span>
</q-th>
</q-tr>
</template>
@ -293,7 +295,7 @@ watch(modal, (newVal) => {
:key="col.name"
:props="props"
>
{{ col.value ?? "-" }}
{{ col.value ? col.value : "-" }}
</q-td>
</q-tr>
</template>

67
src/modules/18_command/components/Step/View0_Digital.vue
View file

@ -59,25 +59,15 @@ const search = ref<string>("");
const rows = ref<DataDirector[]>([]); //รายชื่อผู้บังคับบัญชา/ผู้มีอำนาจออกคำสั่ง
const selected = ref<DataDirector[]>([]); //เลือกผู้บังคับบัญชา/ผู้มีอำนาจออกคำสั่ง
const columns = ref<QTableProps["columns"]>([
{
name: "citizenId",
align: "left",
label: "เลขประจำตัวประชาชน",
sortable: true,
field: "citizenId",
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: "citizenId",
// align: "left",
// label: "เลขประจำตัวประชาชน",
// sortable: true,
// field: "citizenId",
// headerStyle: "font-size: 14px",
// style: "font-size: 14px",
// },
{
name: "firstName",
align: "left",
@ -90,25 +80,42 @@ const columns = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "position",
name: "posNo",
align: "left",
label: "ตำแหน่ง",
label: "เลขที่ตำแหน่ง",
sortable: true,
field: "position",
field: "posNo",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
// {
// name: "position",
// align: "left",
// label: "ตำแหน่ง",
// sortable: true,
// field: "position",
// headerStyle: "font-size: 14px",
// style: "font-size: 14px",
// },
// {
// name: "posType",
// align: "left",
// label: "ประเภทตำแหน่ง",
// sortable: true,
// field: "posType",
// format(val, row) {
// return `${row.posType} ${row.posLevel ? `(${row.posLevel})` : ""} `;
// },
// headerStyle: "font-size: 14px",
// style: "font-size: 14px",
// },
{
name: "posType",
name: "positionSign",
align: "left",
label: "ประเภทตำแหน่ง",
label: "ตำแหน่งใต้ลายเซ็น",
sortable: true,
field: "posType",
format(val, row) {
return `${row.posType} ${row.posLevel ? `(${row.posLevel})` : ""} `;
},
field: "positionSign",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
@ -790,7 +797,7 @@ onMounted(async () => {
:props="props"
>
<div>
{{ col.value ?? "-" }}
{{ col.value ? col.value : "-" }}
</div>
</q-td>
</q-tr>

1
src/modules/18_command/interface/response/Main.ts
View file

@ -119,6 +119,7 @@ interface DataOperators {
profileId: string;
roleName: string;
posExecutiveName?: string;
positionSign?: string;
}
export type {