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

fixing display วินัยการยุติเรื่อง

Browse source
This commit is contained in:
Warunee Tamkoo 2025-04-28 10:52:34 +07:00
parent 0c3bcd7f68
commit ec6e19444a
7 changed files with 73 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/11_discipline/components/1_Complaint/Form.vue
View file

@ -554,7 +554,7 @@ onMounted(async () => {
<div class="col-12 row q-pa-sm">
<d-table
ref="table"
:columns="mainStore.columnsRespondent?.filter((item:any)=>item.name !== 'isSend' && item.name !== 'remarkReject')"
:columns="mainStore.columnsRespondent?.filter((item:any)=>item.name !== 'isSend' && item.name !== 'remarkReject' && item.name !== 'disciplineRejectDoc')"
:rows="mainStore.rowsAdd"
row-key="idcard"
flat

35
src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
View file

@ -968,20 +968,6 @@ onMounted(async () => {
>
<q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>
</q-btn>
<q-btn
v-if="props.row.disciplineRejectDoc.length > 0"
flat
round
dense
color="blue"
icon="mdi-download"
@click="
onLoadFile(props.row.disciplineRejectDoc[0])
"
><q-tooltip
>ไฟล์เอกสารที่เกี่ยวข้องกับการยุติเรื่อง</q-tooltip
></q-btn
>
<q-btn
v-if="
(!isReadonly &&
@ -1036,6 +1022,27 @@ onMounted(async () => {
size="sm"
color="primary"
></q-icon>
<div v-else>-</div>
</div>
<div
v-else-if="col.name === 'disciplineRejectDoc'"
class="text-center"
>
<q-btn
v-if="props.row.disciplineRejectDoc.length > 0"
flat
round
dense
color="blue"
icon="mdi-download"
@click="
onLoadFile(props.row.disciplineRejectDoc[0])
"
><q-tooltip
>ดาวน์โหลดไฟล์การยุติเรื่อง</q-tooltip
></q-btn
>
<div v-else>-</div>
</div>
<div v-else>
{{ col.value ?? "-" }}

2
src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
View file

@ -917,7 +917,7 @@ onMounted(async () => {
<div class="col-xs-12 q-pa-sm">
<d-table
ref="table"
:columns="mainStore.columnsRespondent?.filter((item:any)=> item.name !== 'isSend' && item.name !== 'remarkReject')"
:columns="mainStore.columnsRespondent?.filter((item:any)=> item.name !== 'isSend' && item.name !== 'remarkReject' && item.name !== 'disciplineRejectDoc')"
:rows="mainStore.rowsAdd"
row-key="personId"
flat

2
src/modules/11_discipline/components/4_Result/Form.vue
View file

@ -434,7 +434,7 @@ watch(
<div class="col-xs-12 q-pa-sm">
<d-table
ref="table"
:columns="mainStore.columnsRespondent?.filter((item:any)=>item.name !== 'isSend' && item.name !== 'remarkReject')"
:columns="mainStore.columnsRespondent?.filter((item:any)=>item.name !== 'isSend' && item.name !== 'remarkReject' && item.name !== 'disciplineRejectDoc')"
:rows="mainStore.rowsAdd"
row-key="idcard"
flat

4
src/modules/11_discipline/components/PopupSendToNext.vue
View file

@ -183,7 +183,7 @@ watch(
</div>
<d-table
ref="table"
:columns="props.columns.filter((item:any)=>item.name !== 'isSend' && item.name !== 'remarkReject')"
:columns="props.columns.filter((item:any)=>item.name !== 'isSend' && item.name !== 'remarkReject' && item.name !== 'disciplineRejectDoc')"
:rows="rows"
row-key="personId"
flat
@ -219,7 +219,7 @@ watch(
{{ props.rowIndex + 1 }}
</div>
<div v-else>
{{ col.value ? col.value:'-' }}
{{ col.value ? col.value : "-" }}
</div>
</q-td>
</q-tr>