From ab0df7eeafbfcbdac0cb5bfbb90c90e4caab67a5 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 26 May 2021 21:17:56 +0000 Subject: [PATCH] --- .../work-order-item-part-requests.vue | 186 ++++++------------ 1 file changed, 62 insertions(+), 124 deletions(-) diff --git a/ayanova/src/components/work-order-item-part-requests.vue b/ayanova/src/components/work-order-item-part-requests.vue index a41c2ae5..1d996a34 100644 --- a/ayanova/src/components/work-order-item-part-requests.vue +++ b/ayanova/src/components/work-order-item-part-requests.vue @@ -332,13 +332,33 @@ WORKORDER ITEM PART REQUEST l.Add(new FormField { TKey = "WorkOrderItemPartRequestPartID", FieldKey = "WorkOrderItemPartRequestPartID", TKeySection = "WorkOrderItemPartRequests" }); l.Add(new FormField { TKey = "WorkOrderItemPartRequestPartWarehouseID", FieldKey = "WorkOrderItemPartRequestPartWarehouseID", TKeySection = "WorkOrderItemPartRequests" }); l.Add(new FormField { TKey = "WorkOrderItemPartRequestQuantity", FieldKey = "WorkOrderItemPartRequestQuantity", TKeySection = "WorkOrderItemPartRequests" }); -l.Add(new FormField { TKey = "PartUPC", FieldKey = "PartUPC", TKeySection = "WorkOrderItemPartRequests" }); +l.Add(new FormField { TKey = "PartUPC", FieldKey = "PartRequestPartUPC", TKeySection = "WorkOrderItemPartRequests" }); l.Add(new FormField { TKey = "PurchaseOrder", FieldKey = "WorkOrderItemPartRequestPurchaseOrder", TKeySection = "WorkOrderItemPartRequests" }); l.Add(new FormField { TKey = "PurchaseOrderExpectedReceiveDate", FieldKey = "WorkOrderItemPartRequestExpectedReceiveDate", TKeySection = "WorkOrderItemPartRequests" }); l.Add(new FormField { TKey = "PurchaseOrderOrderedDate", FieldKey = "WorkOrderItemPartRequestOrderedDate", TKeySection = "WorkOrderItemPartRequests" }); l.Add(new FormField { TKey = "WorkOrderItemPartRequestOnOrder", FieldKey = "WorkOrderItemPartRequestOnOrder", TKeySection = "WorkOrderItemPartRequests" }); l.Add(new FormField { TKey = "WorkOrderItemPartRequestReceived", FieldKey = "WorkOrderItemPartRequestReceived", TKeySection = "WorkOrderItemPartRequests" }); - +{ +"0": { +"id": 39, +"concurrency": 8121176, +"partId": 3, +"partViz": "565221", +"upcViz": "2202707210364", +"partWarehouseId": 1, +"partWarehouseViz": "Default", +"quantity": 1, +"purchaseOrderItemId": null, +"purchaseOrderViz": null, +"purchaseOrderIdViz": null, +"purchaseOrderDateViz": null, +"purchaseOrderExpectedDateViz": null, +"purchaseOrderOnOrderViz": false, +"received": 0, +"isDirty": false, +"workOrderItemId": 20 + } +} */ export default { created() { @@ -497,31 +517,31 @@ export default { */ let headers = []; - if (this.form().showMe(this, "WorkOrderItemPartPartID")) { + if (this.form().showMe(this, "WorkOrderItemPartRequestPartID")) { headers.push({ - text: this.$ay.t("WorkOrderItemPartPartID"), + text: this.$ay.t("WorkOrderItemPartRequestPartID"), align: "left", value: "partViz" }); } - if (this.form().showMe(this, "WorkOrderItemPartPartWarehouseID")) { + if (this.form().showMe(this, "WorkOrderItemPartRequestPartWarehouseID")) { headers.push({ - text: this.$ay.t("WorkOrderItemPartPartWarehouseID"), + text: this.$ay.t("WorkOrderItemPartRequestPartWarehouseID"), align: "left", value: "partWarehouseViz" }); } - if (this.form().showMe(this, "WorkOrderItemPartQuantity")) { + if (this.form().showMe(this, "WorkOrderItemPartRequestQuantity")) { headers.push({ - text: this.$ay.t("WorkOrderItemPartQuantity"), + text: this.$ay.t("WorkOrderItemPartRequestQuantity"), align: "right", value: "quantity" }); } - if (this.form().showMe(this, "PartUPC")) { + if (this.form().showMe(this, "PartRequestPartUPC")) { headers.push({ text: this.$ay.t("PartUPC"), align: "left", @@ -529,101 +549,47 @@ export default { }); } - if (this.form().showMe(this, "WorkOrderItemPartDescription")) { + if (this.form().showMe(this, "WorkOrderItemPartRequestPurchaseOrder")) { headers.push({ - text: this.$ay.t("WorkOrderItemPartDescription"), + text: this.$ay.t("PurchaseOrder"), align: "left", - value: "description" + value: "purchaseOrderViz" }); } - if (this.form().showMe(this, "WorkOrderItemPartSerials")) { + if (this.form().showMe(this, "WorkOrderItemPartRequestOrderedDate")) { headers.push({ - text: this.$ay.t("PurchaseOrderItemSerialNumbers"), - align: "left", - value: "serials" - }); - } - - if (this.form().showMe(this, "PartUnitOfMeasureViz")) { - headers.push({ - text: this.$ay.t("UnitOfMeasure"), - align: "left", - value: "unitOfMeasureViz" - }); - } - - if (this.form().showMe(this, "PartCost")) { - headers.push({ - text: this.$ay.t("Cost"), + text: this.$ay.t("PurchaseOrderOrderedDate"), align: "right", - value: "cost" + value: "purchaseOrderDateViz" }); } - if (this.form().showMe(this, "PartListPrice")) { + if ( + this.form().showMe(this, "WorkOrderItemPartRequestExpectedReceiveDate") + ) { headers.push({ - text: this.$ay.t("ListPrice"), + text: this.$ay.t("PurchaseOrderExpectedReceiveDate"), align: "right", - value: "listPrice" + value: "purchaseOrderExpectedDateViz" }); } - if (this.form().showMe(this, "PartPriceOverride")) { + if (this.form().showMe(this, "WorkOrderItemPartRequestOnOrder")) { headers.push({ - text: this.$ay.t("PriceOverride"), + text: this.$ay.t("WorkOrderItemPartRequestOnOrder"), + value: "purchaseOrderOnOrderViz" + }); + } + + if (this.form().showMe(this, "WorkOrderItemPartRequestReceived")) { + headers.push({ + text: this.$ay.t("WorkOrderItemPartRequestReceived"), align: "right", - value: "priceOverride" + value: "received" }); } - if (this.form().showMe(this, "PartPriceViz")) { - headers.push({ - text: this.$ay.t("Price"), - align: "right", - value: "priceViz" - }); - } - - if (this.form().showMe(this, "WorkOrderItemPartTaxPartSaleID")) { - headers.push({ - text: this.$ay.t("Tax"), - align: "left", - value: "taxPartSaleViz" - }); - } - - if (this.form().showMe(this, "PartNetViz")) { - headers.push({ - text: this.$ay.t("NetPrice"), - align: "right", - value: "netViz" - }); - } - - if (this.form().showMe(this, "PartTaxAViz")) { - headers.push({ - text: this.$ay.t("TaxAAmt"), - align: "right", - value: "taxAViz" - }); - } - - if (this.form().showMe(this, "PartTaxBViz")) { - headers.push({ - text: this.$ay.t("TaxBAmt"), - align: "right", - value: "taxBViz" - }); - } - - if (this.form().showMe(this, "PartLineTotalViz")) { - headers.push({ - text: this.$ay.t("LineTotal"), - align: "right", - value: "lineTotalViz" - }); - } return headers; }, itemList: function() { @@ -638,50 +604,22 @@ export default { this.pvm.languageName ), upcViz: x.upcViz, - description: x.description, - serials: window.$gz.util.truncateString(x.serials, 50), - unitOfMeasureViz: x.unitOfMeasureViz, - cost: window.$gz.locale.currencyLocalized( - x.cost, + purchaseOrderViz: x.purchaseOrderViz, + purchaseOrderIdViz: x.purchaseOrderIdViz, + purchaseOrderDateViz: window.$gz.locale.utcDateToShortDateAndTimeLocalized( + x.purchaseOrderDateViz, + this.pvm.timeZoneName, this.pvm.languageName, - this.pvm.currencyName + this.pvm.hour12 ), - listPrice: window.$gz.locale.currencyLocalized( - x.listPrice, + purchaseOrderExpectedDateViz: window.$gz.locale.utcDateToShortDateAndTimeLocalized( + x.purchaseOrderExpectedDateViz, + this.pvm.timeZoneName, this.pvm.languageName, - this.pvm.currencyName + this.pvm.hour12 ), - priceViz: window.$gz.locale.currencyLocalized( - x.priceViz, - this.pvm.languageName, - this.pvm.currencyName - ), - taxPartSaleViz: x.taxPartSaleViz, - priceOverride: window.$gz.locale.currencyLocalized( - x.priceOverride, - this.pvm.languageName, - this.pvm.currencyName - ), - netViz: window.$gz.locale.currencyLocalized( - x.netViz, - this.pvm.languageName, - this.pvm.currencyName - ), - taxAViz: window.$gz.locale.currencyLocalized( - x.taxAViz, - this.pvm.languageName, - this.pvm.currencyName - ), - taxBViz: window.$gz.locale.currencyLocalized( - x.taxBViz, - this.pvm.languageName, - this.pvm.currencyName - ), - lineTotalViz: window.$gz.locale.currencyLocalized( - x.lineTotalViz, - this.pvm.languageName, - this.pvm.currencyName - ) + purchaseOrderOnOrderViz: x.purchaseOrderOnOrderViz, + received: x.received }; }); },