ทะเบียนประวัติ ปรับ table
This commit is contained in:
parent
fb5017b0e2
commit
0a6feb0c9c
13 changed files with 143 additions and 116 deletions
|
|
@ -32,13 +32,13 @@
|
|||
"
|
||||
class="table_ellipsis"
|
||||
>
|
||||
{{ col.value == null ? null : date2Thai(col.value) }}
|
||||
{{ col.value ? date2Thai(col.value) : "-" }}
|
||||
</div>
|
||||
<div v-else-if="col.name == 'year'" class="table_ellipsis">
|
||||
{{ col.value + 543 }}
|
||||
{{ col.value ? col.value + 543 : "-" }}
|
||||
</div>
|
||||
<div v-else class="table_ellipsis">
|
||||
{{ col.value }}
|
||||
{{ col.value ? col.value : "-" }}
|
||||
</div>
|
||||
</q-td>
|
||||
<q-td auto-width>
|
||||
|
|
@ -497,13 +497,13 @@
|
|||
"
|
||||
class="table_ellipsis"
|
||||
>
|
||||
{{ col.value == null ? null : date2Thai(col.value) }}
|
||||
{{ col.value ? date2Thai(col.value) : "-" }}
|
||||
</div>
|
||||
<div v-else-if="col.name == 'year'" class="table_ellipsis">
|
||||
{{ col.value + 543 }}
|
||||
{{ col.value ? col.value + 543 : "-" }}
|
||||
</div>
|
||||
<div v-else class="table_ellipsis">
|
||||
{{ col.value }}
|
||||
{{ col.value ? col.value : "-" }}
|
||||
</div>
|
||||
</q-td>
|
||||
</q-tr>
|
||||
|
|
@ -1029,18 +1029,18 @@ const fetchData = async () => {
|
|||
insigniaId: e.insignia == null ? null : e.insignia.id,
|
||||
insigniaType: e.insigniaType,
|
||||
year: e.year,
|
||||
no: e.no == '' ? '-':e.no,
|
||||
issue: e.issue == '' ? '-':e.issue,
|
||||
volumeNo: e.volumeNo == '' ? '-':e.volumeNo,
|
||||
volume: e.volume == '' ? '-':e.volume,
|
||||
section: e.section == '' ? '-':e.section,
|
||||
page: e.page == '' ? '-':e.page,
|
||||
receiveDate: new Date(e.receiveDate),
|
||||
dateAnnounce: e.dateAnnounce == null ? '-':e.dateAnnounce,
|
||||
refCommandNo: e.refCommandNo == '' ? '-':e.refCommandNo,
|
||||
refCommandDate: e.refCommandDate == null ? '-':e.refCommandDate,
|
||||
no: e.no,
|
||||
issue: e.issue,
|
||||
volumeNo: e.volumeNo,
|
||||
volume: e.volume,
|
||||
section: e.section,
|
||||
page: e.page,
|
||||
receiveDate: e.receiveDate,
|
||||
dateAnnounce: e.dateAnnounce,
|
||||
refCommandNo: e.refCommandNo,
|
||||
refCommandDate: e.refCommandDate,
|
||||
createdFullName: e.createdFullName,
|
||||
createdAt: new Date(e.createdAt),
|
||||
createdAt: e.createdAt,
|
||||
});
|
||||
});
|
||||
})
|
||||
|
|
@ -1089,7 +1089,7 @@ const getData = () => {
|
|||
section.value = row.section;
|
||||
page.value = row.page;
|
||||
receiveDate.value = row.receiveDate;
|
||||
dateAnnounce.value = row.dateAnnounce == '-'?'':row.dateAnnounce;
|
||||
dateAnnounce.value = row.dateAnnounce == "-" ? "" : row.dateAnnounce;
|
||||
refCommandNo.value = row.refCommandNo;
|
||||
refCommandDate.value = row.refCommandDate;
|
||||
id.value = row.id;
|
||||
|
|
@ -1311,13 +1311,13 @@ const selectData = async (props: DataProps) => {
|
|||
section.value = props.row.section;
|
||||
page.value = props.row.page;
|
||||
receiveDate.value = props.row.receiveDate;
|
||||
dateAnnounce.value = props.row.dateAnnounce == '-'? '':props.row.dateAnnounce;
|
||||
dateAnnounce.value =
|
||||
props.row.dateAnnounce == "-" ? "" : props.row.dateAnnounce;
|
||||
refCommandNo.value = props.row.refCommandNo;
|
||||
refCommandDate.value =
|
||||
props.row.refCommandDate == "-" ? null : props.row.refCommandDate;
|
||||
id.value = props.row.id;
|
||||
|
||||
console.log(dateAnnounce.value);
|
||||
yearInput.value = (Number(props.row.year) + 543).toLocaleString();
|
||||
receiveDateInput.value = convertDateDisplay(props.row.receiveDate);
|
||||
dateAnnounceInput.value = props.row.dateAnnounce
|
||||
|
|
@ -1353,9 +1353,9 @@ const addData = () => {
|
|||
receiveDateInput.value = "";
|
||||
dateAnnounceInput.value = "";
|
||||
refCommandDateInput.value = "";
|
||||
yearInput.value = ''
|
||||
yearInput.value = "";
|
||||
|
||||
receiveDateCheck.value = false
|
||||
receiveDateCheck.value = false;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1459,7 +1459,6 @@ watch(
|
|||
() => dateAnnounceInput.value,
|
||||
(value: string) => {
|
||||
if (value.length === 10) {
|
||||
|
||||
const dateVal = convertDate(value);
|
||||
if (dateVal.isValid) {
|
||||
dateAnnounce.value = dateVal.value;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue