yanghao пре 1 дан
родитељ
комит
b555aaa5c0
1 измењених фајлова са 16 додато и 5 уклоњено
  1. 16 5
      src/views/flow/ehrTodoList.vue

+ 16 - 5
src/views/flow/ehrTodoList.vue

@@ -195,12 +195,23 @@ const goBackPage = async (row) => {
           },
         });
       } else if (isDesktop) {
-        const newTab = window.open("", "_blank");
-        newTab.location.href = `${res.ehrUrl}/gateway/login/free?loginfree_licence=${res.licence}&signature=${res.sign}&redirect_url=${res.redirect}`;
+        // const newTab = window.open("", "_blank");
+        // newTab.location.href = `${res.ehrUrl}/gateway/login/free?loginfree_licence=${res.licence}&signature=${res.sign}&redirect_url=${res.redirect}`;
 
-        setTimeout(() => {
-          newTab.location.href = `${res.ehrUrl}/gateway/login/free?loginfree_licence=${res.licence}&signature=${res.sign}&redirect_url=${row.web_url}`;
-        }, 500);
+        // setTimeout(() => {
+        //   newTab.location.href = `${res.ehrUrl}/gateway/login/free?loginfree_licence=${res.licence}&signature=${res.sign}&redirect_url=${row.web_url}`;
+        // }, 500);
+
+        dd.biz.util.openLink({
+          url: `${res.ehrUrl}/gateway/login/free?loginfree_licence=${res.licence}&signature=${res.sign}&redirect_url=${res.redirect}`,
+          onSuccess: () => {
+            setTimeout(() => {
+              dd.biz.util.openLink({
+                url: `${res.ehrUrl}/gateway/login/free?loginfree_licence=${res.licence}&signature=${res.sign}&redirect_url=${row.web_url}`,
+              });
+            }, 500);
+          },
+        });
       }
     } else {
       const newTab = window.open("", "_blank");