This commit is contained in:
2020-02-12 23:18:07 +00:00
parent a0da3207e4
commit 362e48c59e
2 changed files with 17 additions and 17 deletions

View File

@@ -284,6 +284,7 @@ export default {
// GET DATA FROM API SERVER // GET DATA FROM API SERVER
// //
get(route) { get(route) {
console.log("gzapi::get(" + route + ")");
var that = this; var that = this;
return new Promise(function getDataFromServer(resolve, reject) { return new Promise(function getDataFromServer(resolve, reject) {
fetch(that.APIUrl(route), that.fetchGetOptions()) fetch(that.APIUrl(route), that.fetchGetOptions())

View File

@@ -48,7 +48,7 @@
item-text="name" item-text="name"
item-value="id" item-value="id"
:label="lt('GridFilterName')" :label="lt('GridFilterName')"
@change="filterSelected(item)" @change="filterChanged()"
></v-select> ></v-select>
</v-col> </v-col>
</v-row> </v-row>
@@ -74,17 +74,19 @@ export default {
}, },
beforeCreate() { beforeCreate() {
var vm = this; var vm = this;
vm.dataListKey = this.$route.params.dataListKey;
vm.recordid = this.$route.params.recordid;
//debugger;
initForm(vm)
.then(() => {
vm.formState.ready = true;
})
.catch(err => {
debugger;
var vv = initForm(this); vm.formState.ready = true;
window.$gz.errorHandler.handleFormError(err);
vv.then(() => { });
vm.formState.ready = true;
}).catch(err => {
debugger;
vm.formState.ready = true;
window.$gz.errorHandler.handleFormError(err);
});
}, },
beforeRouteLeave(to, from, next) { beforeRouteLeave(to, from, next) {
//var vm = this; //var vm = this;
@@ -114,8 +116,8 @@ export default {
data() { data() {
return { return {
obj: [], obj: [],
recordid: this.$route.params.recordid, recordid: undefined,
dataListKey: this.$route.params.dataListKey, dataListKey: "",
concurrencyToken: undefined, concurrencyToken: undefined,
formCustomTemplateKey: this.$route.params.formCustomTemplateKey, formCustomTemplateKey: this.$route.params.formCustomTemplateKey,
selectedDataListSortFilter: {}, selectedDataListSortFilter: {},
@@ -157,7 +159,7 @@ export default {
this.formState.dirty = true; this.formState.dirty = true;
enableSaveButton(); enableSaveButton();
}, },
filterSelected: function(item) { filterChanged: function() {
alert("STUB:FILTER SELECTED"); alert("STUB:FILTER SELECTED");
// //nothing to scan here just set form dirty // //nothing to scan here just set form dirty
// this.formState.dirty = true; // this.formState.dirty = true;
@@ -329,9 +331,6 @@ function populatePickLists(vm) {
vm.pickLists.availableDataListSortFilters = res.data; vm.pickLists.availableDataListSortFilters = res.data;
} }
}); });
// return window.$gz.formCustomTemplate.get(
// vm.$route.params.formCustomTemplateKey
// );
} }
//////////////////// ////////////////////