Fix code conflict.
This commit is contained in:
parent
50dc339660
commit
cfbb50131a
1 changed files with 19 additions and 13 deletions
|
|
@ -76,6 +76,10 @@ export default {
|
||||||
vm.setCmsContent(cmsContent);
|
vm.setCmsContent(cmsContent);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
setup() {
|
||||||
|
const mainStore = useMainStore();
|
||||||
|
return { mainStore };
|
||||||
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
selectedAnswer: null,
|
selectedAnswer: null,
|
||||||
|
|
@ -131,7 +135,7 @@ export default {
|
||||||
Text: duplicateOrderText,
|
Text: duplicateOrderText,
|
||||||
Name: o.referralNumber,
|
Name: o.referralNumber,
|
||||||
SubText: toTitleCase(subtext),
|
SubText: toTitleCase(subtext),
|
||||||
value: o,
|
value: o.correlationId,
|
||||||
};
|
};
|
||||||
}) ?? []
|
}) ?? []
|
||||||
);
|
);
|
||||||
|
|
@ -145,19 +149,21 @@ export default {
|
||||||
* @summary Steps to perform when forward button clicked.
|
* @summary Steps to perform when forward button clicked.
|
||||||
*/
|
*/
|
||||||
async forwardButtonAction() {
|
async forwardButtonAction() {
|
||||||
if (
|
if (this.selectedAnswer !== null) {
|
||||||
this.selectedAnswer !== null &&
|
const selectedReferral =
|
||||||
typeof this.selectedAnswer === 'object'
|
this.mainStore.applicationUser.duplicateOrders.find(
|
||||||
) {
|
(o) => o.correlationId === this.selectedAnswer
|
||||||
await useMainStore()
|
);
|
||||||
.loadSession(this.selectedAnswer)
|
if (selectedReferral) {
|
||||||
.catch(() => {})
|
await this.mainStore
|
||||||
.finally(() => {
|
.loadSession(selectedReferral)
|
||||||
this.navigateForward();
|
.catch(() => {})
|
||||||
});
|
.finally(() => {
|
||||||
return;
|
this.navigateForward();
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
this.navigateForward();
|
this.navigateForward();
|
||||||
},
|
},
|
||||||
navigateForward() {
|
navigateForward() {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue