admin/raven-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-03-18 19:07:30 +00:00
parent cc9c515b79
commit 78b0227dc3
9 changed files with 81 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ayanova/src/components/data-table.vue
View File

@@ -21,20 +21,26 @@
</gz-data-table-mobile-filter-column-selector>
<v-card>
<v-card-title>
<v-select
v-model="activeFilterId"
:items="selectLists.savedFilters"
item-text="name"
item-value="id"
:label="$ay.t('Filter')"
@input="selectedFilterChanged"
prepend-icon="$ayiEdit"
@click:prepend="editFilter()"
:append-outer-icon="clearFilterIcon()"
@click:append-outer="clearFilter()"
data-cy="selectSavedFilter"
>
</v-select>
<template v-if="preFilterMode">
<!-- {icon:null,viz:null,ayatype:null,id:null,clearable:false} -->
preFilterMode {{ preFilterMode }}
</template>
<template v-else>
<v-select
v-model="activeFilterId"
:items="selectLists.savedFilters"
item-text="name"
item-value="id"
:label="$ay.t('Filter')"
@input="selectedFilterChanged"
prepend-icon="$ayiEdit"
@click:prepend="editFilter()"
:append-outer-icon="clearFilterIcon()"
@click:append-outer="clearFilter()"
data-cy="selectSavedFilter"
>
</v-select>
</template>
<v-spacer></v-spacer>
<div class="my-5 my-sm-1">
@@ -453,6 +459,10 @@ export default {
type: String,
default: undefined
},
preFilterMode: {//{icon:null,viz:null,ayatype:null,id:null,clearable:false}
type: Object,
default: null
},
showSelect: {
type: Boolean,
default: false

20
ayanova/src/views/acc-service-banks.vue
View File

@@ -41,26 +41,8 @@ export default {
vm.$route.params.objectType
);
//OPTIONAL FILTER
if (vm.objectId && vm.objectId != 0 && vm.objectType) {
// //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}`;
}

2
ayanova/src/views/cust-customer-notes.vue
View File

@@ -43,7 +43,7 @@ const FORM_KEY = "cust-customer-notes";
export default {
created() {
this.customerId = parseInt(this.$route.params.customerid);
//MIXED STATIC But with provided criteria FILTER
//REQUIRED NON-OPTIONAL FILTER
this.clientCriteria = this.customerId.toString();
this.rights = window.$gz.role.getRights(window.$gz.type.CustomerNote);
window.$gz.eventBus.$on("menu-click", clickHandler);

21
ayanova/src/views/home-reviews.vue
View File

@@ -40,27 +40,8 @@ export default {
vm.$route.params.objectType
);
//OPTIONAL FILTER
if (vm.objectId && vm.objectId != 0 && vm.objectType) {
//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}`;
}

1
ayanova/src/views/inv-part-inventory-transactions.vue
View File

@@ -31,6 +31,7 @@ export default {
//Generate client criteria to send if filtered by part, whs or both
//ClientCriteria is optional for this list, Format for this list is "PARTID,WAREHOUSEID" where the id is 0 if not filtered or the id to filter
//OPTIONAL FILTER
if (vm.$route.params.filter) {
vm.clientCriteria = `${
vm.$route.params.filter.PartPartNumber

13
ayanova/src/views/inv-part-inventory.vue
View File

@@ -14,6 +14,7 @@
:show-select="rights.read"
:reload="reload"
:client-criteria="clientCriteria"
:pre-filter-mode="preFilterMode"
@selection-change="handleSelected"
data-cy="partInventoryTable"
>
@@ -31,7 +32,18 @@ export default {
//Generate client criteria to send if filtered by part, whs or both
//ClientCriteria is optional for this list, Format for this list is "PARTID,WAREHOUSEID" where the id is 0 if not filtered or the id to filter
//OPTIONAL FILTER
if (vm.$route.params.filter) {
vm.preFilterMode = {
icon: vm.$route.params.filter.icon,
id: window.$gz.util.stringToIntOrNull(vm.$route.params.filter.objectId),
ayatype: window.$gz.util.stringToIntOrNull(
vm.$route.params.filter.ayatype
),
viz: vm.$route.params.filter.viz,
clearable: true
};
vm.clientCriteria = `${
vm.$route.params.filter.PartPartNumber
? vm.$route.params.filter.PartPartNumber
@@ -54,6 +66,7 @@ export default {
ayType: window.$gz.type.PartInventory,
selectedItems: [],
clientCriteria: undefined,
preFilterMode: null,
reload: false
};
},

10
ayanova/src/views/inv-part-warehouse.vue
View File

@@ -494,7 +494,15 @@ async function clickHandler(menuItem) {
case "PartByWarehouseInventoryList":
m.vm.$router.push({
name: "inv-part-inventory",
params: { filter: { PartWarehouseName: m.vm.obj.name } }
params: {
filter: {
PartWarehouseName: m.vm.obj.name,
objectId: m.vm.obj.id,
ayatype: window.$gz.type.PartWarehouse,
viz: m.vm.obj.name,
icon: "$ayiWarehouse"
}
}
});
break;
case "PartInventoryTransactionList":

10
ayanova/src/views/inv-part.vue
View File

@@ -721,7 +721,15 @@ async function clickHandler(menuItem) {
case "PartByWarehouseInventoryList":
m.vm.$router.push({
name: "inv-part-inventory",
params: { filter: { PartPartNumber: m.vm.obj.partNumber } }
params: {
filter: {
PartPartNumber: m.vm.obj.partNumber,
objectId: m.vm.obj.id,
ayatype: window.$gz.type.Part,
viz: m.vm.obj.partNumber + " " + m.vm.obj.name,
icon: "$ayiBoxes"
}
}
});
break;
case "PartInventoryTransactionList":