case 4025 replaced partnumber with partname and changed partname to partdescription

This commit is contained in:
2021-11-22 20:30:03 +00:00
parent e15bb0c915
commit baa38997f6
8 changed files with 41 additions and 44 deletions

View File

@@ -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;

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -7,32 +7,32 @@
<v-row>
<v-col cols="12" sm="6" lg="4" xl="3">
<v-text-field
v-model="obj.partNumber"
v-model="obj.name"
:readonly="formState.readOnly"
:label="$ay.t('PartPartNumber')"
:rules="[form().required(this, 'partNumber')]"
:error-messages="form().serverErrors(this, 'partNumber')"
ref="partNumber"
data-cy="partNumber"
@input="fieldValueChanged('partNumber')"
:label="$ay.t('PartName')"
:rules="[form().required(this, 'name')]"
:error-messages="form().serverErrors(this, 'name')"
ref="name"
data-cy="name"
@input="fieldValueChanged('name')"
></v-text-field>
</v-col>
<v-col
v-if="form().showMe(this, 'Name')"
v-if="form().showMe(this, 'Description')"
cols="12"
sm="6"
lg="4"
xl="3"
>
<v-text-field
v-model="obj.name"
v-model="obj.description"
:readonly="formState.readOnly"
:label="$ay.t('PartName')"
ref="name"
data-cy="name"
:error-messages="form().serverErrors(this, 'name')"
@input="fieldValueChanged('name')"
:label="$ay.t('PartDescription')"
ref="description"
data-cy="description"
:error-messages="form().serverErrors(this, 'description')"
@input="fieldValueChanged('description')"
></v-text-field>
</v-col>
@@ -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",

View File

@@ -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,

View File

@@ -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 ||

View File

@@ -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");