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

2021-09-24 14:38:00 +08:00
parent 638490b6c1 7568a62949
commit 701ff4e07a
32 changed files with 2880 additions and 2606 deletions
@@ -1751,6 +1751,7 @@ export default {
      this.searchSarBykey();
    },
    judgeRolePermiOnSar(item, type) {
+      debugger
      let pagetype;
      if (type !== 5 && item.type === "msgdyinfo") {
        if (type === 2) {
@@ -1986,6 +1987,7 @@ export default {
    },
    // 查看 查看跳转详情页
    detailsStandardLaws(item) {
+      debugger
      let routername = "";
      let pagetype = "";
      if (item.type === "stand") {
@@ -1993,7 +1995,7 @@ export default {
              routername = "OtherStandardDetails";
              pagetype = "INLAND_STAND";
          } else {
-              routername = "OtherForeignDetails";
+              routername = "OtherStandardDetails";
              pagetype = "FOREIGN_STAND";
          }
      } else if (item.type === "laws") {