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

fix ทะเบียน

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-03-19 10:09:09 +07:00
parent b0c67c3f01
commit 9f6c33ee54
2 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
View file

@ -178,7 +178,7 @@ const baseColumns = ref<QTableColumn[]>([
field: "commandNo", field: "commandNo",
format(val, row) { format(val, row) {
return row.commandNo && row.commandYear return row.commandNo && row.commandYear
? `${row.commandNo}/${row.commandYear}` ? `${row.commandNo}/${Number(row.commandYear) + 543}`
: ""; : "";
}, },
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
@ -929,7 +929,7 @@ onMounted(async () => {
:class="props.row.isEntry ? 'text-red' : ''" :class="props.row.isEntry ? 'text-red' : ''"
> >
<div <div
v-if="col.name == 'refCommandNo' && props.row.commandId" v-if="col.name == 'commandNo' && props.row.commandId"
@click="col.value ? onRefCommand(props.row) : null" @click="col.value ? onRefCommand(props.row) : null"
:class=" :class="
col.value col.value
@ -940,9 +940,6 @@ onMounted(async () => {
{{ col.value ? col.value : "-" }} {{ col.value ? col.value : "-" }}
<q-tooltip v-if="col.value">ดูคำสั่ง</q-tooltip> <q-tooltip v-if="col.value">ดูคำสั่ง</q-tooltip>
</div> </div>
<div v-else-if="col.name == 'refCommandNo' && !props.row.commandId">
-
</div>
<div v-else-if="col.name == 'organization'" class="table_ellipsis"> <div v-else-if="col.name == 'organization'" class="table_ellipsis">
{{ col.value ? col.value : "-" }} {{ col.value ? col.value : "-" }}

8
src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
View file

@ -211,7 +211,7 @@ const baseColumns = ref<QTableColumn[]>([
field: "commandNo", field: "commandNo",
format(val, row) { format(val, row) {
return row.commandNo && row.commandYear return row.commandNo && row.commandYear
? `${row.commandNo}/${row.commandYear}` ? `${row.commandNo}/${Number(row.commandYear) + 543}`
: ""; : "";
}, },
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
@ -897,7 +897,7 @@ onMounted(async () => {
:class="props.row.isEntry ? 'text-red' : ''" :class="props.row.isEntry ? 'text-red' : ''"
> >
<div <div
v-if="col.name == 'refCommandNo' && props.row.commandId" v-if="col.name == 'commandNo' && props.row.commandId"
@click="col.value ? onRefCommand(props.row) : null" @click="col.value ? onRefCommand(props.row) : null"
:class=" :class="
col.value col.value
@ -908,9 +908,7 @@ onMounted(async () => {
{{ col.value ? col.value : "-" }} {{ col.value ? col.value : "-" }}
<q-tooltip v-if="col.value">ดูคำสั่ง</q-tooltip> <q-tooltip v-if="col.value">ดูคำสั่ง</q-tooltip>
</div> </div>
<div v-else-if="col.name == 'refCommandNo' && !props.row.commandId">
-
</div>
<div v-else-if="col.name == 'organization'" class="table_ellipsis"> <div v-else-if="col.name == 'organization'" class="table_ellipsis">
{{ col.value ? col.value : "-" }} {{ col.value ? col.value : "-" }}
</div> </div>