ทดลองปฏิบัติหน้าที่ราชการ => fix bug

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-06-11 13:35:46 +07:00
parent dafe59cf27
commit 65647f79f0

View file

@ -110,7 +110,8 @@ const columns = ref<QTableProps["columns"]>([
sortable: true, sortable: true,
field: "organization", field: "organization",
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
style: "font-size: 14px", style: "font-size: 14px ",
classes: "table_ellipsis",
}, },
{ {
name: "probation_no", name: "probation_no",
@ -179,7 +180,10 @@ const columns2 = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
style: "font-size: 14px", style: "font-size: 14px",
format(val, row) { format(val, row) {
return row.posTypeName + " (" + row.posLevelName + ")"; return (
(row.posTypeName ? row.posTypeName : "") +
(row.posLevelName !== null ? " (" + row.posLevelName + ")" : "")
);
}, },
}, },
{ {
@ -250,7 +254,7 @@ async function getpersonalList() {
position_line_id: item.position_line_id, position_line_id: item.position_line_id,
position_level: item.position_level, position_level: item.position_level,
position_level_id: item.position_level_id, position_level_id: item.position_level_id,
organization: item.organization, organization: item.organization !== "" ? item.organization : "-",
probation_no: item.probation_no, probation_no: item.probation_no,
order_number: item.order_number != "xx/2566" ? item.order_number : "-", order_number: item.order_number != "xx/2566" ? item.order_number : "-",
probation_status: statusProbationMain(Number(item.probation_status)), probation_status: statusProbationMain(Number(item.probation_status)),
@ -382,9 +386,7 @@ function clickAdd(data: any) {
$q, $q,
async () => { async () => {
showLoader(); showLoader();
// const postData = {
// personal_id: id,
// };
await http await http
.post(config.API.personalAdd(), data) .post(config.API.personalAdd(), data)
.then(() => { .then(() => {
@ -582,7 +584,7 @@ onMounted(async () => {
{{ props.rowIndex + 1 }} {{ props.rowIndex + 1 }}
</div> </div>
<div v-else> <div v-else>
{{ col.value }} {{ col.value ?? "-" }}
</div> </div>
</q-td> </q-td>
</q-tr> </q-tr>
@ -680,7 +682,7 @@ onMounted(async () => {
<div v-else-if="col.name == 'fullname'"> <div v-else-if="col.name == 'fullname'">
{{ {{
props.row.prefix + (props.row.prefix ? props.row.prefix : "") +
props.row.firstName + props.row.firstName +
" " + " " +
props.row.lastName props.row.lastName