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

Browse Source
This commit is contained in:
John Cardinal
2023-04-21 17:40:11 +00:00
parent 9a6ebc84fa
commit ef585bddbd
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/api/translation.js
View File

@@ -264,7 +264,8 @@ export default {
"PurchaseList",
"GZCaseList",
"VendorNotificationList",
"SubscriptionList"
"SubscriptionList",
"SubscriptionItemList"
],
////////////////////////////////////////////////////////

2
src/views/biz-subscription-item-list.vue
View File

@@ -106,7 +106,7 @@ async function clickHandler(menuItem) {
{
const res = await m.vm.$refs.reportSelector.open(
m.vm.$refs.gzdatatable.getDataListSelection(
window.$gz.type.Subscription
window.$gz.type.SubscriptionItem
),
m.id
);

16
src/views/sock-report-edit.vue
View File

@@ -101,7 +101,7 @@
<v-col cols="12" sm="6" lg="4" xl="3">
<v-select
ref="sockType"
v-model="obj.aType"
v-model="obj.sockType"
dense
:items="selectLists.coreSockTypes"
item-text="name"
@@ -109,9 +109,9 @@
:readonly="formState.readOnly"
:label="$sock.t('SockType')"
data-cy="sockType"
:rules="[form().integerValid(this, 'aType')]"
:error-messages="form().serverErrors(this, 'aType')"
@input="fieldValueChanged('aType')"
:rules="[form().integerValid(this, 'sockType')]"
:error-messages="form().serverErrors(this, 'sockType')"
@input="fieldValueChanged('sockType')"
></v-select>
</v-col>
@@ -371,7 +371,7 @@ export default {
active: true,
notes: "",
roles: 124927, //all except customers
aType: 0,
sockType: 0,
template: `<html>
<body>
@@ -438,7 +438,7 @@ export default {
},
computed: {
showIncludeDescendants: function() {
switch (this.obj.aType) {
switch (this.obj.sockType) {
case window.$gz.type.WorkOrderItem:
case window.$gz.type.WorkOrderItemExpense:
case window.$gz.type.WorkOrderItemLabor:
@@ -558,7 +558,7 @@ export default {
vm.$router.go(-1);
return;
}
vm.obj.aType = vm.$route.params.reportDataOptions.SockType;
vm.obj.sockType = vm.$route.params.reportDataOptions.SockType;
//trigger rule breaking / validation
this.$nextTick(() => {
this.obj.name = null;
@@ -1139,7 +1139,7 @@ async function fetchReportData(vm) {
"sock-report-edit:fetchReportData - route parameter SockType is missing or empty, unable to init report designer"
);
}
vm.obj.aType = reportDataOptions.SockType;
vm.obj.sockType = reportDataOptions.SockType;
//handle includeWoItemDescendants by adding it's value to the request for report data
reportDataOptions["includeWoItemDescendants"] =
vm.obj.includeWoItemDescendants;