diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php
index 002a117..6c58210 100644
--- a/app/Http/Controllers/RealisasiBelanjaController.php
+++ b/app/Http/Controllers/RealisasiBelanjaController.php
@@ -163,6 +163,7 @@ class RealisasiBelanjaController extends Controller
             $belanjaRealisasi = BelanjaRealisasi::create($input);
 
             if ($request["jenis_dana"] == "DAU"){
+                BelanjaRealisasiRinciDau::where("belanja_realisasi_id",$belanjaRealisasi->id)->delete();
                 foreach($request["dau"]["deskripsi"] as $k=>$dau){
                     $inputRinciDau["belanja_realisasi_id"] = $belanjaRealisasi->id;
                     $inputRinciDau["id_rinci_dau"] = $dau;
@@ -193,7 +194,9 @@ class RealisasiBelanjaController extends Controller
         $VwDpaRsk = VwDpaRsk::where("I_ID",$realisasi_belanja->kode_rsk)->first();
         $unitSatuan = UnitSatuan::orderBy("id")->get();
         $sps = Sps_pendapatan::select(DB::raw("ID,KODE_REKENING||' | '||NAMA_REKENING as name"))->where("ID", $realisasi_belanja->id_sps)->first();
-        return view('realisasi_belanja.edit', compact("realisasi_belanja","sps","unitSatuan","VwDpaRsk"));
+        $BelanjaRealisasiRinciDau = BelanjaRealisasiRinciDau::where("belanja_realisasi_id",$realisasi_belanja->id)->get();
+
+        return view('realisasi_belanja.edit', compact("realisasi_belanja","sps","unitSatuan","VwDpaRsk","BelanjaRealisasiRinciDau"));
     }
 
     public function update(Request $request, BelanjaRealisasi $realisasi_belanja)
@@ -213,6 +216,20 @@ class RealisasiBelanjaController extends Controller
             $input = $this->inputDataRealisasi($request);
             $realisasi_belanja->update($input);
 
+            if ($request["jenis_dana"] == "DAU"){
+                BelanjaRealisasiRinciDau::where("belanja_realisasi_id",$realisasi_belanja->id)->delete();
+                foreach($request["dau"]["deskripsi"] as $k=>$dau){
+                    $inputRinciDau["belanja_realisasi_id"] = $realisasi_belanja->id;
+                    $inputRinciDau["id_rinci_dau"] = $dau;
+                    $inputRinciDau["deskripsi"] = $request["dau"]["deskripsi_name"][$k];
+                    $inputRinciDau["jml_anggaran"] = replaceMoney($request["dau"]["anggaran"][$k]);
+                    $inputRinciDau["volume_satuan"] = $request["dau"]["volume"][$k];
+                    $inputRinciDau["unit_satuan"] = $request["dau"]["unit"][$k];
+
+                    BelanjaRealisasiRinciDau::create($inputRinciDau);
+                }
+            }
+
             DB::commit();
             return redirect(URL::to("/realisasi-belanja"))
                             ->with('success','Data Realisasi Belanja berhasil diubah!');
@@ -321,7 +338,7 @@ class RealisasiBelanjaController extends Controller
             $inputRinciDau["volume_satuan_realisasi"] = $request["dau"]["volume_realisasi"][$k];
             $inputRinciDau["unit_satuan_realisasi"] = $request["dau"]["unit_realisasi"][$k];
 
-            $BelanjaRealisasiRinciDau = BelanjaRealisasiRinciDau::where("id",$request["dau"]["id"]);
+            $BelanjaRealisasiRinciDau = BelanjaRealisasiRinciDau::where("id",$request["dau"]["id"][$k]);
             $BelanjaRealisasiRinciDau->update($inputRinciDau);
             $idSubmit = $BelanjaRealisasiRinciDau->first()->belanja_realisasi_id;
         }
diff --git a/public/js/app.js b/public/js/app.js
index 208e599..2524632 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -139,62 +139,6 @@ function separateNumberIndo(n){
   return new Intl.NumberFormat('id-ID').format(n)
 }
 
-calculate = () =>{
-  let gajiPokok = replaceValue($("#rincian_gaji_pokok").val());
-  let tunjangan_suami_istri = replaceValue($("#rincian_tunjangan_suami_istri").val());
-  let tunjangan_anak = replaceValue($("#rincian_tunjangan_anak").val());
-  let tunjangan_lain = replaceValue($("#rincian_tunjangan_lain").val());
-  let tunjangan_jabatan = replaceValue($("#rincian_tunjangan_jabatan").val());
-  let tunjangan_beras = replaceValue($("#rincian_tunjangan_beras").val());
-  let tunjangan_pph = replaceValue($("#rincian_tunjangan_pph").val());
-  let pembulatan = replaceValue($("#rincian_pembulatan").val());
-  let potongan_beras = replaceValue($("#rincian_potongan_beras").val());
-  let potongan_iuran_pfk = replaceValue($("#rincian_potongan_iuran_pfk").val());
-  let potongan_pph = replaceValue($("#rincian_potongan_pph").val());
-  let potongan_lain = replaceValue($("#rincian_potongan_lain").val());
-  //  console.log(gajiPokok);
-  let totGajiKotor = gajiPokok + tunjangan_suami_istri + tunjangan_anak + tunjangan_lain + tunjangan_jabatan + tunjangan_beras + tunjangan_pph + pembulatan;
-  let totPotongan = potongan_beras + potongan_iuran_pfk + potongan_pph + potongan_lain;
-  let totGajiBersih = totGajiKotor - totPotongan;
-  // console.log(totGajiBersih);
-  $("#rincian_total_potongan").val(separateNumberIndo(totPotongan));
-  $("#rincian_total_gaji_kotor").val(separateNumberIndo(totGajiKotor));
-  $("#rincian_total_gaji_bersih").val(separateNumberIndo(totGajiBersih));
-}
-
-$(document).on("change", ".calculate_field", function(){
-  calculate();
-});
-
-calculateDebt = () =>{
-  let total = 0;
-  if ($(".calculate_field_debt").length == 0){
-    $("#rincian_utang_total").val(0);
-    $("#rincian_utang_angsur").val(0);
-    $("#sisa_utang").val(0);
-    $(".uraian_debt").prop("required", false);
-  }else{
-    $(".calculate_field_debt").each(function(i,x){
-      let val = $($(".calculate_field_debt")[i]).val();
-      total += replaceValue(val);
-    });
-    
-    $("#rincian_utang_total").val(separateNumberIndo(total));
-
-    let totalUtang = replaceValue($("#rincian_utang_total").val());
-    let totalAngsur = replaceValue($("#rincian_utang_angsur").val());
-    $("#sisa_utang").val(separateNumberIndo(totalUtang - totalAngsur)); 
-    if (total > 0){
-      $(".uraian_debt").prop("required", true);
-    }
-  }
-}
-
-$(document).on("change", ".calculate_field_debt", function(){
-  calculateDebt();
-});
-
-
 $('.skpd_search').select2({
     placeholder: 'Pilih SKPD',
     ajax: {
diff --git a/resources/views/realisasi_belanja/create.blade.php b/resources/views/realisasi_belanja/create.blade.php
index 58a66c6..a2985a5 100644
--- a/resources/views/realisasi_belanja/create.blade.php
+++ b/resources/views/realisasi_belanja/create.blade.php
@@ -91,19 +91,21 @@
 
             $(document).on("submit","#frmRealBelanja",function (e){
                 e.preventDefault();
-                Swal.fire({
-                    title: 'Data akan disimpan?',
-                    showDenyButton: true,
-                    showCancelButton: false,
-                    confirmButtonText: 'Ya',
-                    denyButtonText: "Tidak",
-                    icon: "warning",
-                }).then((result) => {
-                    if (result.isConfirmed) {
-                        $("select[name=rsk]").attr("disabled", false);
-                        e.currentTarget.submit();
-                    }
-                })
+                if (cekInputDAU()){
+                    Swal.fire({
+                        title: 'Data akan disimpan?',
+                        showDenyButton: true,
+                        showCancelButton: false,
+                        confirmButtonText: 'Ya',
+                        denyButtonText: "Tidak",
+                        icon: "warning",
+                    }).then((result) => {
+                        if (result.isConfirmed) {
+                            $("select[name=rsk]").attr("disabled", false);
+                            e.currentTarget.submit();
+                        }
+                    })
+                }
             });
         });
     </script>
diff --git a/resources/views/realisasi_belanja/edit.blade.php b/resources/views/realisasi_belanja/edit.blade.php
index 3f1585f..6402c9f 100644
--- a/resources/views/realisasi_belanja/edit.blade.php
+++ b/resources/views/realisasi_belanja/edit.blade.php
@@ -94,20 +94,38 @@
             
             $(document).on("submit","#frmRealBelanja",function (e){
                 e.preventDefault();
-                Swal.fire({
-                    title: 'Data akan disimpan?',
-                    showDenyButton: true,
-                    showCancelButton: false,
-                    confirmButtonText: 'Ya',
-                    denyButtonText: "Tidak",
-                    icon: "warning",
-                }).then((result) => {
-                    $("select[name=rsk]").attr("disabled", false);
-                    if (result.isConfirmed) {
-                        e.currentTarget.submit();
-                    }
-                })
+                if (cekInputDAU()){
+                    Swal.fire({
+                        title: 'Data akan disimpan?',
+                        showDenyButton: true,
+                        showCancelButton: false,
+                        confirmButtonText: 'Ya',
+                        denyButtonText: "Tidak",
+                        icon: "warning",
+                    }).then((result) => {
+                        $("select[name=rsk]").attr("disabled", false);
+                        if (result.isConfirmed) {
+                            e.currentTarget.submit();
+                        }
+                    })
+                }
             });
+
+            let $newOpt = "";
+            <?php foreach($BelanjaRealisasiRinciDau as $k=>$rinciDau){ ?>
+                @php if ($k > 0){ @endphp
+                    $("#btnAddRinciDAU").click();
+                @php } @endphp
+                $($("input[name='dau[deskripsi_name][]']")[{{$k}}]).val("{{ $rinciDau->deskripsi }}");
+                $($("input[name='dau[anggaran][]']")[{{$k}}]).val("{{ separateNumberIndo($rinciDau->jml_anggaran) }}");
+                $($("input[name='dau[volume][]']")[{{$k}}]).val("{{ $rinciDau->volume_satuan }}");
+                $($("select[name='dau[unit][]']")[{{$k}}]).val("{{ $rinciDau->unit_satuan }}");
+
+                $newOpt = $("<option selected='selected'></option>").val("{{ $rinciDau->id }}").text("{{ $rinciDau->deskripsi }}")
+                $($("select[name='dau[deskripsi][]']")[{{$k}}]).val("{{ $rinciDau->id }}");
+                $($("select[name='dau[deskripsi][]']")[{{$k}}]).append($newOpt).trigger('change');
+            <?php } ?>
+
         });
     </script>
 @endsection
\ No newline at end of file
diff --git a/resources/views/realisasi_belanja/form.blade.php b/resources/views/realisasi_belanja/form.blade.php
index ba13957..e929d92 100644
--- a/resources/views/realisasi_belanja/form.blade.php
+++ b/resources/views/realisasi_belanja/form.blade.php
@@ -87,7 +87,7 @@
             <div class="col-2">
                 <div class="form-group">
                     <label class="col-form-label label-align">Anggaran</label>
-                    <input type="text" class="form-control form-control-sm number-separator-indo" name="dau[anggaran][]" required>
+                    <input type="text" class="form-control form-control-sm number-separator-indo anggaran-dau" name="dau[anggaran][]" required>
                 </div>
             </div>
             <div class="col-2">
@@ -128,6 +128,9 @@
 
         $(document).ready(function(){
 
+            $("#divDAU").hide();
+            $("#divDAU input, #divDAU select").prop("disabled", true);
+
             $('select[name=jenis]').on('select2:select', function (e) {
                 var data = e.params.data;
                 subJenisBelanja(data.id);
@@ -140,8 +143,10 @@
                 subJenisDana($(this).val());
                 jenisBelanja($(this).val());
                 $("#divDAU").hide();
+                $("#divDAU input").prop("disabled", true);
                 if ($(this).val()=="DAU"){
                     $("#divDAU").show();
+                    $("#divDAU input, #divDAU select").prop("disabled", false);
                 }
             })
 
@@ -163,7 +168,7 @@
                         <div class="col-2">
                             <div class="form-group">
                                 <label class="col-form-label label-align">Anggaran</label>
-                                <input type="text" class="form-control form-control-sm number-separator-indo" name="dau[anggaran][]" required>
+                                <input type="text" class="form-control form-control-sm number-separator-indo anggaran-dau" name="dau[anggaran][]" required>
                             </div>
                         </div>
                         <div class="col-2">
@@ -201,5 +206,21 @@
             })
 
         });
+
+
+        var cekInputDAU = function(){
+            if ($("#jenis_dana").val()=="DAU"){
+                let jmlAnggaran = 0;
+                for(let x=0;x<$(".anggaran-dau").length;x++){
+                    jmlAnggaran += parseFloat(replaceValue($($(".anggaran-dau")[x]).val()));
+                }
+
+                if (jmlAnggaran != parseFloat(replaceValue($("input[name=anggaran]").val()))){
+                    Swal.fire("Info","Jumlah Perincian tidak sama dengan Anggaran!","error")
+                    return false;
+                }
+            }
+            return true;
+        }
     </script>
 @endsection
\ No newline at end of file
diff --git a/resources/views/realisasi_belanja/submit.blade.php b/resources/views/realisasi_belanja/submit.blade.php
index 743a447..0cd565c 100644
--- a/resources/views/realisasi_belanja/submit.blade.php
+++ b/resources/views/realisasi_belanja/submit.blade.php
@@ -195,10 +195,6 @@
             });
 
             $("#divDAU").remove();
-
-            $(document).on("click","#btnSimpanDau",function(){
-                $("#frmDAU").submit();
-            });
         });
     </script>
 @endsection
\ No newline at end of file
diff --git a/resources/views/realisasi_belanja/submit_realisasi.blade.php b/resources/views/realisasi_belanja/submit_realisasi.blade.php
index 840a61f..d165230 100644
--- a/resources/views/realisasi_belanja/submit_realisasi.blade.php
+++ b/resources/views/realisasi_belanja/submit_realisasi.blade.php
@@ -82,9 +82,6 @@
             </div>
             <div class="tab-pane fade" id="custom-tabs-four-detail" role="tabpanel" aria-labelledby="custom-tabs-four-detail-tab">
                 <h5>Detail Per-bulan</h5>
-                <?php if (Auth::user()->can("Input Realisasi DBH Realisasi Belanja")){ ?>
-                    <a class="modalButton float-left" title="Input Rincian" href="{{ url('/realisasi-belanja/'.$BelanjaRealisasi->id.'/inputRealisasi?type=rinci&redirect_link=/realisasi-belanja/'.$BelanjaRealisasi->id.'/submit') }}"><i class="fa fa-paper-plane"></i> Input Rincian</a>
-                <?php } ?>
                 <table class="table table-striped">
                     <thead>
                         <tr>
@@ -110,6 +107,9 @@
                         </tr>
                     </tbody>
                 </table>
+                <?php if (Auth::user()->can("Input Realisasi DBH Realisasi Belanja")){ ?>
+                    <a class="modalButton btn btn-success mb-2" title="Input Rincian" href="{{ url('/realisasi-belanja/'.$BelanjaRealisasi->id.'/inputRealisasi?type=rinci&redirect_link=/realisasi-belanja/'.$BelanjaRealisasi->id.'/submit') }}"><i class="fa fa-paper-plane"></i> Input Rincian</a>
+                <?php } ?>
                 <hr>
                 <div id="detail_dau">
                     <h5>Detail DAU</h5>
@@ -133,17 +133,17 @@
                                     <tr>
                                         <td>{{ ($k+1) }}</td>
                                         <td>{{ $rinciDau->deskripsi }}</td>
-                                        <td>{{ number_format($rinciDau->jml_anggaran) }}</td>
+                                        <td>{{ separateNumberIndo($rinciDau->jml_anggaran) }}<input class="input_dau_anggaran" type="hidden" value="{{ $rinciDau->jml_anggaran }}"></td>
                                         <td>{{ $rinciDau->volume_satuan }}</td>
                                         <td>{{ $rinciDau->unit_satuan }}</td>
                                         <td>
                                             <input type="hidden" name="dau[id][]" value="{{ $rinciDau->id }}">
-                                            <input type="text" class="form-control form-control-sm" name="dau[realisasi][]" value="{{ $rinciDau->jml_realisasi }}">
+                                            <input type="text" class="form-control form-control-sm number-separator-indo input_dau input_dau_realisasi" name="dau[realisasi][]" value="{{ separateNumberIndo($rinciDau->jml_realisasi) }}">
                                         </td>
                                         <td>
-                                            <input type="text" class="form-control form-control-sm" name="dau[volume_realisasi][]" value="{{ $rinciDau->volume_satuan_realisasi }}"></td>
+                                            <input type="number" class="form-control form-control-sm input_dau" name="dau[volume_realisasi][]" value="{{ $rinciDau->volume_satuan_realisasi }}"></td>
                                         <td>                    
-                                            <select name="dau[unit_realisasi][]" class="form-control form-control-sm " required placeholder="Unit Realisasi">
+                                            <select name="dau[unit_realisasi][]" class="form-control form-control-sm input_dau" required placeholder="Unit Realisasi">
                                                 <?php foreach($unitSatuan as $satuan){ ?>
                                                     <option value="{{ $satuan->nama_satuan }}" {{ $rinciDau->unit_satuan_realisasi == $satuan->nama_satuan?"selected":"" }}>{{ $satuan->nama_satuan }}</option>    
                                                 <?php } ?>
@@ -154,9 +154,55 @@
                             </tbody>
                         </table>
                     </form>
-                    <button id="btnSimpanDau" type="button" class="btn btn-success">Simpan Data</button>
+                    <button id="btnSimpanDau" type="button" class="btn btn-success"><i class="fa fa-save"></i> Simpan Data</button>
                 </div>
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+<script type="text/javascript">
+    $(document).ready(function(){
+
+        $(document).on("click","#btnSimpanDau",function(){
+            let cancel = false;
+            let msg="";
+            for(let x=0;x<$(".input_dau").length;x++){
+                if ($($(".input_dau")[x]).val()==""){
+                    cancel = true;
+                    msg = "Input masih ada yang kosong!";
+                }
+            }
+          
+            for(let x=0;x<$(".input_dau_realisasi").length;x++){
+                if ($($(".input_dau_anggaran")[x]).val()<parseFloat(replaceValue($($(".input_dau_realisasi")[x]).val()))){
+                    msg = "Jumlah Perincian tidak sama atau kurang dengan Anggaran!";
+                    cancel = true;
+                }
+            }
+
+            if (cancel){
+                Swal.fire("Info",msg,"error")
+            }else{
+                Swal.fire({
+                    title: 'Detail Rinci DAU akan disimpan?',
+                    showDenyButton: true,
+                    showCancelButton: false,
+                    confirmButtonText: 'Ya',
+                    denyButtonText: "Tidak",
+                    icon: "warning",
+                }).then((result) => {
+                    if (result.isConfirmed) {
+                        $("#frmDAU").submit();
+                    }
+                })            
+            }
+
+        });
+
+        <?php if (!Auth::user()->can("Input Realisasi DBH Realisasi Belanja")){ ?>
+            $(".input_dau").attr("disabled", true);
+            $("#btnSimpanDau").remove();
+        <?php } ?>
+
+    });
+</script>
\ No newline at end of file