Merge branch 'new_version' of http://1.94.244.160:3000/ruiqigogs/yf-portal-vue into new_version

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");

src/views/flow/index.vue

@@ -645,6 +645,13 @@ const handleDetailClick = (task, type) => {
         query: { type: task.name.toLowerCase() },
       });
     }
+
+    if (task.name === "EHR" && type === "todo") {
+      router.push({
+        path: "/ehr-todo-list",
+        query: { type: task.name.toLowerCase() },
+      });
+    }
   } else {
     // 示例：根据类型跳转
     if (task.name === "OA" && type === "todo") {