fix: conflict

This commit is contained in:
Mulia Nasution
2023-06-01 12:14:22 +07:00
27 changed files with 367 additions and 683 deletions

View File

@@ -252,7 +252,12 @@
:allow-column-reordering="true"
:column-auto-width="true"
>
<DxEditing :allow-adding="true" :use-icons="true" mode="popup">
<DxEditing
:allow-adding="true"
:allow-updating="true"
:allow-deleting="true"
:use-icons="true"
mode="popup">
<DxTexts
add-row="Tambah"
edit-row="Ubah"
@@ -338,7 +343,7 @@
text="Kirim"
icon="movetofolder"
hint="Kirim DRP"
:on-click="linkDetail"
:on-click="linkKirim"
/>
</DxColumn>
<DxColumn type="adaptive" :width="50">
@@ -401,7 +406,7 @@ const dataSource = new CustomStore({
key: "id",
load: () => {
return fetch(URL + "?size=100")
return fetch(URL+process.env.VUE_APP_PAGE_SIZE)
.then((response) => response.json())
.then((response) => {
return {
@@ -540,6 +545,15 @@ export default {
this.popupTitle = "Lihat Dokumen Pendukung";
this.isShowButton = false;
},
linkKirim($event) {
console.log("event: ", $event.row.values);
this.popupVisible = true;
this.popupTitle = "Review & Approval DRP";
this.dataDrp = $event.row.values;
this.isShowButton = true;
console.log("drp: ", this.dataDrp);
},
},
data() {
return {