This commit is contained in:
@@ -863,6 +863,7 @@ BUILD 8.0.0-beta.0.13 CHANGES OF NOTE
|
|||||||
- fixed bug in wo, quote, pm that could result in grand child objects server validation errors not showing on subsequent save attempt after successful save just prior
|
- fixed bug in wo, quote, pm that could result in grand child objects server validation errors not showing on subsequent save attempt after successful save just prior
|
||||||
- fixed bug in expenses grandchildren for wo, quote, pm preventing displaying server validation errors properly
|
- fixed bug in expenses grandchildren for wo, quote, pm preventing displaying server validation errors properly
|
||||||
- fixed bug in form customization code that could sometimes prevent updates
|
- fixed bug in form customization code that could sometimes prevent updates
|
||||||
|
- fixed bug in wo, quote, pm where changing a unit in *ItemUnit level could trigger an error or contract change was not handled properly
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -517,19 +517,19 @@ export default {
|
|||||||
if (!id || id == 0) {
|
if (!id || id == 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const res = await window.$gz.api.get(`unit/active-contract/${id}`);
|
const res = await window.$gz.api.get(`unit/work-order-info/${id}`);
|
||||||
if (res.error) {
|
if (res.error) {
|
||||||
window.$gz.eventBus.$emit(
|
window.$gz.eventBus.$emit(
|
||||||
"notify-warning",
|
"notify-warning",
|
||||||
window.$gz.errorHandler.errorToString(res, this)
|
window.$gz.errorHandler.errorToString(res, this)
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
if (res.data.id == 0) {
|
if (res.data.contract.id == 0) {
|
||||||
//no contract, just bail
|
//no contract, just bail
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
//has contract, if it differs from main work order contract then offer to set it
|
//has contract, if it differs from main work order contract then offer to set it
|
||||||
if (res.data.id == this.value.contractId) {
|
if (res.data.contract.id == this.value.contractId) {
|
||||||
//same contract, just bail
|
//same contract, just bail
|
||||||
//yes the date could not be different but we're not going to pick that nit, they can just unset and set if it matters
|
//yes the date could not be different but we're not going to pick that nit, they can just unset and set if it matters
|
||||||
return;
|
return;
|
||||||
@@ -537,7 +537,7 @@ export default {
|
|||||||
//Prompt user to use new contract
|
//Prompt user to use new contract
|
||||||
const prompt = this.$ay
|
const prompt = this.$ay
|
||||||
.t("ApplyUnitContract")
|
.t("ApplyUnitContract")
|
||||||
.replace("{0}", res.data.name);
|
.replace("{0}", res.data.contract.name);
|
||||||
|
|
||||||
const dialogResult = await window.$gz.dialog.confirmGenericPreTranslated(
|
const dialogResult = await window.$gz.dialog.confirmGenericPreTranslated(
|
||||||
prompt,
|
prompt,
|
||||||
@@ -546,7 +546,7 @@ export default {
|
|||||||
if (dialogResult == false) {
|
if (dialogResult == false) {
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
this.value.contractId = res.data.id;
|
this.value.contractId = res.data.contract.id;
|
||||||
this.value.isDirty = true;
|
this.value.isDirty = true;
|
||||||
this.pvm.formState.dirty = true;
|
this.pvm.formState.dirty = true;
|
||||||
this.$emit("change");
|
this.$emit("change");
|
||||||
|
|||||||
@@ -509,19 +509,19 @@ export default {
|
|||||||
if (!id || id == 0) {
|
if (!id || id == 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const res = await window.$gz.api.get(`unit/active-contract/${id}`);
|
const res = await window.$gz.api.get(`unit/work-order-info/${id}`);
|
||||||
if (res.error) {
|
if (res.error) {
|
||||||
window.$gz.eventBus.$emit(
|
window.$gz.eventBus.$emit(
|
||||||
"notify-warning",
|
"notify-warning",
|
||||||
window.$gz.errorHandler.errorToString(res, this)
|
window.$gz.errorHandler.errorToString(res, this)
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
if (res.data.id == 0) {
|
if (res.data.contract.id == 0) {
|
||||||
//no contract, just bail
|
//no contract, just bail
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
//has contract, if it differs from main work order contract then offer to set it
|
//has contract, if it differs from main work order contract then offer to set it
|
||||||
if (res.data.id == this.value.contractId) {
|
if (res.data.contract.id == this.value.contractId) {
|
||||||
//same contract, just bail
|
//same contract, just bail
|
||||||
//yes the date could not be different but we're not going to pick that nit, they can just unset and set if it matters
|
//yes the date could not be different but we're not going to pick that nit, they can just unset and set if it matters
|
||||||
return;
|
return;
|
||||||
@@ -529,7 +529,7 @@ export default {
|
|||||||
//Prompt user to use new contract
|
//Prompt user to use new contract
|
||||||
const prompt = this.$ay
|
const prompt = this.$ay
|
||||||
.t("ApplyUnitContract")
|
.t("ApplyUnitContract")
|
||||||
.replace("{0}", res.data.name);
|
.replace("{0}", res.data.contract.name);
|
||||||
|
|
||||||
const dialogResult = await window.$gz.dialog.confirmGenericPreTranslated(
|
const dialogResult = await window.$gz.dialog.confirmGenericPreTranslated(
|
||||||
prompt,
|
prompt,
|
||||||
@@ -538,7 +538,7 @@ export default {
|
|||||||
if (dialogResult == false) {
|
if (dialogResult == false) {
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
this.value.contractId = res.data.id;
|
this.value.contractId = res.data.contract.id;
|
||||||
this.value.isDirty = true;
|
this.value.isDirty = true;
|
||||||
this.pvm.formState.dirty = true;
|
this.pvm.formState.dirty = true;
|
||||||
this.$emit("change");
|
this.$emit("change");
|
||||||
|
|||||||
@@ -560,7 +560,7 @@ export default {
|
|||||||
//CONTRACT
|
//CONTRACT
|
||||||
if (res.data.contract.id != 0) {
|
if (res.data.contract.id != 0) {
|
||||||
//has contract, if it differs from main work order contract then offer to set it
|
//has contract, if it differs from main work order contract then offer to set it
|
||||||
if (res.data.id == this.value.contractId) {
|
if (res.data.contract.id == this.value.contractId) {
|
||||||
//same contract, just bail
|
//same contract, just bail
|
||||||
//yes the date could not be different but we're not going to pick that nit, they can just unset and set if it matters
|
//yes the date could not be different but we're not going to pick that nit, they can just unset and set if it matters
|
||||||
return;
|
return;
|
||||||
@@ -568,7 +568,7 @@ export default {
|
|||||||
//Prompt user to use new contract
|
//Prompt user to use new contract
|
||||||
const prompt = this.$ay
|
const prompt = this.$ay
|
||||||
.t("ApplyUnitContract")
|
.t("ApplyUnitContract")
|
||||||
.replace("{0}", res.data.name);
|
.replace("{0}", res.data.contract.name);
|
||||||
|
|
||||||
const dialogResult = await window.$gz.dialog.confirmGenericPreTranslated(
|
const dialogResult = await window.$gz.dialog.confirmGenericPreTranslated(
|
||||||
prompt,
|
prompt,
|
||||||
@@ -577,7 +577,7 @@ export default {
|
|||||||
if (dialogResult == false) {
|
if (dialogResult == false) {
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
this.value.contractId = res.data.id;
|
this.value.contractId = res.data.contract.id;
|
||||||
this.value.isDirty = true;
|
this.value.isDirty = true;
|
||||||
this.pvm.formState.dirty = true;
|
this.pvm.formState.dirty = true;
|
||||||
this.$emit("change");
|
this.$emit("change");
|
||||||
|
|||||||
Reference in New Issue
Block a user