Merge branch 'dev-defuj' of github.com:defuj/eis into dev-bagus

This commit is contained in:
kur0nek-o
2024-03-30 09:53:18 +07:00
46 changed files with 566 additions and 200 deletions

View File

@ -47,7 +47,7 @@
css-class="custom-table-column"
:width="50"
alignment="center"
:calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1"
:calculate-display-value="(item: any) => data.findIndex((i) => i == item) + 1"
data-type="number"
caption="No"
cell-template="formatNumber"
@ -613,7 +613,7 @@
css-class="custom-table-column"
:width="50"
alignment="center"
:calculateCellValue="(item: any) => dataSub.findIndex((i: any) => i == item) + 1"
:calculate-display-value="(item: any) => dataSub.findIndex((i: any) => i == item) + 1"
data-type="number"
caption="No"
cell-template="formatNumber"

View File

@ -194,7 +194,7 @@
css-class="custom-table-column"
:width="50"
alignment="center"
:calculateCellValue="(item: any) => dataSub.findIndex((i) => i == item) + 1"
:calculate-display-value="(item: any) => dataSub.findIndex((i) => i == item) + 1"
data-type="number"
caption="No"
cell-template="formatNumber"

View File

@ -51,7 +51,7 @@
css-class="custom-table-column"
:width="50"
alignment="center"
:calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1"
:calculate-display-value="(item: any) => data.findIndex((i) => i == item) + 1"
data-type="number"
caption="No"
data-field="no"
@ -189,7 +189,7 @@
css-class="custom-table-column"
:width="50"
alignment="center"
:calculateCellValue="(item: any) => dataSub.findIndex((i) => i == item) + 1"
:calculate-display-value="(item: any) => dataSub.findIndex((i) => i == item) + 1"
data-type="number"
caption="No"
cell-template="formatNumber"
@ -572,8 +572,10 @@ const showDetail = () => {
clearSelection()
dataSub.value = []
dataSubSelected.value = null
dialogDetail.value = true
getDetail()
if (date.value != '') {
dialogDetail.value = true
getDetail()
}
}
const closeDialog = () => {
@ -601,10 +603,7 @@ const onExportingDetail = (e: any) => {
const onDataSelectionChanged = ({ selectedRowsData }: any) => {
if (selectedRowsData[0] != undefined) {
dataSelected.value = selectedRowsData[0]
if (date.value != '') {
showDetail()
}
showDetail()
}
}

View File

@ -227,7 +227,7 @@
css-class="custom-table-column"
:width="50"
alignment="center"
:calculateCellValue="(item: any) => dataSub.findIndex((i) => i == item) + 1"
:calculate-display-value="(item: any) => dataSub.findIndex((i) => i == item) + 1"
data-type="number"
caption="No"
cell-template="formatNumber"

View File

@ -58,7 +58,7 @@
<DxColumn
:width="50"
alignment="center"
:calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1"
:calculate-display-value="(item: any) => data.findIndex((i) => i == item) + 1"
caption="a"
css-class="custom-table-column"
cell-template="formatNumber"
@ -475,7 +475,7 @@
css-class="custom-table-column"
:width="50"
alignment="center"
:calculateCellValue="(item: any) => dataSub.findIndex((i) => i == item) + 1"
:calculate-display-value="(item: any) => dataSub.findIndex((i) => i == item) + 1"
data-type="number"
caption="No"
cell-template="formatNumber"

View File

@ -54,7 +54,7 @@
css-class="custom-table-column"
:width="60"
alignment="center"
:calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1"
:calculate-display-value="(item: any) => data.findIndex((i) => i == item) + 1"
caption="No"
/> -->
<DxColumn
@ -479,7 +479,7 @@
css-class="custom-table-column"
:width="50"
alignment="center"
:calculateCellValue="(item: any) => dataSub.findIndex((i) => i == item) + 1"
:calculate-display-value="(item: any) => dataSub.findIndex((i) => i == item) + 1"
data-type="number"
caption="No"
cell-template="formatNumber"

View File

@ -364,7 +364,7 @@
css-class="custom-table-column"
:width="50"
alignment="center"
:calculateCellValue="(item: any) => dataSub.findIndex((i) => i == item) + 1"
:calculate-display-value="(item: any) => dataSub.findIndex((i) => i == item) + 1"
data-type="number"
caption="No"
cell-template="formatNumber"

View File

@ -56,7 +56,7 @@
data-field="no"
caption="NO"
css-class="custom-table-column"
:calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1"
:calculate-display-value="(item: any) => data.findIndex((i) => i == item) + 1"
cell-template="formatNumber"
/>
<DxColumn
@ -566,7 +566,7 @@
css-class="custom-table-column"
:width="50"
alignment="center"
:calculateCellValue="(item: any) => dataSub.findIndex((i) => i == item) + 1"
:calculate-display-value="(item: any) => dataSub.findIndex((i) => i == item) + 1"
data-type="number"
caption="No"
cell-template="formatNumber"

View File

@ -54,7 +54,7 @@
caption="NO"
css-class="custom-table-column"
cell-template="formatNumber"
:calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1"
:calculate-display-value="(item: any) => data.findIndex((i) => i == item) + 1"
/>
<DxColumn
:width="120"
@ -576,7 +576,7 @@
css-class="custom-table-column"
:width="50"
alignment="center"
:calculateCellValue="(item: any) => dataSub.findIndex((i) => i == item) + 1"
:calculate-display-value="(item: any) => dataSub.findIndex((i) => i == item) + 1"
data-type="number"
caption="No"
cell-template="formatNumber"

View File

@ -52,7 +52,7 @@
css-class="custom-table-column"
:width="50"
alignment="center"
:calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1"
:calculate-display-value="(item: any) => data.findIndex((i) => i == item) + 1"
data-type="number"
caption="No"
cell-template="formatNumber"
@ -324,7 +324,7 @@
css-class="custom-table-column"
:width="50"
alignment="center"
:calculateCellValue="(item: any) => dataSub.findIndex((i) => i == item) + 1"
:calculate-display-value="(item: any) => dataSub.findIndex((i) => i == item) + 1"
data-type="number"
caption="No"
cell-template="formatNumber"

View File

@ -293,7 +293,7 @@
css-class="custom-table-column"
:width="50"
alignment="center"
:calculateCellValue="(item: any) => dataSub.findIndex((i) => i == item) + 1"
:calculate-display-value="(item: any) => dataSub.findIndex((i) => i == item) + 1"
data-type="number"
caption="No"
cell-template="formatNumber"

View File

@ -50,7 +50,7 @@
alignment="center"
caption="NO"
data-type="number"
:calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1"
:calculate-display-value="(item: any) => data.findIndex((i) => i == item) + 1"
css-class="custom-table-column"
cell-template="formatNumber"
/>
@ -283,7 +283,7 @@
css-class="custom-table-column"
:width="50"
alignment="center"
:calculateCellValue="(item: any) => dataSub.findIndex((i) => i == item) + 1"
:calculate-display-value="(item: any) => dataSub.findIndex((i) => i == item) + 1"
data-type="number"
caption="No"
cell-template="formatNumber"