admin/raven-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

case 4025 replaced partnumber with partname and changed partname to partdescription

Browse Source
This commit is contained in:
John Cardinal
2021-11-22 20:30:03 +00:00
parent e15bb0c915
commit baa38997f6
8 changed files with 41 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ayanova/src/components/data-table-filter-control.vue
View File

@@ -466,7 +466,6 @@ export default {
return window.$gz.enums.getSelectionList(enumKey); return window.$gz.enums.getSelectionList(enumKey);
}, },
addFilterCondition(editItem) { addFilterCondition(editItem) {
// filter:[{column:"PartPartNumber",any:true/false,items:[{op: "=",value: "400735"}]}],
const filterItem = { op: null, value: null, display: null }; const filterItem = { op: null, value: null, display: null };
let filterItemSet = false; let filterItemSet = false;

4
ayanova/src/views/inv-part-inventory-transactions.vue
View File

@@ -43,8 +43,8 @@ export default {
clearable: true clearable: true
}; };
vm.clientCriteria = `${ vm.clientCriteria = `${
vm.$route.params.filter.PartPartNumber vm.$route.params.filter.PartName
? vm.$route.params.filter.PartPartNumber ? vm.$route.params.filter.PartName
: "0" : "0"
},${ },${
vm.$route.params.filter.PartWarehouseName vm.$route.params.filter.PartWarehouseName

4
ayanova/src/views/inv-part-inventory.vue
View File

@@ -43,8 +43,8 @@ export default {
clearable: true clearable: true
}; };
vm.clientCriteria = `${ vm.clientCriteria = `${
vm.$route.params.filter.PartPartNumber vm.$route.params.filter.PartName
? vm.$route.params.filter.PartPartNumber ? vm.$route.params.filter.PartName
: "0" : "0"
},${ },${
vm.$route.params.filter.PartWarehouseName vm.$route.params.filter.PartWarehouseName

4
ayanova/src/views/inv-part-requests.vue
View File

@@ -45,8 +45,8 @@ export default {
clearable: true clearable: true
}; };
vm.clientCriteria = `${ vm.clientCriteria = `${
vm.$route.params.filter.PartPartNumber vm.$route.params.filter.PartName
? vm.$route.params.filter.PartPartNumber ? vm.$route.params.filter.PartName
: "0" : "0"
},${ },${
vm.$route.params.filter.PartWarehouseName vm.$route.params.filter.PartWarehouseName

60
ayanova/src/views/inv-part.vue
View File

@@ -7,32 +7,32 @@
<v-row> <v-row>
<v-col cols="12" sm="6" lg="4" xl="3"> <v-col cols="12" sm="6" lg="4" xl="3">
<v-text-field <v-text-field
v-model="obj.partNumber" v-model="obj.name"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('PartPartNumber')" :label="$ay.t('PartName')"
:rules="[form().required(this, 'partNumber')]" :rules="[form().required(this, 'name')]"
:error-messages="form().serverErrors(this, 'partNumber')" :error-messages="form().serverErrors(this, 'name')"
ref="partNumber" ref="name"
data-cy="partNumber" data-cy="name"
@input="fieldValueChanged('partNumber')" @input="fieldValueChanged('name')"
></v-text-field> ></v-text-field>
</v-col> </v-col>
<v-col <v-col
v-if="form().showMe(this, 'Name')" v-if="form().showMe(this, 'Description')"
cols="12" cols="12"
sm="6" sm="6"
lg="4" lg="4"
xl="3" xl="3"
> >
<v-text-field <v-text-field
v-model="obj.name" v-model="obj.description"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('PartName')" :label="$ay.t('PartDescription')"
ref="name" ref="description"
data-cy="name" data-cy="description"
:error-messages="form().serverErrors(this, 'name')" :error-messages="form().serverErrors(this, 'description')"
@input="fieldValueChanged('name')" @input="fieldValueChanged('description')"
></v-text-field> ></v-text-field>
</v-col> </v-col>
@@ -328,9 +328,9 @@ export default {
this.obj = this.$route.params.obj; this.obj = this.$route.params.obj;
this.obj.concurrency = undefined; this.obj.concurrency = undefined;
this.obj.id = 0; this.obj.id = 0;
this.obj.partNumber = `${ this.obj.name = `${this.obj.name} - ${window.$gz.translation.get(
this.obj.partNumber "Copy"
} - ${window.$gz.translation.get("Copy")}`; )}`;
setDirty = true; setDirty = true;
} }
} }
@@ -373,7 +373,8 @@ export default {
wiki: null, wiki: null,
customFields: "{}", customFields: "{}",
tags: [], tags: [],
partNumber: null, name: null,
description: null,
manufacturerId: null, manufacturerId: null,
manufacturerNumber: null, manufacturerNumber: null,
wholeSalerId: null, wholeSalerId: null,
@@ -638,12 +639,10 @@ async function clickHandler(menuItem) {
name: "inv-part-inventory", name: "inv-part-inventory",
params: { params: {
filter: { filter: {
PartPartNumber: m.vm.obj.partNumber, PartName: m.vm.obj.name,
objectId: m.vm.obj.id, objectId: m.vm.obj.id,
ayatype: window.$gz.type.Part, ayatype: window.$gz.type.Part,
viz: viz: m.vm.obj.name + (m.vm.obj.name ? " " + m.vm.obj.name : ""),
m.vm.obj.partNumber +
(m.vm.obj.name ? " " + m.vm.obj.name : ""),
icon: "$ayiBoxes" icon: "$ayiBoxes"
} }
} }
@@ -654,12 +653,10 @@ async function clickHandler(menuItem) {
name: "inv-part-inventory-transactions", name: "inv-part-inventory-transactions",
params: { params: {
filter: { filter: {
PartPartNumber: m.vm.obj.partNumber, PartName: m.vm.obj.name,
objectId: m.vm.obj.id, objectId: m.vm.obj.id,
ayatype: window.$gz.type.Part, ayatype: window.$gz.type.Part,
viz: viz: m.vm.obj.name + (m.vm.obj.name ? " " + m.vm.obj.name : ""),
m.vm.obj.partNumber +
(m.vm.obj.name ? " " + m.vm.obj.name : ""),
icon: "$ayiBoxes" icon: "$ayiBoxes"
} }
} }
@@ -671,7 +668,7 @@ async function clickHandler(menuItem) {
params: { params: {
aType: m.vm.ayaType, aType: m.vm.ayaType,
objectId: m.vm.obj.id, objectId: m.vm.obj.id,
name: m.vm.obj.partNumber name: m.vm.obj.name
} }
}); });
break; break;
@@ -681,7 +678,7 @@ async function clickHandler(menuItem) {
params: { params: {
aType: m.vm.ayaType, aType: m.vm.ayaType,
objectId: m.vm.obj.id, objectId: m.vm.obj.id,
name: m.vm.obj.partNumber name: m.vm.obj.name
} }
}); });
break; break;
@@ -691,7 +688,7 @@ async function clickHandler(menuItem) {
params: { params: {
aType: m.vm.ayaType, aType: m.vm.ayaType,
objectId: m.vm.obj.id, objectId: m.vm.obj.id,
name: m.vm.obj.partNumber name: m.vm.obj.name
} }
}); });
break; break;
@@ -718,7 +715,8 @@ function generateMenu(vm) {
ayaType: window.$gz.type.Part, ayaType: window.$gz.type.Part,
recordId: vm.$route.params.recordid, recordId: vm.$route.params.recordid,
formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY, 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: [] menuItems: []
}; };
@@ -880,7 +878,7 @@ async function fetchTranslatedText(vm) {
"PartStockingLevels", "PartStockingLevels",
"PartName", "PartName",
"PartNotes", "PartNotes",
"PartPartNumber", "PartDescription",
"PartCost", "PartCost",
"PartRetail", "PartRetail",
"PartManufacturerID", "PartManufacturerID",

8
ayanova/src/views/inv-purchase-order.vue
View File

@@ -1218,7 +1218,7 @@ export default {
headers.push({ headers.push({
text: this.$ay.t("Part"), text: this.$ay.t("Part"),
align: "left", align: "left",
value: "partNumber" value: "partName"
}); });
if (this.obj.hasSelectableWarehouses) { if (this.obj.hasSelectableWarehouses) {
@@ -1261,7 +1261,7 @@ export default {
index: i, index: i,
partId: x.partId, partId: x.partId,
partWarehouseId: x.partWarehouseId, partWarehouseId: x.partWarehouseId,
partNumber: x.partNumber, partName: x.partName,
warehouseViz: x.warehouseViz, warehouseViz: x.warehouseViz,
minimumQuantity: window.$gz.locale.decimalLocalized( minimumQuantity: window.$gz.locale.decimalLocalized(
@@ -1288,7 +1288,7 @@ export default {
headers.push({ headers.push({
text: this.$ay.t("Part"), text: this.$ay.t("Part"),
align: "left", align: "left",
value: "partNumber" value: "partName"
}); });
if (this.obj.hasSelectableWarehouses) { if (this.obj.hasSelectableWarehouses) {
@@ -1340,7 +1340,7 @@ export default {
requestedByUserViz: x.requestedByUserName, requestedByUserViz: x.requestedByUserName,
partId: x.partId, partId: x.partId,
partWarehouseId: x.partWarehouseId, partWarehouseId: x.partWarehouseId,
partNumber: x.partNumber, partName: x.partName,
partWarehouseName: x.partWarehouseName, partWarehouseName: x.partWarehouseName,
serial: x.serial, serial: x.serial,
wholesalerName: x.wholesalerName, wholesalerName: x.wholesalerName,

2
ayanova/src/views/svc-unit.vue
View File

@@ -748,7 +748,7 @@ export default {
this.obj.customerId = gen.customerId; this.obj.customerId = gen.customerId;
this.obj.serial = gen.serial; this.obj.serial = gen.serial;
this.obj.purchasedDate = gen.purchaseDate; this.obj.purchasedDate = gen.purchaseDate;
this.obj.description = p.partNumber; this.obj.description = p.name;
if ( if (
gen.address || gen.address ||
gen.city || gen.city ||

2
ayanova/tests/e2e/specs/smoke.js
View File

@@ -206,7 +206,7 @@ describe("SMOKE", () => {
cy.visit("/inv-parts/1"); cy.visit("/inv-parts/1");
cy.url({ timeout: 10000 }).should("include", "/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.visit("/inv-purchase-orders");
cy.url({ timeout: 10000 }).should("include", "/inv-purchase-orders"); cy.url({ timeout: 10000 }).should("include", "/inv-purchase-orders");