From cc22952fb6b22b5e793a4a09a9b156145d028896 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 26 Aug 2021 15:38:48 +0000 Subject: [PATCH] --- ayanova/src/views/inv-purchase-order.vue | 48 ++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/ayanova/src/views/inv-purchase-order.vue b/ayanova/src/views/inv-purchase-order.vue index a9ea5315..a41f3584 100644 --- a/ayanova/src/views/inv-purchase-order.vue +++ b/ayanova/src/views/inv-purchase-order.vue @@ -836,7 +836,7 @@ {{ $ay.t("PurchaseOrderUICopyToPurchaseOrder") }} @@ -1147,7 +1147,7 @@ export default { headers.push({ text: vm.$ay.t("PurchaseOrderItemWorkOrderNumber"), align: "left", - value: "workorderItemPartRequestViz" + value: "workOrderItemPartRequestViz" }); } } @@ -1192,7 +1192,7 @@ export default { partNameViz: x.partNameViz, warehouseViz: x.warehouseViz, partRequestedByViz: x.partRequestedByViz, - workorderItemPartRequestViz: x.workorderItemPartRequestViz, + workOrderItemPartRequestViz: x.workOrderItemPartRequestViz, purchaseTaxCodeViz: x.purchaseTaxCodeViz, netTotalViz: window.$gz.locale.currencyLocalized( x.netTotalViz, @@ -1324,6 +1324,12 @@ export default { value: "serial" }); + headers.push({ + text: vm.$ay.t("PurchaseOrderItemPartRequestedByID"), + align: "left", + value: "requestedByUserName" + }); + headers.push({ text: vm.$ay.t("PartWholesalerID"), align: "left", @@ -1362,6 +1368,8 @@ export default { return { index: i, requestId: x.requestId, + requestedByUserId: x.requestedByUserId, + requestedByUserViz: x.requestedByUserName, partId: x.partId, partWarehouseId: x.partWarehouseId, partNumber: x.partNumber, @@ -1472,6 +1480,39 @@ export default { window.$gz.errorHandler.handleFormError(error, vm); } }, + appendSelectedRequests() { + let itemAdded = false; + this.selectedRequests.forEach(z => { + this.obj.items.push({ + id: 0, + purchaseOrderId: 0, + partId: z.partId, + partWarehouseId: z.partWarehouseId, + quantityOrdered: z.quantity, + quantityReceived: 0, + purchaseOrderCost: 0, + receivedCost: 0.0, + receivedDate: null, + partRequestedById: z.requestedByUserId, + partRequestedByViz: z.requestedByUserName, + workOrderItemPartRequestId: z.requestId, + workOrderItemPartRequestViz: z.serial, + purchaseTaxCodeId: + window.$gz.store.state.globalSettings.defaultTaxPartPurchaseId, + vendorPartNumber: null + }); + + if (!this.itemAdded) { + this.formState.dirty = true; + itemAdded = true; + } + }); + this.requestSelectDialog = false; + if (itemAdded) { + this.selectedRequests = []; + this.submit(); + } + }, poItemsRowClasses: function(item) { const path = `Items[${item.index}].`; if (this.form().childRowHasError(this, path)) { @@ -1951,6 +1992,7 @@ async function fetchTranslatedText(vm) { "WorkOrderItemPartRequestList", "WorkOrderItemPartRequest", "WorkOrderItemPartRequestQuantity", + "PurchaseOrderItemPartRequestedByID", "PartWholesalerID", "PartAlternativeWholesalerID", "PurchaseOrderUICopyToPurchaseOrder",