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

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m9s
Details

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-11-25 11:45:35 +07:00
commit 5be1215ed9
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/modules/05_placement/components/probation/DialogOrder.vue
View file

@ -96,7 +96,7 @@ const columns = ref<QTableProps["columns"]>([
name: "name",
align: "left",
label: "ชื่อ-นามสกุล",
sortable: true,
sortable: false,
field: "name",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
@ -105,7 +105,7 @@ const columns = ref<QTableProps["columns"]>([
name: "position_line",
align: "left",
label: "ตำแหน่งในสายงาน",
sortable: true,
sortable: false,
field: "position_line",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
@ -114,7 +114,7 @@ const columns = ref<QTableProps["columns"]>([
name: "position_level",
align: "left",
label: "ระดับ",
sortable: true,
sortable: false,
field: "position_level",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
@ -123,7 +123,7 @@ const columns = ref<QTableProps["columns"]>([
name: "organization",
align: "left",
label: "สังกัด",
sortable: true,
sortable: false,
field: "organization",
headerStyle: "font-size: 14px",
style: "font-size: 14px ",
@ -133,7 +133,7 @@ const columns = ref<QTableProps["columns"]>([
name: "probation_no",
align: "center",
label: "ครั้งที่ทดลองปฏิบัติหน้าที่ราชการ",
sortable: true,
sortable: false,
field: "probation_no",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
@ -145,7 +145,7 @@ const columns = ref<QTableProps["columns"]>([
name: "order_number",
align: "center",
label: "เลขที่คําสั่งบรรจุแต่งตั้ง",
sortable: true,
sortable: false,
field: "order_number",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
@ -157,7 +157,7 @@ const columns = ref<QTableProps["columns"]>([
name: "probation_status",
align: "left",
label: "สถานะ",
sortable: true,
sortable: false,
field: "probation_status",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
@ -203,7 +203,7 @@ async function getList() {
.get(
config.API.probationPersonalList() +
`?status=${
commandType.value ? (commandType.value == "C-PM-11" ? 2 : 3) : ""
commandType.value ? (commandType.value == "C-PM-11" ? 3 : 2) : ""
}&page=${pagination.value.page}&pageSize=${
pagination.value.rowsPerPage
}&keyword=${filter.value.trim()}`

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

@ -529,7 +529,7 @@ function onClickViewInfo(type: string, id: string) {
</div>
<div v-else-if="col.name == 'discipline'">
<q-btn
v-if="checkPermission($route)?.attrIsGet && props.row.isPunish"
v-if="checkPermission($route)?.attrIsGet && !props.row.isPunish"
flat
dense
icon="info"

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

@ -432,7 +432,7 @@ async function updateCurrentPageAndfetchData() {
bordered
:paging="true"
dense
:rows-per-page-options="[1,10, 25, 50, 100]"
:rows-per-page-options="[1, 10, 25, 50, 100]"
:visible-columns="visibleColumns"
v-model:pagination="pagination"
@request="props.onRequest"
@ -546,7 +546,7 @@ async function updateCurrentPageAndfetchData() {
<div v-else-if="col.name == 'discipline'">
<q-btn
v-if="checkPermission($route)?.attrIsGet && props.row.isPunish"
v-if="checkPermission($route)?.attrIsGet && !props.row.isPunish"
flat
dense
icon="info"