Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
super_liu
2022-04-01 17:39:52 +08:00
2 changed files with 2 additions and 1 deletions
@@ -1437,6 +1437,7 @@ export default {
rowlist2 = rowlist2.join(';') rowlist2 = rowlist2.join(';')
rowlist3 = rowlist3.join(';') rowlist3 = rowlist3.join(';')
let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO)) let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
sarAccessEO.reNewPeople = this.$store.getters.userInfo.userId
sarAccessEO.inforlist = rowlist sarAccessEO.inforlist = rowlist
sarAccessEO.inforlist1 = rowlist1 sarAccessEO.inforlist1 = rowlist1
sarAccessEO.inforlist2 = rowlist2 sarAccessEO.inforlist2 = rowlist2
@@ -1027,7 +1027,7 @@ export default {
name: "OtherStandardDetails", name: "OtherStandardDetails",
params: { params: {
id: data.id, id: data.id,
pageType: data.standType, pageType: data.standType === 'INLAND' ? 'INLAND_STAND' : data.standType,
} }
}); });
window.open(routeUrl.href, "_blank"); window.open(routeUrl.href, "_blank");