This commit is contained in:
@@ -297,29 +297,9 @@ todo: many biz objects are not using new PUT methodology
|
||||
########################################################################################################################
|
||||
|
||||
|
||||
test for commit
|
||||
|
||||
CURRENTLY DOING: alternate address selector completion
|
||||
- currently it's not showing all the addresses available when headoffice
|
||||
- needs display and button / code to copy address selected
|
||||
CURRENTLY DOING: FormFieldReference for sub items implement, test and confirm system works
|
||||
|
||||
Address
|
||||
- add get route customer/bill-to-address
|
||||
returns mailto address of customer AND of head office if it has a head office and bill head office is checked
|
||||
{client:{addressfields},headoffice:{addressfields}}
|
||||
- add get route customer/service-address
|
||||
returns physical address of customer
|
||||
{client:{addressfields}}
|
||||
- add get route unit/service-address
|
||||
{unit:{addressfields}}
|
||||
|
||||
UI
|
||||
wo address control
|
||||
default shows service address compactly as possible
|
||||
click to open shows billing and service address, can edit all fields
|
||||
Button beside physical and button beside postal to open dialog to select alternate address
|
||||
opens a popup with all objects that could populate address (units, customer, headoffice as applicable)
|
||||
shows their addresses compactly for selection with button to use this address
|
||||
|
||||
|
||||
OVERALL
|
||||
|
||||
@@ -39,7 +39,10 @@
|
||||
</v-col>
|
||||
<v-col cols="12" sm="6" lg="4" xl="3">
|
||||
<GzWoState
|
||||
v-if="pvm.subRights.states.visible"
|
||||
v-if="
|
||||
pvm.subRights.states.visible &&
|
||||
form().showMe(this, 'WorkOrderStatus')
|
||||
"
|
||||
v-model="value"
|
||||
:form-key="formCustomTemplateKey"
|
||||
:readonly="formState.readOnly"
|
||||
@@ -52,6 +55,7 @@
|
||||
|
||||
<v-col cols="12" sm="6" lg="4" xl="3">
|
||||
<GzWoAddress
|
||||
v-if="form().showMe(this, 'Address')"
|
||||
v-model="value"
|
||||
:form-key="formCustomTemplateKey"
|
||||
:readonly="formState.readOnly"
|
||||
@@ -60,7 +64,7 @@
|
||||
/>
|
||||
</v-col>
|
||||
|
||||
<v-col v-if="form().showMe(this, 'Notes')" cols="12">
|
||||
<v-col v-if="form().showMe(this, 'WorkOrderSummary')" cols="12">
|
||||
<v-textarea
|
||||
v-model="value.notes"
|
||||
:readonly="formState.readOnly"
|
||||
|
||||
@@ -85,7 +85,7 @@
|
||||
</v-col>
|
||||
|
||||
<v-col
|
||||
v-if="form().showMe(this, 'Sequence')"
|
||||
v-if="form().showMe(this, 'WorkOrderItemSequence')"
|
||||
cols="12"
|
||||
sm="6"
|
||||
lg="4"
|
||||
@@ -119,7 +119,10 @@
|
||||
</v-col>
|
||||
|
||||
<GzWoItemScheduledUsers
|
||||
v-if="pvm.subRights.scheduledUsers.visible"
|
||||
v-if="
|
||||
pvm.subRights.scheduledUsers.visible &&
|
||||
form().showMe(this, 'WorkOrderItemScheduledUserList')
|
||||
"
|
||||
v-model="value"
|
||||
:pvm="pvm"
|
||||
:active-wo-item-index="activeItemIndex"
|
||||
|
||||
@@ -191,7 +191,6 @@ export default {
|
||||
});
|
||||
|
||||
this.selectedStatus = null;
|
||||
//flag form dirty
|
||||
this.pvm.formState.dirty = true;
|
||||
}
|
||||
},
|
||||
|
||||
@@ -386,6 +386,12 @@ async function initDataObject(vm) {
|
||||
if (requiredTranslations.indexOf(res.data[i].tKey) === -1) {
|
||||
requiredTranslations.push(res.data[i].tKey);
|
||||
}
|
||||
//sections
|
||||
if (res.data[i].tKeySection != null) {
|
||||
if (requiredTranslations.indexOf(res.data[i].tKeySection) === -1) {
|
||||
requiredTranslations.push(res.data[i].tKeySection);
|
||||
}
|
||||
}
|
||||
}
|
||||
await window.$gz.translation.cacheTranslations(requiredTranslations);
|
||||
|
||||
@@ -412,13 +418,20 @@ async function initDataObject(vm) {
|
||||
|
||||
let objItem = {
|
||||
key: faf.fieldKey,
|
||||
title: vm.$ay.t(faf.tKey), //sb already cached either above or from the main form it's customizing
|
||||
title: null,
|
||||
custom: faf.isCustomField,
|
||||
required: templateItem.required === true,
|
||||
visible: templateItem.hide !== true,
|
||||
type: templateItem.type
|
||||
};
|
||||
|
||||
//set title including optional section prepended
|
||||
if (faf.tKeySection != null) {
|
||||
objItem.title = vm.$ay.t(faf.tKeySection) + "." + vm.$ay.t(faf.tKey);
|
||||
} else {
|
||||
objItem.title = vm.$ay.t(faf.tKey);
|
||||
}
|
||||
|
||||
vm.obj.push(objItem);
|
||||
vm.concurrency = window.$gz.formCustomTemplate.getTemplateConcurrencyToken(
|
||||
vm.formCustomTemplateKey
|
||||
|
||||
@@ -1103,7 +1103,7 @@ async function fetchTranslatedText(vm) {
|
||||
"WorkOrderItemScheduledUserEstimatedQuantity",
|
||||
"WorkOrderItemScheduledUserUserID",
|
||||
"WorkOrderItemScheduledUserServiceRateID",
|
||||
"Sequence",
|
||||
"WorkOrderItemSequence",
|
||||
"WorkOrderItemUnitList",
|
||||
"AddressTypePhysical",
|
||||
"AddressTypePostal",
|
||||
|
||||
Reference in New Issue
Block a user