diff --git a/src/views/drp/drp-penyusunan.vue b/src/views/drp/drp-penyusunan.vue
index a05fc0d..8322c21 100644
--- a/src/views/drp/drp-penyusunan.vue
+++ b/src/views/drp/drp-penyusunan.vue
@@ -5,7 +5,7 @@
     <div class="content-block">
       <div class="dx-card responsive-paddings">
         <div id="app-container">
-          <DxPopup
+          <Popup
             v-model:visible="popupVisible"
             :drag-enabled="false"
             :hide-on-outside-click="true"
@@ -41,94 +41,209 @@
             <template #content>
               <div class="dx-fieldset">
                 <div class="dx-field">
-                  <div class="dx-field-label">Image as the icon</div>
+                  <div class="dx-field-label">Tahun DRP</div>
                   <div class="dx-field-value">
                     <DxSelectBox
                       :data-source="dropdown"
                       drop-down-button-template="imageIcon"
                     >
                       <template #imageIcon="{}">
-                        <img
+                        <!-- <img
                           src="images/icons/custom-dropbutton-icon.svg"
                           class="custom-icon"
-                        />
+                        /> -->
                       </template>
                     </DxSelectBox>
                   </div>
                 </div>
               </div>
-              <DxScrollView width="100%" height="100%">
-                <div class="label">Options</div>
-                <DxDataGrid
-                  ref="currDataGrid"
-                  :data-source="dataSource"
-                  key-expr="id"
-                  :allow-column-reordering="true"
-                  :column-auto-width="true"
-                >
-                  <DxEditing
-                    :allow-adding="true"
-                    :use-icons="true"
-                    mode="popup"
-                  >
-                    <DxTexts
-                      add-row="Tambah"
-                      edit-row="Ubah"
-                      delete-row="Hapus"
-                      confirm-delete-message="Apakah anda yakin untuk menghapus data ini?"
-                      save-row-changes="Simpan"
-                      cancel-row-changes="Batal"
-                    ></DxTexts>
-                    <DxForm label-location="top" :col-count="1">
-                      <DxItem dataField="tahun">
-                        <DxRequiredRule message="Tahun harus diisi" />
-                      </DxItem>
-                    </DxForm>
-                  </DxEditing>
-                  <DxToolbar>
-                    <DxItem name="groupPanel" />
-                    <DxItem name="searchPanel" location="before" />
-                    <DxItem name="addRowButton" show-text="always" css-class="">
-                      <DxTexts add-row="Tambah"></DxTexts>
-                    </DxItem>
-                    <DxItem name="exportButton" />
-                    <DxItem name="columnChooserButton" />
-                  </DxToolbar>
-                  <DxFilterRow :visible="false" />
-                  <DxColumn
-                    cell-template="row-cell-template"
-                    caption="No"
-                    :width="45"
-                  ></DxColumn>
-                  <DxColumn
-                    data-field=""
-                    caption="Jenis Dokumen"
-                    alignment="left"
-                  ></DxColumn>
-                  <DxColumn data-field="" caption="File"> </DxColumn>
-                  <DxColumn data-field="" caption="Keterangan"></DxColumn>
-                  <DxColumn type="buttons" caption="Aksi">
-                    <DxButton
-                      text="Dokumen"
-                      icon="edit"
-                      hint="Dokumen Pendukung DRP"
-                      on-click=""
-                    />
-                    <DxButton
-                      text="Detil"
-                      icon="trash"
-                      hint="Detil/Konten DRP "
-                      on-click=""
-                    />
-                  </DxColumn>
-                  <template #row-cell-template="{ data }">
-                    {{ data.rowIndex + 1 }}
-                  </template>
-                </DxDataGrid>
-                <div id="textBlock"> </div>
+              <DxScrollView width="100%" height="100%" padding="100px">
+                <div id="textBlock">
+                  <div>
+                    <div class="dx-fieldset-header">Dokumen RKAP *</div>
+                    <DxDataGrid
+                      ref="currDataGrid"
+                      :data-source="dataDrpDokumen"
+                      key-expr="id"
+                      :allow-column-reordering="true"
+                      :column-auto-width="true"
+                    >
+                      <DxEditing
+                        :allow-adding="true"
+                        :use-icons="true"
+                        mode="popup"
+                      >
+                        <DxTexts
+                          add-row="Tambah"
+                          edit-row="Ubah"
+                          delete-row="Hapus"
+                          confirm-delete-message="Apakah anda yakin untuk menghapus data ini?"
+                          save-row-changes="Simpan"
+                          cancel-row-changes="Batal"
+                        ></DxTexts>
+                        <DxForm label-location="top" :col-count="1">
+                          <DxItem dataField="tahun">
+                            <DxRequiredRule message="Tahun harus diisi" />
+                          </DxItem>
+                        </DxForm>
+                        <DxPopup
+                          :hide-on-outside-click="true"
+                          :show-title="true"
+                          :width="400"
+                          :height="400"
+                          title="Form Jenis Pengadaan"
+                        >
+                          <DxPosition
+                            at="center"
+                            my="center"
+                            v-model:of="positionOf"
+                            collision="fit"
+                          />
+                        </DxPopup>
+                      </DxEditing>
+                      <DxToolbar>
+                        <DxItem name="groupPanel" />
+                        <DxItem name="searchPanel" location="before" />
+                        <DxItem
+                          name="addRowButton"
+                          show-text="always"
+                          css-class=""
+                        >
+                          <DxTexts add-row="Tambah"></DxTexts>
+                        </DxItem>
+                        <DxItem name="exportButton" />
+                        <DxItem name="columnChooserButton" />
+                      </DxToolbar>
+                      <DxFilterRow :visible="false" />
+                      <DxColumn
+                        cell-template="row-cell-template"
+                        caption="No"
+                        :width="45"
+                      ></DxColumn>
+                      <DxColumn
+                        data-field="jenisDokumenId"
+                        caption="Jenis Dokumen"
+                        alignment="left"
+                      ></DxColumn>
+                      <DxColumn data-field="filename" caption="File">
+                      </DxColumn>
+                      <DxColumn
+                        data-field="keterangan"
+                        caption="Keterangan"
+                      ></DxColumn>
+                      <DxColumn type="buttons" caption="Aksi">
+                        <DxButton
+                          text="Dokumen"
+                          icon="edit"
+                          hint="Dokumen Pendukung DRP"
+                        />
+                        <DxButton
+                          text="Detil"
+                          icon="trash"
+                          hint="Detil/Konten DRP "
+                        />
+                      </DxColumn>
+                      <template #row-cell-template="{ data }">
+                        {{ data.rowIndex + 1 }}
+                      </template>
+                    </DxDataGrid>
+
+                    <div class="dx-fieldset-header">Dokumen Pendukung *</div>
+                    <DxDataGrid
+                      ref="currDataGrid"
+                      :data-source="dataDrpDokumenPendukung"
+                      key-expr="id"
+                      :allow-column-reordering="true"
+                      :column-auto-width="true"
+                    >
+                      <DxEditing
+                        :allow-adding="true"
+                        :use-icons="true"
+                        mode="popup"
+                      >
+                        <DxTexts
+                          add-row="Tambah"
+                          edit-row="Ubah"
+                          delete-row="Hapus"
+                          confirm-delete-message="Apakah anda yakin untuk menghapus data ini?"
+                          save-row-changes="Simpan"
+                          cancel-row-changes="Batal"
+                        ></DxTexts>
+                        <DxForm label-location="top" :col-count="1">
+                          <DxItem dataField="tahun">
+                            <DxRequiredRule message="Tahun harus diisi" />
+                          </DxItem>
+                        </DxForm>
+                        <DxPopup
+                          :hide-on-outside-click="true"
+                          :show-title="true"
+                          :width="400"
+                          :height="400"
+                          title="Form Jenis Pengadaan"
+                        >
+                          <DxPosition
+                            at="center"
+                            my="center"
+                            v-model:of="positionOf"
+                            collision="fit"
+                          />
+                        </DxPopup>
+                      </DxEditing>
+                      <DxToolbar>
+                        <DxItem name="groupPanel" />
+                        <DxItem name="searchPanel" location="before" />
+                        <DxItem
+                          name="addRowButton"
+                          show-text="always"
+                          css-class=""
+                        >
+                          <DxTexts add-row="Tambah"></DxTexts>
+                        </DxItem>
+                        <DxItem name="exportButton" />
+                        <DxItem name="columnChooserButton" />
+                      </DxToolbar>
+                      <DxFilterRow :visible="false" />
+                      <DxColumn
+                        cell-template="row-cell-template"
+                        caption="No"
+                        :width="45"
+                      ></DxColumn>
+
+                      <DxColumn
+                        data-field="jenisDokumenId"
+                        caption="Jenis Dokumen"
+                        alignment="left"
+                      >
+                        <DxLookup
+                          display-expr="name"
+                          value-expr="value"
+                          :data-source="jenisDokumen"
+                        />
+                      </DxColumn>
+                      <DxColumn data-field="filename" caption="File">
+                      </DxColumn>
+                      <DxColumn data-field="" caption="Keterangan"></DxColumn>
+                      <DxColumn type="buttons" caption="Aksi">
+                        <DxButton
+                          text="Dokumen"
+                          icon="edit"
+                          hint="Dokumen Pendukung DRP"
+                        />
+                        <DxButton
+                          text="Detil"
+                          icon="trash"
+                          hint="Detil/Konten DRP "
+                        />
+                      </DxColumn>
+                      <template #row-cell-template="{ data }">
+                        {{ data.rowIndex + 1 }}
+                      </template>
+                    </DxDataGrid>
+                  </div>
+                </div>
               </DxScrollView>
             </template>
-          </DxPopup>
+          </Popup>
 
           <DxDataGrid
             ref="currDataGrid"
@@ -151,6 +266,20 @@
                   <DxRequiredRule message="Tahun harus diisi" />
                 </DxItem>
               </DxForm>
+              <DxPopup
+                :hide-on-outside-click="true"
+                :show-title="true"
+                :width="400"
+                :height="400"
+                title="Form Jenis Pengadaan"
+              >
+                <DxPosition
+                  at="center"
+                  my="center"
+                  v-model:of="positionOf"
+                  collision="fit"
+                />
+              </DxPopup>
             </DxEditing>
             <DxToolbar>
               <DxItem name="groupPanel" />
@@ -185,14 +314,8 @@
             <DxColumn
               data-field="approveStatus"
               caption="Status Approve"
-              editor-type="dxCheckBox"
-            >
-              <DxLookup
-                display-expr="name"
-                value-expr="value"
-                :data-source="approveStatus"
-              />
-            </DxColumn>
+              alignment="left"
+            ></DxColumn>
             <DxColumn
               data-field="approveDate"
               caption="Tanggal Approve"
@@ -252,9 +375,14 @@ import DxDataGrid, {
   DxButton,
   DxRequiredRule,
   DxLookup,
+  DxPopup,
 } from "devextreme-vue/data-grid";
 import CustomStore from "devextreme/data/custom_store";
-import { DxPopup, DxToolbarItem, DxPosition } from "devextreme-vue/popup";
+import {
+  DxPopup as Popup,
+  DxToolbarItem,
+  DxPosition,
+} from "devextreme-vue/popup";
 import { DxScrollView } from "devextreme-vue/scroll-view";
 import { DxSelectBox } from "devextreme-vue/select-box";
 
@@ -313,6 +441,52 @@ const dataSource = new CustomStore({
   },
 });
 
+// const dataDrpDokumen = new CustomStore({
+//   key: "id",
+//   load: (key) => {
+//     return fetch(URL + "/" + encodeURIComponent(key) + "?size=100")
+//       .then((response) => response.json())
+//       .then((response) => {
+//         console.log("res", response.dataDrpDokumen);
+//         console.log("key: ", key);
+//         return {
+//           data: response.dataDrpDokumen,
+//         };
+//       })
+//       .catch(() => {
+//         throw new Error("Terdapat kesalahan memuat data");
+//       });
+//   },
+
+//   insert: (values) => {
+//     return fetch(URL, {
+//       method: "POST",
+//       body: JSON.stringify(values),
+//       headers: {
+//         "Content-Type": "application/json",
+//       },
+//     });
+//   },
+
+//   update: (key, values) => {
+//     return fetch(URL + "/" + encodeURIComponent(key), {
+//       method: "PUT",
+//       body: JSON.stringify(values),
+//       headers: {
+//         "Content-Type": "applicatoin/json",
+//       },
+//     });
+//   },
+
+//   remove: (key) => {
+//     return fetch(URL + "/" + encodeURIComponent(key), {
+//       method: "DELETE",
+//     });
+//   },
+// });
+let dataDrpDokumen = [];
+let dataDrpDokumenPendukung = [];
+
 export default {
   setup() {
     return {
@@ -334,25 +508,36 @@ export default {
     DxButton,
     DxRequiredRule,
     DxLookup,
-    DxScrollView,
     DxPopup,
+    DxScrollView,
+    Popup,
     DxToolbarItem,
     DxPosition,
     DxSelectBox,
   },
   methods: {
     linkDokumen($event) {
-      console.log("event: ", $event.row.values);
+      fetch(URL + "/" + $event.row.data.id)
+        .then((response) => response.json())
+        .then((response) => {
+          return (
+            (this.dataDrpDokumen = response.dataDrpDokumen),
+            (this.dataDrpDokumenPendukung = response.dataDrpDokumenPendukung)
+          );
+        })
+        .catch(() => {
+          throw new Error("Terdapat kesalahan memuat data");
+        });
+      // dataDrpDokumen.key($event.row.data.id)
+      // dataDrpDokumen.load($event.row.data.id);
+
       this.popupVisible = true;
       this.popupTitle = "Upload Dokumen Pendukung";
-      this.dataDrp = $event.row.values;
       this.isShowButton = true;
-      console.log("drp: ", this.dataDrp);
     },
-    linkDetail($event) {
+    linkDetail() {
       this.popupVisible = true;
       this.popupTitle = "Lihat Dokumen Pendukung";
-      this.dataDrp = $event.row.values.target;
       this.isShowButton = false;
     },
   },
@@ -363,17 +548,18 @@ export default {
       dropdown: "",
       popupVisible: false,
       popupTitle: "",
-      dataDrp: "",
       isShowButton: true,
+      dataDrpDokumen,
+      dataDrpDokumenPendukung,
       saveButtonOptions: {
-        text: "SIMPAN",
+        text: "Simpan",
         onClick: () => {
           this.popupVisible = false;
           console.log("simpan");
         },
       },
       closeButtonOptions: {
-        text: "BATAL",
+        text: "Batal",
         onClick: () => {
           this.popupVisible = false;
         },
@@ -393,4 +579,17 @@ export default {
 .dx-link.dx-icon-movetofolder.dx-link-icon {
   color: #0996c2;
 }
+.dx-scrollable {
+  padding-bottom: 50px;
+}
+.dx-field {
+  display: flex;
+  flex-direction: column;
+}
+.dx-fieldset-header {
+  position: relative;
+  margin-bottom: -30px;
+  z-index: 20;
+  width: fit-content;
+}
 </style>