diff --git a/ayanova/src/components/data-table-filter-control.vue b/ayanova/src/components/data-table-filter-control.vue index f5e84837..f7211428 100644 --- a/ayanova/src/components/data-table-filter-control.vue +++ b/ayanova/src/components/data-table-filter-control.vue @@ -466,7 +466,6 @@ export default { return window.$gz.enums.getSelectionList(enumKey); }, addFilterCondition(editItem) { - // filter:[{column:"PartPartNumber",any:true/false,items:[{op: "=",value: "400735"}]}], const filterItem = { op: null, value: null, display: null }; let filterItemSet = false; diff --git a/ayanova/src/views/inv-part-inventory-transactions.vue b/ayanova/src/views/inv-part-inventory-transactions.vue index 41f4fcb3..f5ec16dd 100644 --- a/ayanova/src/views/inv-part-inventory-transactions.vue +++ b/ayanova/src/views/inv-part-inventory-transactions.vue @@ -43,8 +43,8 @@ export default { clearable: true }; vm.clientCriteria = `${ - vm.$route.params.filter.PartPartNumber - ? vm.$route.params.filter.PartPartNumber + vm.$route.params.filter.PartName + ? vm.$route.params.filter.PartName : "0" },${ vm.$route.params.filter.PartWarehouseName diff --git a/ayanova/src/views/inv-part-inventory.vue b/ayanova/src/views/inv-part-inventory.vue index 7b3599ca..d241a12f 100644 --- a/ayanova/src/views/inv-part-inventory.vue +++ b/ayanova/src/views/inv-part-inventory.vue @@ -43,8 +43,8 @@ export default { clearable: true }; vm.clientCriteria = `${ - vm.$route.params.filter.PartPartNumber - ? vm.$route.params.filter.PartPartNumber + vm.$route.params.filter.PartName + ? vm.$route.params.filter.PartName : "0" },${ vm.$route.params.filter.PartWarehouseName diff --git a/ayanova/src/views/inv-part-requests.vue b/ayanova/src/views/inv-part-requests.vue index 77cb662a..45e1d920 100644 --- a/ayanova/src/views/inv-part-requests.vue +++ b/ayanova/src/views/inv-part-requests.vue @@ -45,8 +45,8 @@ export default { clearable: true }; vm.clientCriteria = `${ - vm.$route.params.filter.PartPartNumber - ? vm.$route.params.filter.PartPartNumber + vm.$route.params.filter.PartName + ? vm.$route.params.filter.PartName : "0" },${ vm.$route.params.filter.PartWarehouseName diff --git a/ayanova/src/views/inv-part.vue b/ayanova/src/views/inv-part.vue index 6feb881c..c58846b5 100644 --- a/ayanova/src/views/inv-part.vue +++ b/ayanova/src/views/inv-part.vue @@ -7,32 +7,32 @@ @@ -328,9 +328,9 @@ export default { this.obj = this.$route.params.obj; this.obj.concurrency = undefined; this.obj.id = 0; - this.obj.partNumber = `${ - this.obj.partNumber - } - ${window.$gz.translation.get("Copy")}`; + this.obj.name = `${this.obj.name} - ${window.$gz.translation.get( + "Copy" + )}`; setDirty = true; } } @@ -373,7 +373,8 @@ export default { wiki: null, customFields: "{}", tags: [], - partNumber: null, + name: null, + description: null, manufacturerId: null, manufacturerNumber: null, wholeSalerId: null, @@ -638,12 +639,10 @@ async function clickHandler(menuItem) { name: "inv-part-inventory", params: { filter: { - PartPartNumber: m.vm.obj.partNumber, + PartName: m.vm.obj.name, objectId: m.vm.obj.id, ayatype: window.$gz.type.Part, - viz: - m.vm.obj.partNumber + - (m.vm.obj.name ? " " + m.vm.obj.name : ""), + viz: m.vm.obj.name + (m.vm.obj.name ? " " + m.vm.obj.name : ""), icon: "$ayiBoxes" } } @@ -654,12 +653,10 @@ async function clickHandler(menuItem) { name: "inv-part-inventory-transactions", params: { filter: { - PartPartNumber: m.vm.obj.partNumber, + PartName: m.vm.obj.name, objectId: m.vm.obj.id, ayatype: window.$gz.type.Part, - viz: - m.vm.obj.partNumber + - (m.vm.obj.name ? " " + m.vm.obj.name : ""), + viz: m.vm.obj.name + (m.vm.obj.name ? " " + m.vm.obj.name : ""), icon: "$ayiBoxes" } } @@ -671,7 +668,7 @@ async function clickHandler(menuItem) { params: { aType: m.vm.ayaType, objectId: m.vm.obj.id, - name: m.vm.obj.partNumber + name: m.vm.obj.name } }); break; @@ -681,7 +678,7 @@ async function clickHandler(menuItem) { params: { aType: m.vm.ayaType, objectId: m.vm.obj.id, - name: m.vm.obj.partNumber + name: m.vm.obj.name } }); break; @@ -691,7 +688,7 @@ async function clickHandler(menuItem) { params: { aType: m.vm.ayaType, objectId: m.vm.obj.id, - name: m.vm.obj.partNumber + name: m.vm.obj.name } }); break; @@ -718,7 +715,8 @@ function generateMenu(vm) { ayaType: window.$gz.type.Part, recordId: vm.$route.params.recordid, formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY, - recordName: vm.obj.partNumber + (vm.obj.name ? " " + vm.obj.name : "") + recordName: + vm.obj.name + (vm.obj.description ? " " + vm.obj.description : "") }, menuItems: [] }; @@ -880,7 +878,7 @@ async function fetchTranslatedText(vm) { "PartStockingLevels", "PartName", "PartNotes", - "PartPartNumber", + "PartDescription", "PartCost", "PartRetail", "PartManufacturerID", diff --git a/ayanova/src/views/inv-purchase-order.vue b/ayanova/src/views/inv-purchase-order.vue index 2651b5cd..e1b4c9f5 100644 --- a/ayanova/src/views/inv-purchase-order.vue +++ b/ayanova/src/views/inv-purchase-order.vue @@ -1218,7 +1218,7 @@ export default { headers.push({ text: this.$ay.t("Part"), align: "left", - value: "partNumber" + value: "partName" }); if (this.obj.hasSelectableWarehouses) { @@ -1261,7 +1261,7 @@ export default { index: i, partId: x.partId, partWarehouseId: x.partWarehouseId, - partNumber: x.partNumber, + partName: x.partName, warehouseViz: x.warehouseViz, minimumQuantity: window.$gz.locale.decimalLocalized( @@ -1288,7 +1288,7 @@ export default { headers.push({ text: this.$ay.t("Part"), align: "left", - value: "partNumber" + value: "partName" }); if (this.obj.hasSelectableWarehouses) { @@ -1340,7 +1340,7 @@ export default { requestedByUserViz: x.requestedByUserName, partId: x.partId, partWarehouseId: x.partWarehouseId, - partNumber: x.partNumber, + partName: x.partName, partWarehouseName: x.partWarehouseName, serial: x.serial, wholesalerName: x.wholesalerName, diff --git a/ayanova/src/views/svc-unit.vue b/ayanova/src/views/svc-unit.vue index 55379586..450cf0be 100644 --- a/ayanova/src/views/svc-unit.vue +++ b/ayanova/src/views/svc-unit.vue @@ -748,7 +748,7 @@ export default { this.obj.customerId = gen.customerId; this.obj.serial = gen.serial; this.obj.purchasedDate = gen.purchaseDate; - this.obj.description = p.partNumber; + this.obj.description = p.name; if ( gen.address || gen.city || diff --git a/ayanova/tests/e2e/specs/smoke.js b/ayanova/tests/e2e/specs/smoke.js index eea1e308..9bdc0f32 100644 --- a/ayanova/tests/e2e/specs/smoke.js +++ b/ayanova/tests/e2e/specs/smoke.js @@ -206,7 +206,7 @@ describe("SMOKE", () => { cy.visit("/inv-parts/1"); cy.url({ timeout: 10000 }).should("include", "/inv-parts/1"); - cy.get("[data-cy=partNumber]"); + cy.get("[data-cy=partName]"); cy.visit("/inv-purchase-orders"); cy.url({ timeout: 10000 }).should("include", "/inv-purchase-orders");