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

This commit is contained in:
fanlin
2021-07-27 10:41:42 +08:00
@@ -628,7 +628,7 @@ export default {
name: "OtherStandardDetails", name: "OtherStandardDetails",
params: { params: {
id: data.id, id: data.id,
pageType: data.sarType pageType: data.standType
} }
}); });
window.open(routeUrl.href, "_blank"); window.open(routeUrl.href, "_blank");
@@ -660,10 +660,10 @@ export default {
// //
changeState(row) { changeState(row) {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
name: "ComplianceDetails", name: "OtherStandardDetails",
query: { query: {
sarId: row.resId, id: data.id,
sarType: row.sarState pageType: this.standType
} }
}); });
window.open(routeUrl.href, "_blank"); window.open(routeUrl.href, "_blank");