This commit is contained in:
2021-02-06 16:34:55 +00:00
parent 2327c81a5c
commit cf0d881c25
5 changed files with 54 additions and 60 deletions

View File

@@ -17,6 +17,7 @@
:dataListKey="dataListKey"
:dataListFilter="dataListFilter"
:dataListSort="dataListSort"
:clientCriteria="clientCriteria"
:showSelect="rights.read"
:reload="reload"
:ridColumnOpenable="false"
@@ -41,25 +42,27 @@ export default {
);
if (vm.objectId && vm.objectId != 0 && vm.objectType) {
//DYNAMIC FILTER
vm.metaView = JSON.stringify([
{
fld: "metaservicebankobjectid",
filter: {
items: [{ op: "=", value: vm.objectId }]
}
},
{
fld: "AyaType",
filter: {
items: [{ op: "=", value: vm.objectType }]
}
}
]);
vm.name = await window.$gz.api.fetchBizObjectName(
vm.objectType,
vm.objectId
);
// //DYNAMIC FILTER
// vm.mxetaView = JSON.stringify([
// {
// fld: "metaservicebankobjectid",
// filter: {
// items: [{ op: "=", value: vm.objectId }]
// }
// },
// {
// fld: "AyaType",
// filter: {
// items: [{ op: "=", value: vm.objectType }]
// }
// }
// ]);
// vm.name = await window.$gz.api.fetchBizObjectName(
// vm.objectType,
// vm.objectId
// );
//OBJECTID,AYATYPE
vm.clientCriteria = `${vm.objectId},${vm.objectType}`;
}
generateMenu(vm);
@@ -77,9 +80,9 @@ export default {
ayType: window.$gz.type.ServiceBank,
selectedItems: [],
reload: false,
clientCriteria: undefined,
objectId: null,
objectType: null,
metaView: undefined,
name: null
};
},

View File

@@ -26,8 +26,6 @@
const FORM_KEY = "adm-users";
export default {
created() {
this.rights = window.$gz.role.getRights(window.$gz.type.User);
window.$gz.eventBus.$on("menu-click", clickHandler);
generateMenu(this);
@@ -41,7 +39,6 @@ export default {
dataListKey: "InsideUserDataList",
dataListFilter: "",
dataListSort: "",
rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.User,
selectedItems: [],

View File

@@ -15,7 +15,6 @@
:dataListSort="dataListSort"
:showSelect="rights.read"
:reload="reload"
:metaView="metaView"
v-on:selection-change="handleSelected"
data-cy="custUsersTable"
>
@@ -27,20 +26,6 @@
const FORM_KEY = "cust-users";
export default {
created() {
//outside users only
this.metaView = JSON.stringify([
{
fld: "usertype",
filter: {
items: [
{ op: "=", value: 3 },
{ op: "=", value: 4 }
],
any: true
}
}
]);
this.rights = window.$gz.role.getRights(window.$gz.type.User);
window.$gz.eventBus.$on("menu-click", clickHandler);
generateMenu(this);
@@ -54,7 +39,6 @@ export default {
dataListKey: "OutsideUserDataList",
dataListFilter: "",
dataListSort: "",
metaView: undefined,
rights: window.$gz.role.defaultRightsObject(),
ayType: window.$gz.type.User,
selectedItems: [],

View File

@@ -17,8 +17,9 @@
:dataListKey="dataListKey"
:dataListFilter="dataListFilter"
:dataListSort="dataListSort"
:clientCriteria="clientCriteria"
:showSelect="rights.read"
:reload="reload"
:reload="reload"
v-on:selection-change="handleSelected"
data-cy="reviewsTable"
>
@@ -40,25 +41,28 @@ export default {
);
if (vm.objectId && vm.objectId != 0 && vm.objectType) {
//pre-filter
vm.metaView = JSON.stringify([
{
fld: "metareviewobjectid",
filter: {
items: [{ op: "=", value: vm.objectId }]
}
},
{
fld: "AyaType",
filter: {
items: [{ op: "=", value: vm.objectType }]
}
}
]);
vm.name = await window.$gz.api.fetchBizObjectName(
vm.objectType,
vm.objectId
);
//REMOVE COMMENT BLOCK AFTER TESTING
// //pre-filter
// vm.mxetaView = JSON.stringify([
// {
// fld: "metareviewobjectid",
// filter: {
// items: [{ op: "=", value: vm.objectId }]
// }
// },
// {
// fld: "AyaType",
// filter: {
// items: [{ op: "=", value: vm.objectType }]
// }
// }
// ]);
// vm.name = await window.$gz.api.fetchBizObjectName(
// vm.objectType,
// vm.objectId
// );
//OBJECTID,AYATYPE
vm.clientCriteria = `${vm.objectId},${vm.objectType}`;
}
generateMenu(vm);
@@ -76,9 +80,9 @@ export default {
ayType: window.$gz.type.Review,
selectedItems: [],
reload: false,
clientCriteria: undefined,
objectId: null,
objectType: null,
metaView: undefined,
name: null
};
},