diff --git a/src/components/pages/PanelAdministrator.vue b/src/components/pages/PanelAdministrator.vue index be0e56a506bbf6dff81a265e88a4432ccd2368db..1caa8081e54a5906c7cb3fc8ccf3329d3609a87e 100644 --- a/src/components/pages/PanelAdministrator.vue +++ b/src/components/pages/PanelAdministrator.vue @@ -62,42 +62,8 @@ export default { tabIndexInner: 0, fields: ['urusan', 'admin', 'aksi'], urusan : [ - { judul: "Pendapatan", url: "" }, - { judul: "Pembiayaan", url: "" }, - { judul: "Biaya Langsung", url: "" }, - { judul: "Biaya Tidak Langsung", url: "" }, ], items : [ - { urusan: 'Biaya Langsung', admin: 'Rifo Ahmad Genadi'}, - { urusan: 'Biaya Tak Langsung', admin: 'David Timothy Panjaitan'}, - { urusan: 'Pembiayaan', admin: '-'}, - { urusan: 'Pendapatan', admin: '-'}, - { urusan: 'A', admin: 'Rifo Ahmad Genadi'}, - { urusan: 'B', admin: 'David Timothy Panjaitan'}, - { urusan: 'C', admin: '-'}, - { urusan: 'D', admin: '-'}, - { urusan: 'E', admin: 'Rifo Ahmad Genadi'}, - { urusan: 'F', admin: 'David Timothy Panjaitan'}, - { urusan: 'G', admin: '-'}, - { urusan: 'H', admin: '-'}, - { urusan: 'I', admin: 'Rifo Ahmad Genadi'}, - { urusan: 'J', admin: 'David Timothy Panjaitan'}, - { urusan: 'K', admin: '-'}, - { urusan: 'L', admin: '-'}, - { urusan: 'M', admin: 'Rifo Ahmad Genadi'}, - { urusan: 'N', admin: 'David Timothy Panjaitan'}, - { urusan: 'O', admin: '-'}, - { urusan: 'P', admin: '-'}, - { urusan: 'Q', admin: 'Rifo Ahmad Genadi'}, - { urusan: 'R', admin: 'David Timothy Panjaitan'}, - { urusan: 'S', admin: '-'}, - { urusan: 'T', admin: '-'}, - { urusan: 'U', admin: 'Rifo Ahmad Genadi'}, - { urusan: 'V', admin: 'David Timothy Panjaitan'}, - { urusan: 'W', admin: '-'}, - { urusan: 'X', admin: '-'}, - { urusan: 'Y', admin: 'Rifo Ahmad Genadi'}, - { urusan: 'Z', admin: 'David Timothy Panjaitan'}, ], options: [ ], @@ -106,15 +72,15 @@ export default { currentPage: 1, fields : { activity_name : { - label : 'Activity Name', + label : 'Urusan', sortable : true, }, admin_name : { - label : 'Admin Name', + label : 'Admin', sortable : true, }, actions : { - label : 'Actions' + label : 'Aksi' } }, current_item: { diff --git a/src/components/partials/TableBudget.vue b/src/components/partials/TableBudget.vue index aa35009c45437afd07b4ad9863745aae20f1a95a..041c4ad3e78485c3a1ab7f1cf563c942033ac416 100644 --- a/src/components/partials/TableBudget.vue +++ b/src/components/partials/TableBudget.vue @@ -1,7 +1,7 @@ <template> <b-container class="content justify-content-center"> <b-col> - <b-row align-h='left'> + <b-row> <h3> {{ "Activity : " + currentItemActivity }} <br><br> @@ -9,7 +9,7 @@ </h3> </b-row> <b-row v-if="showCard"> - <b-card > + <b-card> <small><b>Mohon pilih Admin dari daftar di bawah ini:</b></small> <b-form-select v-model="selected" @@ -33,9 +33,14 @@ </b-button> </b-card> </b-row> - <b-row class="my-2" align-h="space-between"> + <b-row class="my-2"> <b-col class="pl-0"> - <b-button v-on:click="backState()" v-if="dataTable.isNotTop" variant="outline-secondary" size="sm"> kembali </b-button> + <b-button v-on:click="goToPage()" size="sm"> + Lihat Laman + </b-button> + <b-button v-on:click="backState()" v-if="dataTable.isNotTop" variant="outline-secondary" size="sm"> + Kembali + </b-button> </b-col> <b-col v-if="dataTable.current_item.admin_name === '--'" @@ -53,27 +58,23 @@ v-else cols="auto" > - - - <b-button - v-on:click="changeShowCardState()" - variant="primary" - size="sm" - > - Ubah Admin - </b-button> - <b-button - v-on:click="showModal()" - variant="danger" - size="sm" - > - Hapus Admin - </b-button> + <b-button + v-on:click="changeShowCardState()" + variant="primary" + size="sm" + > + Ubah Admin + </b-button> + <b-button + v-on:click="showModal()" + variant="danger" + size="sm" + > + Hapus Admin + </b-button> </b-col> - </b-row> - - <b-row align-h='center' class=" justify-content-center overflow-auto"> + <b-row class="justify-content-center overflow-auto"> <b-table hover responsive @@ -122,7 +123,7 @@ @ok="removeAdmin()" > <p align="center" class="my-4"> - Apakah Anda yakin ingin untuk menghapus Admin?<br> + Apakah Anda yakin ingin untuk menghapus Admin?<br> <b>Tindakan ini tidak dapat diurungkan.</b> </p> </b-modal> @@ -154,15 +155,21 @@ export default { currentItemActivity() { return this.dataTable.current_item.activity_name }, + currentItemId() { + return this.dataTable.current_item.id + }, }, methods: { + goToPage : function() { + let routeData = this.$router.resolve({name: 'DetailAnggaranId', params: {id: this.currentItemId}}); + window.open(routeData.href, '_blank'); + }, + getData : function() { return this.dataTable; }, - // tambahkan property table - // :tbody-tr-class="rowClass" - rowClass( items, type ) { + rowClass : function(items, type) { if(!items) return if(items.admin_name === '--') return 'table-danger'