From 7377e8ddb06b8620cf809e1f8413cc26a3d2046f Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 14 Oct 2021 23:19:12 +0000 Subject: [PATCH] case 3999 --- ayanova/src/components/pm-item-units.vue | 24 ++++++----------- ayanova/src/components/quote-item-units.vue | 24 ++++++----------- .../src/components/work-order-item-units.vue | 24 ++++++----------- ayanova/src/views/customer-csr-edit.vue | 2 +- ayanova/src/views/svc-pm.vue | 1 - ayanova/src/views/svc-quote.vue | 1 - ayanova/src/views/svc-unit-model.vue | 26 +++---------------- ayanova/src/views/svc-workorder.vue | 3 +-- 8 files changed, 29 insertions(+), 76 deletions(-) diff --git a/ayanova/src/components/pm-item-units.vue b/ayanova/src/components/pm-item-units.vue index 07d428c4..0af4a691 100644 --- a/ayanova/src/components/pm-item-units.vue +++ b/ayanova/src/components/pm-item-units.vue @@ -718,21 +718,6 @@ export default { }); } - if (this.form().showMe(this, "UnitModelModelNumber")) { - headers.push({ - text: this.$ay.t("UnitModelModelNumber"), - align: "left", - value: "unitModelModelNumberViz" - }); - } - if (this.form().showMe(this, "UnitModelVendorID")) { - headers.push({ - text: this.$ay.t("UnitModelVendorID"), - align: "left", - value: "unitModelVendorViz" - }); - } - if (this.form().showMe(this, "UnitModelName")) { headers.push({ text: this.$ay.t("UnitModelName"), @@ -741,6 +726,14 @@ export default { }); } + if (this.form().showMe(this, "UnitModelVendorID")) { + headers.push({ + text: this.$ay.t("UnitModelVendorID"), + align: "left", + value: "unitModelVendorViz" + }); + } + if (this.form().showMe(this, "UnitDescription")) { headers.push({ text: this.$ay.t("UnitDescription"), @@ -768,7 +761,6 @@ export default { index: i, id: x.id, unitViz: x.unitViz, - unitModelModelNumberViz: x.unitModelModelNumberViz, unitModelVendorViz: x.unitModelVendorViz, unitModelNameViz: x.unitModelNameViz, unitDescriptionViz: x.unitDescriptionViz, diff --git a/ayanova/src/components/quote-item-units.vue b/ayanova/src/components/quote-item-units.vue index a7b9345f..1cfcf080 100644 --- a/ayanova/src/components/quote-item-units.vue +++ b/ayanova/src/components/quote-item-units.vue @@ -719,21 +719,6 @@ export default { }); } - if (this.form().showMe(this, "UnitModelModelNumber")) { - headers.push({ - text: this.$ay.t("UnitModelModelNumber"), - align: "left", - value: "unitModelModelNumberViz" - }); - } - if (this.form().showMe(this, "UnitModelVendorID")) { - headers.push({ - text: this.$ay.t("UnitModelVendorID"), - align: "left", - value: "unitModelVendorViz" - }); - } - if (this.form().showMe(this, "UnitModelName")) { headers.push({ text: this.$ay.t("UnitModelName"), @@ -742,6 +727,14 @@ export default { }); } + if (this.form().showMe(this, "UnitModelVendorID")) { + headers.push({ + text: this.$ay.t("UnitModelVendorID"), + align: "left", + value: "unitModelVendorViz" + }); + } + if (this.form().showMe(this, "UnitDescription")) { headers.push({ text: this.$ay.t("UnitDescription"), @@ -769,7 +762,6 @@ export default { index: i, id: x.id, unitViz: x.unitViz, - unitModelModelNumberViz: x.unitModelModelNumberViz, unitModelVendorViz: x.unitModelVendorViz, unitModelNameViz: x.unitModelNameViz, unitDescriptionViz: x.unitDescriptionViz, diff --git a/ayanova/src/components/work-order-item-units.vue b/ayanova/src/components/work-order-item-units.vue index d12b26eb..4f448910 100644 --- a/ayanova/src/components/work-order-item-units.vue +++ b/ayanova/src/components/work-order-item-units.vue @@ -754,21 +754,6 @@ export default { }); } - if (this.form().showMe(this, "UnitModelModelNumber")) { - headers.push({ - text: this.$ay.t("UnitModelModelNumber"), - align: "left", - value: "unitModelModelNumberViz" - }); - } - if (this.form().showMe(this, "UnitModelVendorID")) { - headers.push({ - text: this.$ay.t("UnitModelVendorID"), - align: "left", - value: "unitModelVendorViz" - }); - } - if (this.form().showMe(this, "UnitModelName")) { headers.push({ text: this.$ay.t("UnitModelName"), @@ -777,6 +762,14 @@ export default { }); } + if (this.form().showMe(this, "UnitModelVendorID")) { + headers.push({ + text: this.$ay.t("UnitModelVendorID"), + align: "left", + value: "unitModelVendorViz" + }); + } + if (this.form().showMe(this, "UnitDescription")) { headers.push({ text: this.$ay.t("UnitDescription"), @@ -804,7 +797,6 @@ export default { index: i, id: x.id, unitViz: x.unitViz, - unitModelModelNumberViz: x.unitModelModelNumberViz, unitModelVendorViz: x.unitModelVendorViz, unitModelNameViz: x.unitModelNameViz, unitDescriptionViz: x.unitDescriptionViz, diff --git a/ayanova/src/views/customer-csr-edit.vue b/ayanova/src/views/customer-csr-edit.vue index 6594f4a3..8e8cc69c 100644 --- a/ayanova/src/views/customer-csr-edit.vue +++ b/ayanova/src/views/customer-csr-edit.vue @@ -85,7 +85,7 @@ :variant="unitListVariant()" template="[ { fld: 'UnitSerial' }, - { fld: 'UnitModelModelNumber' }, + { fld: 'UnitModelName' }, { fld: 'UnitModelVendorID' } ]" v-model="obj.unitId" diff --git a/ayanova/src/views/svc-pm.vue b/ayanova/src/views/svc-pm.vue index a85c4e50..a22f6c06 100644 --- a/ayanova/src/views/svc-pm.vue +++ b/ayanova/src/views/svc-pm.vue @@ -2102,7 +2102,6 @@ async function fetchTranslatedText(vm) { "AppendTasks", "UnitWarrantyInfo", "UnitModelLifeTimeWarranty", - "UnitModelModelNumber", "UnitModelVendorID", "UnitModelName", "UnitDescription", diff --git a/ayanova/src/views/svc-quote.vue b/ayanova/src/views/svc-quote.vue index aa755321..eb004402 100644 --- a/ayanova/src/views/svc-quote.vue +++ b/ayanova/src/views/svc-quote.vue @@ -2167,7 +2167,6 @@ async function fetchTranslatedText(vm) { "AppendTasks", "UnitWarrantyInfo", "UnitModelLifeTimeWarranty", - "UnitModelModelNumber", "UnitModelVendorID", "UnitModelName", "UnitDescription", diff --git a/ayanova/src/views/svc-unit-model.vue b/ayanova/src/views/svc-unit-model.vue index 980052bd..bcf926ac 100644 --- a/ayanova/src/views/svc-unit-model.vue +++ b/ayanova/src/views/svc-unit-model.vue @@ -6,29 +6,11 @@ - - - -