diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php
index 4dd9902..430cdba 100644
--- a/app/Http/Controllers/RealisasiBelanjaController.php
+++ b/app/Http/Controllers/RealisasiBelanjaController.php
@@ -9,6 +9,7 @@ use Illuminate\Support\Facades\Auth;
 use Maatwebsite\Excel\Facades\Excel;
 use App\Models\DbhBelanjaRealisasi;
 use App\Models\TempRealisasiBelanja;
+use App\Models\UnitSatuan;
 use App\Imports\RealisasiBelanjaImport;
 
 class RealisasiBelanjaController extends Controller
@@ -215,8 +216,29 @@ class RealisasiBelanjaController extends Controller
         return view('realisasi_belanja.upload');
     }
 
-    public function inputRealisasi()
+    public function inputRealisasi(Request $request, $id)
     {
-        return view('realisasi_belanja.form_input_realisasi');
+        $DbhBelanjaRealisasi = DbhBelanjaRealisasi::where("id", $id)->firstOrNew(); 
+        $req = $request->all();
+        $redirect = isset($req["redirect_link"])?$req["redirect_link"]:"realisasi-belanja";
+        if ($request->isMethod('post')) {
+            try{
+                DB::beginTransaction();
+                $data["volume_satuan_realisasi"] = $req["vol_realisasi"];
+                $data["unit_satuan_realisasi"] = $req["unit_realisasi"];
+                $data["realisasi_by"] = Auth::user()->id;
+                $DbhBelanjaRealisasi->update($data);
+                DB::commit();
+    
+                return redirect($redirect)->with('success','Data Realisasi berhasil di input!');
+            }catch(\Exception $e){
+                throw new \Exception($e->getMessage());
+                DB::rollBack();
+                return redirect($redirect)->with('error',$e->getMessage());
+            }
+        }
+
+        $unitSatuan = UnitSatuan::orderBy("id")->get();
+        return view('realisasi_belanja.form_input_realisasi',compact("DbhBelanjaRealisasi", "unitSatuan","redirect"));
     }
 }
diff --git a/resources/views/realisasi_belanja/form_input_realisasi.blade.php b/resources/views/realisasi_belanja/form_input_realisasi.blade.php
index 643c85b..70263d1 100644
--- a/resources/views/realisasi_belanja/form_input_realisasi.blade.php
+++ b/resources/views/realisasi_belanja/form_input_realisasi.blade.php
@@ -1,22 +1,30 @@
-<form id="frmInputRealisasi" action="{{ url('realisasi-belanja/inputRealisasi') }}" method="POST" autocomplete="off">
+<form id="frmInputRealisasi" action="{{ url('realisasi-belanja/'.$DbhBelanjaRealisasi->id.'/inputRealisasi') }}" method="POST" autocomplete="off">
     @csrf
     <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12">
             <div class="form-group">
                 <label>Rinci Sub Kegiatan</label>
-                <input type="text" id="rsk_realisasi" required class="form-control" name="rsk_realisasi" disabled>
+                <input type="hidden" value="{{ $redirect }}" name="redirect_link">
+                <input type="hidden" value="{{ $DbhBelanjaRealisasi->nama_rsk }}" name="id_rsk">
+                <textarea type="text" id="rsk_realisasi" rows=4 required class="form-control" name="rsk_realisasi" disabled>{{ $DbhBelanjaRealisasi->nama_rsk }}</textarea>
             </div>
         </div>
-        <div class="col-xs-12 col-sm-12 col-md-12">
+        <div class="col-xs-6 col-sm-6 col-md-6">
             <div class="form-group">
-                <label>Volume</label>
-                <input type="text" id="vol_realisasi" required class="form-control" name="vol_realisasi" placeholder="Volume Realisasi">
+                <?php $volSatuan = empty($DbhBelanjaRealisasi->volume_satuan_realisasi) ? $DbhBelanjaRealisasi->volume_satuan: $DbhBelanjaRealisasi->volume_satuan_realisasi; ?>
+                <label>Volume Realisasi</label>
+                <input type="number" id="vol_realisasi" required class="form-control" name="vol_realisasi" value="{{ $volSatuan }}" placeholder="Volume Realisasi">
             </div>
         </div>
-        <div class="col-xs-12 col-sm-12 col-md-12">
+        <div class="col-xs-6 col-sm-6 col-md-6">
             <div class="form-group">
-                <label>Unit</label>
-                <input type="text" id="unit_realisasi" required class="form-control" name="unit_realisasi" placeholder="Unit Realisasi">
+                <label>Unit Realisasi</label>
+                <select id="unit_realisasi" name="unit_realisasi" class="form-control" required placeholder="Unit Realisasi">
+                    <?php $unitSatuanVal = empty($DbhBelanjaRealisasi->unit_satuan_realisasi) ? $DbhBelanjaRealisasi->unit_satuan: $DbhBelanjaRealisasi->unit_satuan_realisasi; ?>
+                    <?php foreach($unitSatuan as $satuan){ ?>
+                        <option {{ $unitSatuanVal == $satuan->nama_satuan ? "selected":"" }}>{{ $satuan->nama_satuan }}</option>    
+                    <?php } ?>
+                </select>    
             </div>
         </div>
         <div class="col-xs-12 col-sm-12 col-md-12">
diff --git a/resources/views/realisasi_belanja/index.blade.php b/resources/views/realisasi_belanja/index.blade.php
index 7ca309b..991fb2f 100644
--- a/resources/views/realisasi_belanja/index.blade.php
+++ b/resources/views/realisasi_belanja/index.blade.php
@@ -48,11 +48,28 @@
             <tr class="headings">
                 <th>No</th>
                 <?php 
-                    $arrCol = array("Tahun", "Jenis", "Sub Jenis", "Kode Program", 
-                    "Nama Program", "Kode SKPD", "Nama SKPD", "Kode Kegiatan", "Nama Kegiatan", "Kode Sub Kegiatan", 
-                    "Nama Sub Kegiatan", "Kode RSK", "Nama RSK", 
-                    // "Kode Rek", "Nama Rek", 
-                    "Anggaran", "Volume", "Unit","Volume Realisasi", "Unit Realisasi");
+                    $arrCol = array(
+                        // "Tahun", 
+                        // "Jenis", 
+                        // "Sub Jenis", 
+                        // "Kode Program", 
+                        // "Nama Program", 
+                        // "Kode SKPD", 
+                        // "Nama SKPD", 
+                        // "Kode Kegiatan", 
+                        // "Nama Kegiatan", 
+                        // "Kode Sub Kegiatan", 
+                        // "Nama Sub Kegiatan", 
+                        // "Kode RSK", 
+                        "Nama RSK", 
+                        // "Kode Rek", "Nama Rek", 
+                        "Anggaran", 
+                        "Volume", 
+                        "Unit",
+                        "Volume Realisasi", 
+                        "Unit Realisasi",
+                        "Aksi"
+                    );
                     foreach($arrCol as $rowCol){
                         echo "<th>$rowCol</th>";
                     }
@@ -81,10 +98,10 @@
         $(document).ready(function(){
             var srcDate1 = null, srcDate2 = null;
 
-            $('#tblRealisasi tbody').on('click', 'tr', function () {
-                var data = dtTable.row( this ).data();
-                location.href = "/realisasi-belanja/" + data["id"] +"/submit";
-            });
+            // $('#tblRealisasi tbody').on('click', 'tr', function () {
+            //     var data = dtTable.row( this ).data();
+            //     location.href = "/realisasi-belanja/" + data["id"] +"/submit";
+            // });
 
             $("#src").keyup(function(e){
                 if (e.keyCode == 13){
@@ -122,18 +139,18 @@
                 "paging": true, // Table pagination
                 "columns": [
                     { "data": null},
-                    { "data": "tahun_anggaran", "width": "400px" },
-                    { "data": "jenis_belanja", "className":"text-left","defaultContent":"-" },                    
-                    { "data": "sub_jenis_belanja", "className":"text-left", "defaultContent":"-" },  
-                    { "data": "kode_program", "className":"text-center", "defaultContent":"-" },  
-                    { "data": "nama_program", "className":"text-left", "defaultContent":"-" },  
-                    { "data": "kode_skpd", "className":"text-center", "defaultContent":"-" },  
-                    { "data": "nama_skpd", "className":"text-left", "defaultContent":"-" },  
-                    { "data": "kode_kegiatan", "className":"text-center", "defaultContent":"-" },  
-                    { "data": "nama_kegiatan", "className":"text-left", "defaultContent":"-" },  
-                    { "data": "kode_sub_kegiatan", "className":"text-center", "defaultContent":"-" },  
-                    { "data": "nama_sub_kegiatan", "className":"text-left", "defaultContent":"-" },  
-                    { "data": "kode_rsk", "className":"text-center", "defaultContent":"-" },  
+                    // { "data": "tahun_anggaran", "width": "400px" },
+                    // { "data": "jenis_belanja", "className":"text-left","defaultContent":"-" },                    
+                    // { "data": "sub_jenis_belanja", "className":"text-left", "defaultContent":"-" },  
+                    // { "data": "kode_program", "className":"text-center", "defaultContent":"-" },  
+                    // { "data": "nama_program", "className":"text-left", "defaultContent":"-" },  
+                    // { "data": "kode_skpd", "className":"text-center", "defaultContent":"-" },  
+                    // { "data": "nama_skpd", "className":"text-left", "defaultContent":"-" },  
+                    // { "data": "kode_kegiatan", "className":"text-center", "defaultContent":"-" },  
+                    // { "data": "nama_kegiatan", "className":"text-left", "defaultContent":"-" },  
+                    // { "data": "kode_sub_kegiatan", "className":"text-center", "defaultContent":"-" },  
+                    // { "data": "nama_sub_kegiatan", "className":"text-left", "defaultContent":"-" },  
+                    // { "data": "kode_rsk", "className":"text-center", "defaultContent":"-" },  
                     { "data": "nama_rsk", "className":"text-left", "defaultContent":"-", "width":300 },  
                     // { "data": "kode_rekening", "className":"text-center", "defaultContent":"-" },  
                     // { "data": "nama_rekening", "className":"text-left", "defaultContent":"-" },  
@@ -141,7 +158,8 @@
                     { "data": "volume_satuan", "className":"text-center", "defaultContent":"0" },  
                     { "data": "unit_satuan", "className":"text-center", "defaultContent":"-" },  
                     { "data": "volume_satuan_realisasi", "className":"text-center", "defaultContent":"0" },  
-                    { "data": "unit_satuan_realisasi", "className":"text-center", "defaultContent":"-" },  
+                    { "data": "unit_satuan_realisasi", "className":"text-center", "defaultContent":"-" },
+                    { "data": null}  
                 ],
                 "rowCallback": function(nRow, aData, iDisplayIndex, iDisplayIndexFull, oSettings) {
                     let info = dtTable.page.info();
@@ -149,8 +167,10 @@
                     let index = (numStart * dtTable.page.len()) + iDisplayIndex + 1;
 
                     $("td:eq(0)", nRow).html(index);
-                    $("td:eq(14)", nRow).html(separateNumberIndo(aData["jumlah_anggaran"]));
-
+                    $("td:eq(2)", nRow).html(separateNumberIndo(aData["jumlah_anggaran"]));
+                    $("td:eq(7)", nRow).html('<a href="/realisasi-belanja/' + aData["id"] +'/submit" class="btn btn-sm btn-default mr-2"><i class="fa fa-eye"></i></a>'+
+                                '<a class="btn btn-sm btn-success modalButton" title="Input Realisasi" href="/realisasi-belanja/'+aData["id"]+'/inputRealisasi"><i class="fa fa-paper-plane"></i> Input Realisasi</a>');
+                    
                     return nRow;
                 },
                 "language": {
diff --git a/resources/views/realisasi_belanja/submit.blade.php b/resources/views/realisasi_belanja/submit.blade.php
index db95f87..9875126 100644
--- a/resources/views/realisasi_belanja/submit.blade.php
+++ b/resources/views/realisasi_belanja/submit.blade.php
@@ -37,7 +37,7 @@
                 <label class="col-form-label label-align" for="sk">Unit Realisasi</label>
                 <input type="text" class="form-control" name="unit_realisasi" disabled>
             </div>
-            <a class="btn btn-success modalButton" title="Input Realisasi" href="{{ url('/realisasi-belanja/'.$DbhBelanjaRealisasi->id.'/inputRealisasi') }}"><i class="fa fa-paper-plane"></i> Input Realisasi</a>
+            <a class="btn btn-success modalButton" title="Input Realisasi" href="{{ url('/realisasi-belanja/'.$DbhBelanjaRealisasi->id.'/inputRealisasi?redirect_link=/realisasi-belanja/'.$DbhBelanjaRealisasi->id.'/submit') }}"><i class="fa fa-paper-plane"></i> Input Realisasi</a>
         </div>
     </div>
 @endsection
@@ -77,10 +77,12 @@
 
             $("input[name=anggaran]").val("{{ separateNumberIndo($DbhBelanjaRealisasi->jumlah_anggaran) }}");
             $("input[name=anggaran]").attr("readonly", true);
-            $("input[name=vol]").val("{{ isset($DbhBelanjaRealisasi->vol_satuan)?$DbhBelanjaRealisasi->vol_satuan:0 }}");
+            $("input[name=vol]").val("{{ isset($DbhBelanjaRealisasi->volume_satuan)?$DbhBelanjaRealisasi->volume_satuan:0 }}");
             $("input[name=vol]").attr("readonly", true);
             $("input[name=unit]").val("{{ $DbhBelanjaRealisasi->unit_satuan }}");
             $("input[name=unit]").attr("readonly", true);
+            $("input[name=vol_realisasi]").val("{{ isset($DbhBelanjaRealisasi->volume_satuan_realisasi)?$DbhBelanjaRealisasi->volume_satuan_realisasi:0 }}");
+            $("input[name=unit_realisasi]").val("{{ isset($DbhBelanjaRealisasi->unit_satuan_realisasi)?$DbhBelanjaRealisasi->unit_satuan_realisasi:0 }}");
         });
     </script>
 @endsection
\ No newline at end of file
diff --git a/resources/views/realisasi_pendapatan/show.blade.php b/resources/views/realisasi_pendapatan/show.blade.php
index 6b0019c..fee1328 100644
--- a/resources/views/realisasi_pendapatan/show.blade.php
+++ b/resources/views/realisasi_pendapatan/show.blade.php
@@ -38,7 +38,7 @@
                 <div class="form-group row">
                     <label class="col-form-label col-md-3 col-sm-3 label-align" for="rkud_tgl">Tanggal</label>
                     <div class="col-md-9 col-sm-9 ">
-                        <input id="rkud_tgl" name="rkud_tgl" class="form-control" value="{{ $realisasi_pendapatan->rkud_tgl }}" readonly>
+                        <input id="rkud_tgl" name="rkud_tgl" class="form-control" value="{{ isset($realisasi_pendapatan->rkud_tgl)?date("Y-m-d",strtotime($realisasi_pendapatan->rkud_tgl)):"" }}" readonly>
                     </div>
                 </div>
                 <div class="form-group row">