This commit is contained in:
2021-05-27 17:22:15 +00:00
parent 1db8925484
commit 609a2a99f2
3 changed files with 59 additions and 12 deletions

View File

@@ -167,7 +167,7 @@
:form-key="formCustomTemplateKey" :form-key="formCustomTemplateKey"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:parent-v-m="this" :parent-v-m="this"
key-start-with="Items.WorkOrderItemUnitCustom" key-start-with="WorkOrderItemUnitCustom"
:ref=" :ref="
`Items[${activeWoItemIndex}].units[ `Items[${activeWoItemIndex}].units[
${activeItemIndex} ${activeItemIndex}
@@ -300,15 +300,10 @@ export default {
} }
}, },
methods: { methods: {
userChange(newName) { unitChange(newName) {
this.value.items[this.activeWoItemIndex].units[ this.value.items[this.activeWoItemIndex].units[
this.activeItemIndex this.activeItemIndex
].userViz = newName; ].unitViz = newName;
},
rateChange(newName) {
this.value.items[this.activeWoItemIndex].units[
this.activeItemIndex
].serviceRateViz = newName;
}, },
newItem() { newItem() {
let newIndex = this.value.items[this.activeWoItemIndex].units.length; let newIndex = this.value.items[this.activeWoItemIndex].units.length;
@@ -420,7 +415,7 @@ export default {
if (this.form().showMe(this, "WorkOrderItemUnit")) { if (this.form().showMe(this, "WorkOrderItemUnit")) {
headers.push({ headers.push({
text: this.$ay.t("WorkOrderItemUnit"), text: this.$ay.t("Unit"),
align: "left", align: "left",
value: "unitViz" value: "unitViz"
}); });

View File

@@ -321,7 +321,7 @@
:form-key="formCustomTemplateKey" :form-key="formCustomTemplateKey"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:parent-v-m="this" :parent-v-m="this"
key-start-with="Items.WorkOrderItemCustom" key-start-with="WorkOrderItemCustom"
:ref="`items[${activeItemIndex}].customFields`" :ref="`items[${activeItemIndex}].customFields`"
data-cy="customFields" data-cy="customFields"
:error-messages=" :error-messages="
@@ -360,7 +360,21 @@
GRANDCHILDREN GRANDCHILDREN
############################################################################ --> ############################################################################ -->
<!-- //todo WorkOrderItemUnitList here --> <v-col
cols="12"
v-if="
pvm.subRights.scheduledUsers.visible &&
form().showMe(this, 'WorkOrderItemUnitList')
"
>
<GzWoItemUnits
v-model="value"
:pvm="pvm"
:active-wo-item-index="activeItemIndex"
data-cy="woItemUnits"
@change="$emit('change')"
/>
</v-col>
<v-col <v-col
cols="12" cols="12"
@@ -497,6 +511,8 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////////
/* XXXeslint-disable */ /* XXXeslint-disable */
//////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////
import GzWoItemUnits from "../components/work-order-item-units.vue";
import GzWoItemScheduledUsers from "../components/work-order-item-scheduled-users.vue"; import GzWoItemScheduledUsers from "../components/work-order-item-scheduled-users.vue";
import GzWoItemLabors from "../components/work-order-item-labors.vue"; import GzWoItemLabors from "../components/work-order-item-labors.vue";
import GzWoItemTravels from "../components/work-order-item-travels.vue"; import GzWoItemTravels from "../components/work-order-item-travels.vue";
@@ -508,6 +524,7 @@ import GzWoItemLoans from "../components/work-order-item-loans.vue";
export default { export default {
components: { components: {
GzWoItemUnits,
GzWoItemScheduledUsers, GzWoItemScheduledUsers,
GzWoItemExpenses, GzWoItemExpenses,
GzWoItemLabors, GzWoItemLabors,

View File

@@ -1787,7 +1787,23 @@ async function fetchTranslatedText(vm) {
"WorkOrderItemScheduledUserUserID", "WorkOrderItemScheduledUserUserID",
"WorkOrderItemScheduledUserServiceRateID", "WorkOrderItemScheduledUserServiceRateID",
"Sequence", "Sequence",
"WorkOrderItemUnitList",
"WorkOrderItemCustom1",
"WorkOrderItemCustom2",
"WorkOrderItemCustom3",
"WorkOrderItemCustom4",
"WorkOrderItemCustom5",
"WorkOrderItemCustom6",
"WorkOrderItemCustom7",
"WorkOrderItemCustom8",
"WorkOrderItemCustom9",
"WorkOrderItemCustom10",
"WorkOrderItemCustom11",
"WorkOrderItemCustom12",
"WorkOrderItemCustom13",
"WorkOrderItemCustom14",
"WorkOrderItemCustom15",
"WorkOrderItemCustom16",
"AddressTypePhysical", "AddressTypePhysical",
"AddressTypePostal", "AddressTypePostal",
"AddressCopyToPostal", "AddressCopyToPostal",
@@ -1808,6 +1824,25 @@ async function fetchTranslatedText(vm) {
"WorkOrderItemStatusList", "WorkOrderItemStatusList",
"WorkOrderStatusList", "WorkOrderStatusList",
"WorkOrderItemPriorityList", "WorkOrderItemPriorityList",
"WorkOrderItemUnitList",
"WorkOrderItemUnitNotes",
"Unit",
"WorkOrderItemUnitCustom1",
"WorkOrderItemUnitCustom2",
"WorkOrderItemUnitCustom3",
"WorkOrderItemUnitCustom4",
"WorkOrderItemUnitCustom5",
"WorkOrderItemUnitCustom6",
"WorkOrderItemUnitCustom7",
"WorkOrderItemUnitCustom8",
"WorkOrderItemUnitCustom9",
"WorkOrderItemUnitCustom10",
"WorkOrderItemUnitCustom11",
"WorkOrderItemUnitCustom12",
"WorkOrderItemUnitCustom13",
"WorkOrderItemUnitCustom14",
"WorkOrderItemUnitCustom15",
"WorkOrderItemUnitCustom16",
"WorkOrderItemExpenseChargeAmount", "WorkOrderItemExpenseChargeAmount",
"WorkOrderItemExpenseChargeTaxCodeID", "WorkOrderItemExpenseChargeTaxCodeID",
"WorkOrderItemExpenseChargeToCustomer", "WorkOrderItemExpenseChargeToCustomer",