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

This commit is contained in:
Eko Haryadi
2024-04-02 11:58:44 +07:00
81 changed files with 1043 additions and 1188 deletions

View File

@@ -8,6 +8,7 @@
>
<Type1 @update:filters="(value) => (filters = value)" />
</Filters>
<div id="data">
<DxDataGrid
ref="dataGridRef"
@@ -29,15 +30,7 @@
<DxSelection mode="single" />
<DxPaging :enabled="false" />
<DxScrolling column-rendering-mode="virtual" mode="virtual" />
<DxLoadPanel
shading-color="rgba(0,0,0,0.4)"
:position="position"
:show-indicator="showIndicator"
:show-pane="showPane"
:shading="shading"
v-model:visible="loadingData"
:enabled="true"
/>
<!-- -->
<DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
<DxExport
@@ -169,15 +162,7 @@
:show-info="true"
:show-navigation-buttons="true"
/>
<DxLoadPanel
shading-color="rgba(0,0,0,0.4)"
:position="position"
:show-indicator="showIndicator"
:show-pane="showPane"
:shading="shading"
v-model:visible="loadingSubData"
:enabled="true"
/>
<!-- -->
<DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
<DxExport
:enabled="true"
@@ -467,12 +452,14 @@
</div>
</div>
</DetailDialog>
<BufferDialog v-if="loadingData || loadingSubData" />
</template>
<script setup lang="ts">
import Filters from '@/components/Form/Filters.vue'
import Type1 from '@/components/Form/FiltersType/Type1.vue'
import { onMounted, ref, watch } from 'vue'
import { onMounted, ref } from 'vue'
import { DxDataGrid } from 'devextreme-vue'
import {
DxColumn,
@@ -500,6 +487,7 @@ import {
exportToXLSX,
exportDetailToXLSX
} from '@/report/Gangguan/Rekap/RGangguan_BerdasarMedia'
import BufferDialog from '@/components/Dialogs/BufferDialog.vue'
const client = apolloClient()
provideApolloClient(client)
@@ -560,6 +548,7 @@ const getDetail = async () => {
})
.finally(() => {
loadingSubData.value = false
dialogDetail.value = true
})
}
@@ -573,8 +562,7 @@ const showDetail = () => {
dataSub.value = []
dataSubSelected.value = null
if (date.value != '') {
dialogDetail.value = true
getDetail()
// getDetail()
}
}