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

fix salary

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-03-26 10:23:50 +07:00
parent 931a25af8f
commit 3212193de2
5 changed files with 106 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue
View file

@ -59,7 +59,7 @@ const baseColumns = ref<QTableProps["columns"]>([
{
name: "posNo",
align: "left",
label: "ตำแหน่งเลขที่",
label: "เลขที่ตำแหน่ง",
sortable: false,
field: "posNo",
headerStyle: "font-size: 14px",
@ -86,7 +86,7 @@ const baseColumns = ref<QTableProps["columns"]>([
{
name: "posType",
align: "left",
label: "ประเภทตำแหน่ง",
label: "ตำแหน่งประเภท",
sortable: false,
field: "posType",
headerStyle: "font-size: 14px",
@ -95,7 +95,7 @@ const baseColumns = ref<QTableProps["columns"]>([
{
name: "posLevel",
align: "left",
label: "ระดับตำแหน่ง",
label: "ระดับ",
sortable: false,
field: "posLevel",
headerStyle: "font-size: 14px",

39
src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
View file

@ -25,8 +25,14 @@ import config from "@/app.config";
/** use*/
const $q = useQuasar();
const store = useSalaryListSDataStore();
const { dialogRemove, messageError, showLoader, hideLoader, success } =
useCounterMixin();
const {
dialogRemove,
messageError,
showLoader,
hideLoader,
success,
findOrgNameHtml,
} = useCounterMixin();
/** Props*/
const formFilter = defineModel<DataFilter>("formFilter", { required: true });
@ -68,7 +74,7 @@ const columns = ref<QTableProps["columns"]>([
{
name: "posType",
align: "left",
label: "ประเภทตำแหน่ง",
label: "ตำแหน่งประเภท",
sortable: false,
field: "posType",
headerStyle: "font-size: 14px",
@ -95,7 +101,7 @@ const columns = ref<QTableProps["columns"]>([
{
name: "posLevel",
align: "left",
label: "ระดับตำแหน่ง",
label: "ระดับ",
field: "posLevel",
sortable: false,
headerStyle: "font-size: 14px",
@ -116,7 +122,7 @@ const columns = ref<QTableProps["columns"]>([
label: "สังกัด",
sortable: false,
field: "organization",
headerStyle: "font-size: 14px",
headerStyle: "font-size: 14px;min-width:280px",
style: "font-size: 14px",
},
{
@ -361,7 +367,7 @@ function onClickViewInfo(type: string, id: string) {
:options="!checkPermission($route)?.attrIsGet ? columns?.filter((col:any) => col.name !== 'posSalary' && col.name !== 'discipline' && col.name !== 'leave' ) : columns"
option-value="name"
style="min-width: 140px"
class="col-xs-12 col-sm-3 col-md-2 q-ml-sm"
class="q-ml-sm"
/>
</q-toolbar>
<d-table
@ -457,25 +463,8 @@ function onClickViewInfo(type: string, id: string) {
`${props.row.prefix}${props.row.firstName} ${props.row.lastName}`
}}
</div>
<div v-else-if="col.name == 'organization'" class="table_ellipsis">
<div
v-if="
props.row.child4 === null &&
props.row.child3 === null &&
props.row.child2 === null &&
props.row.child1 === null &&
props.row.root === null
"
>
-
</div>
{{
`${props.row.child4 ? props.row.child4 + " " : ""}${
props.row.child3 ? props.row.child3 + " " : ""
}${props.row.child2 ? props.row.child2 + " " : ""}${
props.row.child1 ? props.row.child1 + " " : ""
}${props.row.root ? props.row.root : ""}`
}}
<div v-else-if="col.name == 'organization'" class="text-html">
{{ findOrgNameHtml(props.row) }}
</div>
<div v-else-if="col.name == 'amount'">
{{ Number(props.row.amount).toLocaleString() }}

35
src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
View file

@ -24,8 +24,14 @@ import DialogInfo from "@/modules/13_salary/components/DialogInfoMain.vue";
/** use*/
const $q = useQuasar();
const store = useSalaryEmployeeListSDataStore();
const { dialogRemove, messageError, showLoader, hideLoader, success } =
useCounterMixin();
const {
dialogRemove,
messageError,
showLoader,
hideLoader,
success,
findOrgNameHtml,
} = useCounterMixin();
/** Props*/
const formFilter = defineModel<DataFilter>("formFilter", { required: true });
@ -128,7 +134,7 @@ const columns = ref<QTableProps["columns"]>([
label: "สังกัด",
sortable: false,
field: "organization",
headerStyle: "font-size: 14px",
headerStyle: "font-size: 14px;min-width:280px",
style: "font-size: 14px",
},
{
@ -378,7 +384,7 @@ watch(
: columns"
option-value="name"
style="min-width: 140px"
class="col-xs-12 col-sm-3 col-md-2 q-ml-sm"
class=" q-ml-sm"
/>
</q-toolbar>
<d-table
@ -475,25 +481,8 @@ watch(
`${props.row.prefix}${props.row.firstName} ${props.row.lastName}`
}}
</div>
<div v-else-if="col.name == 'organization'" class="table_ellipsis">
<div
v-if="
props.row.child4 === null &&
props.row.child3 === null &&
props.row.child2 === null &&
props.row.child1 === null &&
props.row.root === null
"
>
-
</div>
{{
`${props.row.child4 ? props.row.child4 + " " : ""}${
props.row.child3 ? props.row.child3 + " " : ""
}${props.row.child2 ? props.row.child2 + " " : ""}${
props.row.child1 ? props.row.child1 + " " : ""
}${props.row.root ? props.row.root : ""}`
}}
<div v-else-if="col.name == 'organization'" class="text-html">
{{ findOrgNameHtml(props.row) }}
</div>
<div v-else-if="col.name == 'isSuspension'">

10
src/modules/13_salary/components/InfoSalary.vue
View file

@ -46,8 +46,7 @@ const baseColumns = ref<QTableProps["columns"]>([
{
name: "amount",
align: "left",
label:
employeeClass.value === "-employee" ? "ค่าตอบแทนรายเดือน" : "เงินเดือน",
label: employeeClass.value === "-employee" ? "ค่าจ้าง" : "เงินเดือน",
sortable: true,
field: "amount",
headerStyle: "font-size: 14px",
@ -78,7 +77,8 @@ const baseColumns = ref<QTableProps["columns"]>([
{
name: "posNo",
align: "left",
label: "ตำแหน่งเลขที่",
label:
employeeClass.value === "-employee" ? "ตำแหน่งเลขที่" : "เลขที่ตำแหน่ง",
sortable: true,
field: "posNo",
headerStyle: "font-size: 14px",
@ -88,7 +88,7 @@ const baseColumns = ref<QTableProps["columns"]>([
{
name: "positionType",
align: "left",
label: "ประเภทตำแหน่ง",
label: employeeClass.value === "-employee" ? "กลุ่มงาน" : "ตำแหน่งประเภท",
sortable: true,
field: "positionType",
headerStyle: "font-size: 14px",
@ -97,7 +97,7 @@ const baseColumns = ref<QTableProps["columns"]>([
{
name: "positionLevel",
align: "left",
label: "ระดับ",
label: employeeClass.value === "-employee" ? "ระดับชั้นงาน" : "ระดับ",
sortable: true,
field: "positionLevel",
headerStyle: "font-size: 14px",