This commit is contained in:
2021-03-18 22:00:02 +00:00
parent fa75d3bda8
commit 3609deeca2
5 changed files with 37 additions and 31 deletions

View File

@@ -1,11 +1,11 @@
<template> <template>
<div> <div>
<div v-if="objectType && objectId" class="mb-6"> <!-- <div v-if="objectType && objectId" class="mb-6">
<v-icon data-cy="clickThru" @click="navToTarget()" large>{{ <v-icon data-cy="clickThru" @click="navToTarget()" large>{{
iconForType() iconForType()
}}</v-icon }}</v-icon
><span @click="navToTarget()" class="text-h5"> {{ name }}</span> ><span @click="navToTarget()" class="text-h5"> {{ name }}</span>
</div> </div> -->
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="ayType"
@@ -23,6 +23,8 @@
:rid-column-openable="false" :rid-column-openable="false"
@selection-change="handleSelected" @selection-change="handleSelected"
data-cy="serviceBanksTable" data-cy="serviceBanksTable"
:pre-filter-mode="preFilterMode"
@clear-pre-filter="clearPreFilter"
> >
</gz-data-table> </gz-data-table>
</div> </div>
@@ -45,6 +47,14 @@ export default {
if (vm.objectId && vm.objectId != 0 && vm.objectType) { if (vm.objectId && vm.objectId != 0 && vm.objectType) {
//OBJECTID,AYATYPE //OBJECTID,AYATYPE
vm.clientCriteria = `${vm.objectId},${vm.objectType}`; vm.clientCriteria = `${vm.objectId},${vm.objectType}`;
vm.preFilterMode = {
icon: vm.$route.params.icon,
id: vm.objectId,
ayatype: vm.objectType,
viz: vm.$route.params.viz,
clearable: true
};
} }
generateMenu(vm); generateMenu(vm);
@@ -59,28 +69,30 @@ export default {
selectedItems: [], selectedItems: [],
reload: false, reload: false,
clientCriteria: undefined, clientCriteria: undefined,
preFilterMode: null,
objectId: null, objectId: null,
objectType: null, objectType: null,
name: null name: null
}; };
}, },
// computed: {
// iconForType() {
// return window.$gz.util.iconForType(this.objectType);
// }
// },
methods: { methods: {
navToTarget: function() { // navToTarget: function() {
window.$gz.eventBus.$emit("openobject", { // window.$gz.eventBus.$emit("openobject", {
type: this.objectType, // type: this.objectType,
id: this.objectId // id: this.objectId
}); // });
}, // },
handleSelected(selected) { handleSelected(selected) {
this.selectedItems = selected; this.selectedItems = selected;
}, },
iconForType() { // iconForType() {
return window.$gz.util.iconForType(this.objectType, 10); // return window.$gz.util.iconForType(this.objectType, 10);
// },
clearPreFilter() {
this.clientCriteria = null;
this.preFilterMode = null;
this.reload = !this.reload;
} }
} }
}; };

View File

@@ -7,18 +7,6 @@
ref="extensions" ref="extensions"
> >
</gz-extensions> </gz-extensions>
<!-- <v-row>
<v-col cols="12">
<gz-pick-list
readonly
v-model="customerId"
:aya-type="ayaTypes().Customer"
:show-edit-icon="true"
:label="$ay.t('Customer')"
data-cy="clickThru"
></gz-pick-list>
</v-col>
</v-row> -->
<gz-data-table <gz-data-table
ref="gzdatatable" ref="gzdatatable"
form-key="cust-customer-notes" form-key="cust-customer-notes"

View File

@@ -925,7 +925,9 @@ export default {
name: "service-banks", name: "service-banks",
params: { params: {
objectType: window.$gz.type.Customer, objectType: window.$gz.type.Customer,
objectId: this.$route.params.recordid objectId: this.$route.params.recordid,
viz: this.obj.name,
icon: "$ayiAddressCard"
} }
}); });
} }

View File

@@ -829,7 +829,9 @@ export default {
name: "service-banks", name: "service-banks",
params: { params: {
objectType: window.$gz.type.HeadOffice, objectType: window.$gz.type.HeadOffice,
objectId: this.$route.params.recordid objectId: this.$route.params.recordid,
viz: this.obj.name,
icon: "$ayiSitemap"
} }
}); });
} }
@@ -1320,7 +1322,7 @@ function generateMenu(vm) {
let menuOptions = { let menuOptions = {
isMain: false, isMain: false,
readOnly: vm.formState.readOnly, readOnly: vm.formState.readOnly,
icon: "$ayiAddressCard", icon: "$ayiSitemap",
title: "HeadOffice", title: "HeadOffice",
helpUrl: "head-offices", helpUrl: "head-offices",
formData: { formData: {

View File

@@ -929,7 +929,9 @@ export default {
name: "service-banks", name: "service-banks",
params: { params: {
objectType: window.$gz.type.Unit, objectType: window.$gz.type.Unit,
objectId: this.$route.params.recordid objectId: this.$route.params.recordid,
viz: this.obj.serial,
icon: "$ayiFan"
} }
}); });
} }