0a0d6d35 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents ce0433c7 14041956
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-19 13:58:43 4 * @LastEditTime: 2024-01-19 16:48:37
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -80,13 +80,13 @@ ...@@ -80,13 +80,13 @@
80 popupCacel(); 80 popupCacel();
81 that.$message.success("转件成功"); 81 that.$message.success("转件成功");
82 setTimeout(() => { 82 setTimeout(() => {
83 window.close();
84 that.$emit("input", false);
83 if (window.opener && window.opener.getBpageList) { 85 if (window.opener && window.opener.getBpageList) {
84 window.opener.getBpageList(); 86 window.opener.getBpageList();
85 } else { 87 } else {
86 window.opener.frames[0].getBpageList(); 88 window.opener.frames[0].getBpageList();
87 } 89 }
88 window.close();
89 that.$emit("input", false);
90 }, 360); 90 }, 360);
91 } else { 91 } else {
92 this.$message.error(res.message); 92 this.$message.error(res.message);
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-17 10:42:01 4 * @LastEditTime: 2024-01-19 16:43:43
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -102,7 +102,6 @@ ...@@ -102,7 +102,6 @@
102 this.$message.success("转件成功"); 102 this.$message.success("转件成功");
103 popupCacel(); 103 popupCacel();
104 setTimeout(() => { 104 setTimeout(() => {
105 // window.opener.location.reload(); //刷新父窗口
106 if (window.opener && window.opener.getBpageList) { 105 if (window.opener && window.opener.getBpageList) {
107 window.opener.getBpageList(); 106 window.opener.getBpageList();
108 } else { 107 } else {
......