This commit is contained in:
2020-12-09 18:08:56 +00:00
parent b081f30b4a
commit 3f8bfc0365
9 changed files with 36 additions and 16 deletions

View File

@@ -52,7 +52,6 @@ export default {
}`; }`;
}, },
open(dls) { open(dls) {
// console.log("OPEN", dls);
this.dataListSelection = dls; this.dataListSelection = dls;
this.isVisible = true; this.isVisible = true;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {

View File

@@ -14,6 +14,7 @@
:dataListFilter="dataListFilter" :dataListFilter="dataListFilter"
:dataListSort="dataListSort" :dataListSort="dataListSort"
:showSelect="rights.change" :showSelect="rights.change"
:reload="reload"
:metaView="metaView" :metaView="metaView"
v-on:selection-change="handleSelected" v-on:selection-change="handleSelected"
data-cy="usersTable" data-cy="usersTable"
@@ -69,7 +70,8 @@ export default {
metaView: undefined, metaView: undefined,
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.User, ayType: window.$gz.type.User,
selectedItems: [] selectedItems: [],
reload: false
}; };
}, },
methods: { methods: {
@@ -99,6 +101,9 @@ async function clickHandler(menuItem) {
let res = await m.vm.$refs.extensions.open( let res = await m.vm.$refs.extensions.open(
m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.User) m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.User)
); );
if (res && res.refresh == true) {
m.vm.reload = !m.vm.reload;
}
break; break;
case "report": case "report":
if (m.id != null) { if (m.id != null) {

View File

@@ -15,6 +15,7 @@
:dataListFilter="dataListFilter" :dataListFilter="dataListFilter"
:dataListSort="dataListSort" :dataListSort="dataListSort"
:showSelect="rights.change" :showSelect="rights.change"
:reload="reload"
:metaView="metaView" :metaView="metaView"
v-on:selection-change="handleSelected" v-on:selection-change="handleSelected"
data-cy="customerNotesTable" data-cy="customerNotesTable"
@@ -60,7 +61,8 @@ export default {
metaView: undefined, metaView: undefined,
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.CustomerNote, ayType: window.$gz.type.CustomerNote,
selectedItems: [] selectedItems: [],
reload: false
}; };
}, },
methods: { methods: {
@@ -96,6 +98,9 @@ async function clickHandler(menuItem) {
window.$gz.type.CustomerNote window.$gz.type.CustomerNote
) )
); );
if (res && res.refresh == true) {
m.vm.reload = !m.vm.reload;
}
break; break;
case "report": case "report":
if (m.id != null) { if (m.id != null) {

View File

@@ -14,6 +14,7 @@
:dataListFilter="dataListFilter" :dataListFilter="dataListFilter"
:dataListSort="dataListSort" :dataListSort="dataListSort"
:showSelect="rights.change" :showSelect="rights.change"
:reload="reload"
v-on:selection-change="handleSelected" v-on:selection-change="handleSelected"
data-cy="customersTable" data-cy="customersTable"
> >
@@ -40,7 +41,8 @@ export default {
dataListSort: "", dataListSort: "",
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.Customer, ayType: window.$gz.type.Customer,
selectedItems: [] selectedItems: [],
reload: false
}; };
}, },
methods: { methods: {
@@ -70,6 +72,9 @@ async function clickHandler(menuItem) {
let res = await m.vm.$refs.extensions.open( let res = await m.vm.$refs.extensions.open(
m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Customer) m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Customer)
); );
if (res && res.refresh == true) {
m.vm.reload = !m.vm.reload;
}
break; break;
case "report": case "report":
if (m.id != null) { if (m.id != null) {

View File

@@ -14,6 +14,7 @@
:dataListFilter="dataListFilter" :dataListFilter="dataListFilter"
:dataListSort="dataListSort" :dataListSort="dataListSort"
:showSelect="rights.change" :showSelect="rights.change"
:reload="reload"
v-on:selection-change="handleSelected" v-on:selection-change="handleSelected"
data-cy="headofficesTable" data-cy="headofficesTable"
> >
@@ -40,7 +41,8 @@ export default {
dataListSort: "", dataListSort: "",
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.HeadOffice, ayType: window.$gz.type.HeadOffice,
selectedItems: [] selectedItems: [],
reload: false
}; };
}, },
methods: { methods: {
@@ -72,6 +74,9 @@ async function clickHandler(menuItem) {
window.$gz.type.HeadOffice window.$gz.type.HeadOffice
) )
); );
if (res && res.refresh == true) {
m.vm.reload = !m.vm.reload;
}
break; break;
case "report": case "report":
if (m.id != null) { if (m.id != null) {

View File

@@ -14,6 +14,7 @@
:dataListFilter="dataListFilter" :dataListFilter="dataListFilter"
:dataListSort="dataListSort" :dataListSort="dataListSort"
:showSelect="rights.change" :showSelect="rights.change"
:reload="reload"
:metaView="metaView" :metaView="metaView"
v-on:selection-change="handleSelected" v-on:selection-change="handleSelected"
data-cy="custUsersTable" data-cy="custUsersTable"
@@ -56,7 +57,8 @@ export default {
metaView: undefined, metaView: undefined,
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.User, ayType: window.$gz.type.User,
selectedItems: [] selectedItems: [],
reload: false
}; };
}, },
methods: { methods: {
@@ -86,6 +88,9 @@ async function clickHandler(menuItem) {
let res = await m.vm.$refs.extensions.open( let res = await m.vm.$refs.extensions.open(
m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.User) m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.User)
); );
if (res && res.refresh == true) {
m.vm.reload = !m.vm.reload;
}
break; break;
case "report": case "report":
if (m.id != null) { if (m.id != null) {

View File

@@ -137,9 +137,6 @@ async function clickHandler(menuItem) {
params: { recordid: 0 } params: { recordid: 0 }
}); });
break; break;
// case "extensions":
// let res = await m.vm.$refs.extensions.open();
// break;
default: default:
window.$gz.eventBus.$emit( window.$gz.eventBus.$emit(

View File

@@ -14,6 +14,7 @@
:dataListFilter="dataListFilter" :dataListFilter="dataListFilter"
:dataListSort="dataListSort" :dataListSort="dataListSort"
:showSelect="rights.change" :showSelect="rights.change"
:reload="reload"
v-on:selection-change="handleSelected" v-on:selection-change="handleSelected"
data-cy="vendorsTable" data-cy="vendorsTable"
> >
@@ -40,7 +41,8 @@ export default {
dataListSort: "", dataListSort: "",
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.Vendor, ayType: window.$gz.type.Vendor,
selectedItems: [] selectedItems: [],
reload: false
}; };
}, },
methods: { methods: {
@@ -70,6 +72,9 @@ async function clickHandler(menuItem) {
let res = await m.vm.$refs.extensions.open( let res = await m.vm.$refs.extensions.open(
m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Vendor) m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Vendor)
); );
if (res && res.refresh == true) {
m.vm.reload = !m.vm.reload;
}
break; break;
case "report": case "report":
if (m.id != null) { if (m.id != null) {

View File

@@ -69,18 +69,12 @@ async function clickHandler(menuItem) {
}); });
break; break;
case "extensions": case "extensions":
// console.log(
// "widgets:extensions dls: ",
// m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Widget)
// );
let res = await m.vm.$refs.extensions.open( let res = await m.vm.$refs.extensions.open(
m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Widget) m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Widget)
); );
if (res && res.refresh == true) { if (res && res.refresh == true) {
//force full refresh of grid including selections
m.vm.reload = !m.vm.reload; m.vm.reload = !m.vm.reload;
} }
//console.log("widgets::extensions res=", res);
break; break;
case "report": case "report":
if (m.id != null) { if (m.id != null) {