3028361f by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 0a0d6d35 805d31c5
...@@ -102,14 +102,14 @@ ...@@ -102,14 +102,14 @@
102 this.$message.success("转件成功"); 102 this.$message.success("转件成功");
103 popupCacel(); 103 popupCacel();
104 setTimeout(() => { 104 setTimeout(() => {
105 window.close();
106 this.$emit("input", false);
105 if (window.opener && window.opener.getBpageList) { 107 if (window.opener && window.opener.getBpageList) {
106 window.opener.getBpageList(); 108 window.opener.getBpageList();
107 } else { 109 } else {
108 window.opener.frames[0].getBpageList(); 110 window.opener.frames[0].getBpageList();
109 } 111 }
110 window.close(); 112 }, 360);
111 this.$emit("input", false);
112 }, 1000);
113 } else { 113 } else {
114 this.$message.error(res.message); 114 this.$message.error(res.message);
115 } 115 }
......