Merge branch 'development' of github.com:defuj/eis into development

src/components/Pages/Anomali/Keluhan/Anomali_LAPPKU_LPT.vue

@@ -411,7 +411,7 @@
             cell-template="formatNumber"
           />
           <DxColumn
-            :width="150"
+            :width="200"
             alignment="center"
             data-field="nama_uid"
             caption="UIW/D"
@@ -526,7 +526,7 @@
             cell-template="formatText"
           />
           <DxColumn
-            :width="150"
+            :width="250"
             alignment="center"
             data-field="alamat_pelapor"
             caption="Alamat Pelapor"
@@ -542,7 +542,7 @@
             cell-template="formatText"
           />
           <DxColumn
-            :width="150"
+            :width="250"
             alignment="center"
             data-field="keterangan_pelapor"
             caption="Keterangan Pelapor"
@@ -550,7 +550,7 @@
             cell-template="formatText"
           />
           <DxColumn
-            :width="150"
+            :width="250"
             alignment="center"
             data-field="uraian"
             caption="Uraian"
@@ -606,13 +606,23 @@
         <div class="flex flex-row items-center justify-between w-full">
           <h3 class="text-sm font-medium w-[135px] text-gray-800">No Laporan:</h3>
           <InputText
+            v-if="filters.jenisLaporan.name === 'Laporan Berulang Unit'"
             :readonly="true"
             :value="dataSubSelected?.no_laporan_anomali"
             class-name="flex-1"
           />
+          <InputText
+            v-else
+            :readonly="true"
+            :value="dataSubSelected?.no_laporan"
+            class-name="flex-1"
+          />
         </div>
 
-        <div class="flex flex-row items-center justify-between w-full">
+        <div
+          v-if="filters.jenisLaporan.name === 'Laporan Berulang Unit'"
+          class="flex flex-row items-center justify-between w-full"
+        >
           <h3 class="text-sm font-medium w-[135px] text-gray-800">No Laporan Referensi:</h3>
           <InputText
             :readonly="true"

src/components/Pages/Material/Rekap/Material_RPM.vue

@@ -15,7 +15,6 @@
       :row-alternation-enabled="true"
       :hover-state-enabled="true"
       @selection-changed="onSelectionChanged"
-      :column-width="100"
       @exporting="onExporting"
       :allow-column-resizing="true"
       column-resizing-mode="widget"
@@ -56,7 +55,7 @@
       />
       <DxColumn
         css-class="custom-table-column"
-        :width="170"
+        :width="250"
         alignment="center"
         data-field="nama_material"
         caption="Nama Material"
@@ -81,7 +80,7 @@
       <DxColumn css-class="custom-table-column" alignment="center" caption="Tanggal">
         <DxColumn
           v-for="i in 31"
-          :width="150"
+          :width="50"
           alignment="center"
           :data-field="`tgl${i}`"
           data-type="number"
@@ -147,12 +146,20 @@
 
       <div class="flex flex-row items-center justify-between w-full" v-for="i in 31">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">Tgl {{ i }}:</h3>
-        <InputText :readonly="true" :value="dataSelected[`tgl${i}`]" class-name="flex-1" />
+        <InputText
+          :readonly="true"
+          :value="formatNumber(dataSelected[`tgl${i}`])"
+          class-name="flex-1"
+        />
       </div>
 
       <div class="flex flex-row items-center justify-between w-full">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">Jumlah:</h3>
-        <InputText :readonly="true" :value="dataSelected?.total" class-name="flex-1" />
+        <InputText
+          :readonly="true"
+          :value="formatNumber(dataSelected?.total)"
+          class-name="flex-1"
+        />
       </div>
     </div>
   </DetailDialog>
@@ -166,7 +173,6 @@ import { DxDataGrid } from 'devextreme-vue'
 import {
   DxColumn,
   DxExport,
-  DxLoadPanel,
   DxPager,
   DxPaging,
   DxSearchPanel,
@@ -174,8 +180,6 @@ import {
 } from 'devextreme-vue/data-grid'
 import { Type14 } from '@/components/Form/FiltersType'
 import Filters from '@/components/Form/Filters.vue'
-import { useQuery } from '@vue/apollo-composable'
-import gql from 'graphql-tag'
 import { queries, requestGraphQl } from '@/utils/api/api.graphql'
 import BufferDialog from '@/components/Dialogs/BufferDialog.vue'
 import { formatNumber, formatPercentage, isNumber } from '@/utils/numbers'

src/components/Pages/PencarianData/PencarianData.vue

@@ -89,6 +89,14 @@
         caption="No Tlp Pelapor"
         cell-template="formatText"
       />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="250"
+        alignment="center"
+        data-field="keterangan_pelapor"
+        caption="Keterangan Pelapor"
+        cell-template="formatText"
+      />
       <DxColumn
         css-class="custom-table-column"
         :width="170"
@@ -139,14 +147,7 @@
         caption="Petugas"
         cell-template="formatText"
       />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="170"
-        alignment="center"
-        data-field="keterangan_pelapor"
-        caption="Keterangan Pelapor"
-        cell-template="formatText"
-      />
+      
 
       <template #formatTime="{ data }">
         <p class="cursor-pointer !text-right">