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

fixing column บรรจุ แต่งตั้ง ย้าย

Browse source
This commit is contained in:
Warunee Tamkoo 2024-05-24 14:58:40 +07:00
parent bb2d03e499
commit 9cde68ab4f
74 changed files with 620 additions and 626 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/modules/05_placement/components/helpgovernment/Dialogbody.vue
View file

@ -22,8 +22,8 @@ const {
messageError,
dialogConfirm,
hideLoader,
findOrgName,
findPosMasterNo,
findOrgNameOld,
findPosMasterNoOld,
date2Thai,
} = mixin;
@ -51,23 +51,23 @@ const columns2 = ref<QTableProps["columns"]>([
},
},
{
name: "posNo",
name: "posMasterNoOld",
align: "left",
label: "เลขที่ตำแหน่ง",
sortable: true,
field: "posNo",
field: "posMasterNoOld",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return findPosMasterNo(row);
return findPosMasterNoOld(row);
},
},
{
name: "position",
name: "positionOld",
align: "left",
label: "ตำแหน่งในสายงาน",
sortable: true,
field: "position",
field: "positionOld",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
@ -80,7 +80,15 @@ const columns2 = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return `${row.posTypeName} (${row.posLevelName})`;
let name = "";
if (row.posTypeNameOld && row.posLevelNameOld) {
name = `${row.posTypeNameOld} (${row.posLevelNameOld})`;
} else if (row.posTypeNameOld) {
name = `${row.posTypeNameOld}`;
} else if (row.posLevelNameOld) {
name = `(${row.posLevelNameOld})`;
} else name = "-";
return name;
},
},
{
@ -88,13 +96,10 @@ const columns2 = ref<QTableProps["columns"]>([
align: "left",
label: "สังกัด",
sortable: true,
field: "organizationPositionOld",
field: "organization",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
classes: "table_ellipsis",
format(val, row) {
return findOrgName(row);
},
format: (val, row) => findOrgNameOld(row),
},
{
name: "organization",
@ -104,7 +109,6 @@ const columns2 = ref<QTableProps["columns"]>([
field: "organization",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
classes: "table_ellipsis",
},
{
name: "dateStart",
@ -150,8 +154,8 @@ const columns2 = ref<QTableProps["columns"]>([
const visibleColumns2 = ref<string[]>([
"no",
"name",
"posNo",
"position",
"posMasterNoOld",
"positionOld",
"positionLevel",
"organizationPositionOld",
"organization",
@ -301,13 +305,18 @@ watchEffect(() => {
{{ props.rowIndex + 1 }}
</div>
<div v-else :class="
col.name === 'organizationPositionOld' ||
col.name === 'organization'
? 'table_ellipsis'
: ''
">
{{ col.value ? col.value : "-" }}
<div
v-else
:class="
col.name === 'organizationPositionOld' ||
col.name === 'organization'
? 'table_ellipsis'
: ''
"
>
{{
col.value == null ? "" : col.value == "" ? "-" : col.value
}}
</div>
</q-td>
</q-tr>

40
src/modules/05_placement/components/helpgovernment/mainHelp.vue
View file

@ -31,8 +31,8 @@ const {
hideLoader,
success,
dialogRemove,
findOrgName,
findPosMasterNo,
findOrgNameOld,
findPosMasterNoOld,
} = mixin;
//หัวตาราง
@ -59,23 +59,23 @@ const columns = ref<QTableProps["columns"]>([
},
},
{
name: "posNo",
name: "posMasterNoOld",
align: "left",
label: "เลขที่ตำแหน่ง",
sortable: true,
field: "posNo",
field: "posMasterNoOld",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return findPosMasterNo(row);
return findPosMasterNoOld(row);
},
},
{
name: "position",
name: "positionOld",
align: "left",
label: "ตำแหน่งในสายงาน",
sortable: true,
field: "position",
field: "positionOld",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
@ -89,12 +89,12 @@ const columns = ref<QTableProps["columns"]>([
style: "font-size: 14px",
format(val, row) {
let name = "";
if (row.posTypeName && row.posLevelName) {
name = `${row.posTypeName} (${row.posLevelName})`;
} else if (row.posTypeName) {
name = `${row.posTypeName}`;
} else if (row.posLevelName) {
name = `(${row.posLevelName})`;
if (row.posTypeNameOld && row.posLevelNameOld) {
name = `${row.posTypeNameOld} (${row.posLevelNameOld})`;
} else if (row.posTypeNameOld) {
name = `${row.posTypeNameOld}`;
} else if (row.posLevelNameOld) {
name = `(${row.posLevelNameOld})`;
} else name = "-";
return name;
},
@ -104,12 +104,10 @@ const columns = ref<QTableProps["columns"]>([
align: "left",
label: "สังกัด",
sortable: true,
field: "organizationPositionOld",
field: "organization",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return findOrgName(row);
},
format: (val, row) => findOrgNameOld(row),
},
{
name: "organization",
@ -164,8 +162,8 @@ const columns = ref<QTableProps["columns"]>([
const visibleColumns = ref<string[]>([
"no",
"name",
"posNo",
"position",
"posMasterNoOld",
"positionOld",
"positionLevel",
"organizationPositionOld",
"organization",
@ -334,7 +332,9 @@ onMounted(async () => {
: ''
"
>
{{ col.value ? col.value : "-" }}
{{
col.value == null ? "" : col.value == "" ? "-" : col.value
}}
</div>
</q-td>
<q-td auto-width>