From cd27aa0f4daaa8ea9c0b5bbbfcd5af1e5a4766f6 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 8 Jul 2021 22:49:31 +0000 Subject: [PATCH] --- .../src/components/work-order-item-units.vue | 78 +++++++++++++++++-- ayanova/src/views/svc-workorder.vue | 9 ++- 2 files changed, 78 insertions(+), 9 deletions(-) diff --git a/ayanova/src/components/work-order-item-units.vue b/ayanova/src/components/work-order-item-units.vue index aebecf29..3646c2f5 100644 --- a/ayanova/src/components/work-order-item-units.vue +++ b/ayanova/src/components/work-order-item-units.vue @@ -409,17 +409,79 @@ export default { "purchaseReceiptNumber":"139736", "lifeTimeWarranty":false, "warrantyExpiryDate":"2019-04-12T09:37:52.930923Z", - "warrantyTerms":"Shipping parts and service"} */ + "warrantyTerms":"Shipping parts and service"} + + "UnitPurchasedDate": "Purchased Date", + "UnitPurchaseFromID": "Purchased From", + "UnitReceipt": "Receipt Number", + */ + const r = res.data; + + let Warranty = `${this.$ay.t("Warranty")}:`; + let WarrantyExpiryInfo = "-"; + if (r.lifeTimeWarranty) { + WarrantyExpiryInfo = this.$ay.t("UnitModelLifeTimeWarranty"); + } else { + if (r.warrantyExpiryDate) { + WarrantyExpiryInfo = `${this.$ay.t( + "WarrantyExpires" + )}: ${window.$gz.locale.utcDateToShortDateAndTimeLocalized( + r.warrantyExpiryDate, + this.pvm.timeZoneName, + this.pvm.languageName, + this.pvm.hour12 + )}`; + } + } + Warranty += WarrantyExpiryInfo; + + let PurchasedFrom = "-"; + if (r.purchaseFromVendorId) { + PurchasedFrom = ` ${r.purchaseFromVendor}`; + } + let PurchasedDate = "-"; + if (r.purchaseDate) { + PurchasedDate = window.$gz.locale.utcDateToShortDateAndTimeLocalized( + r.purchaseDate, + this.pvm.timeZoneName, + this.pvm.languageName, + this.pvm.hour12 + ); + } + let PurchaseInfo = `${this.$ay.t( + "UnitPurchaseFromID" + )}: ${PurchasedFrom}
${this.$ay.t( + "UnitPurchasedDate" + )}: ${PurchasedDate}
${this.$ay.t( + "UnitReceipt" + )}: ${r.purchaseReceiptNumber ?? "-"}`; + + let RecentWorkOrderList = ""; + if (r.recentWorkOrders.length > 0) { + RecentWorkOrderList += "
"; + r.recentWorkOrders.forEach(x => { + RecentWorkOrderList += ` ${ + x.serial + }${window.$gz.locale.utcDateToShortDateAndTimeLocalized( + x.serviceDate, + this.pvm.timeZoneName, + this.pvm.languageName, + this.pvm.hour12 + )}
`; + }); + } else { + RecentWorkOrderList = "-"; + } + + let RecentWorkOrders = `${this.$ay.t( + "RecentWorkOrders" + )}:${RecentWorkOrderList}`; + + let d = `
${Warranty}
${PurchaseInfo}
${RecentWorkOrders}
`; this.value.items[this.activeWoItemIndex].units[ this.activeItemIndex - ].warrantyViz = `
${JSON.stringify(res.data)}
`; - - // console.log( - // "warrantyviz:", - // this.value.items[this.activeWoItemIndex].units[this.activeItemIndex] - // .warrantyViz - // ); + ].warrantyViz = d; } }, showBulkUnitsDialog() { diff --git a/ayanova/src/views/svc-workorder.vue b/ayanova/src/views/svc-workorder.vue index b6ede89b..97f2dd36 100644 --- a/ayanova/src/views/svc-workorder.vue +++ b/ayanova/src/views/svc-workorder.vue @@ -2177,7 +2177,14 @@ async function fetchTranslatedText(vm) { "CopyToWorkOrder", "WorkOrderConvertScheduledUserToLabor", "AppendTasks", - "UnitWarrantyInfo" + "UnitWarrantyInfo", + "UnitModelLifeTimeWarranty", + "Warranty", + "WarrantyExpires", + "UnitPurchaseFromID", + "UnitPurchasedDate", + "UnitReceipt", + "RecentWorkOrders" ]); }