diff --git a/src/modules/13_salary/components/SalaryLists/TabMain.vue b/src/modules/13_salary/components/SalaryLists/TabMain.vue index 3ec16d409..2c3ecafd1 100644 --- a/src/modules/13_salary/components/SalaryLists/TabMain.vue +++ b/src/modules/13_salary/components/SalaryLists/TabMain.vue @@ -217,7 +217,8 @@ async function fetchDataPeriod(id: string) { page: formFilter.page.toString(), pageSize: formFilter.pageSize.toString(), keyword: formFilter.keyword, - type: store.tabType, + type: store.tabType === "RETIRE" ? "" : store.tabType, + isRetire: store.tabType === "RETIRE" ? true : null, }; await http diff --git a/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue b/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue index 04cab0cbb..d5c402b9e 100644 --- a/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue +++ b/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue @@ -118,6 +118,15 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "positionSalaryAmount", + align: "left", + label: "เงินเดือนหลังเลื่อน", + sortable: false, + field: "positionSalaryAmount", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, ]); const visibleColumns = ref([ "no", @@ -129,6 +138,7 @@ const visibleColumns = ref([ "posExecutive", "amount", "amountUse", + "positionSalaryAmount", ]); /** modalDialog*/ @@ -299,10 +309,23 @@ watch( }}
- {{ props.row.amount.toLocaleString() }} + {{ + props.row.amount !== null ? props.row.amount.toLocaleString() : "" + }}
- {{ props.row.amountUse.toLocaleString() }} + {{ + props.row.amountUse !== null + ? props.row.amountUse.toLocaleString() + : "" + }} +
+
+ {{ + props.row.positionSalaryAmount !== null + ? props.row.positionSalaryAmount.toLocaleString() + : "" + }}