Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

liuyg

2021-05-08 c0a7df34b21d65b54119844abc5d95ca70495e71

 src/components/real-popup/main.vue

@@ -562,7 +562,6 @@
          }).then((resdata) => {});
          //   that.onLoad(that.page, that.query);
          if (t == "办结") {
            console.log(t, 354343);
            location.reload();
          } else {
            that.$router.push({