冲突合并2

src/views/personal/todoDetail.vue

@@ -2432,13 +2432,6 @@ export default {
       })
      
     },
-    printQR(){
-      const path = this.target.validateCode;
-      console.log(path)
-      if (!path){
-          this.$message("二维码还未生成，无法打印。")
-          return;
-      },
     // 文档预览
     officeFileView(name, url) {
       const route = this.$router.resolve({
@@ -2449,16 +2442,23 @@ export default {
           // 文档url地址
           url: url
         }
+      });
+      // 在新窗口打开页面
+      window.open(route.href, "_blank");
+    },
+    printQR(){
+      const path = this.target.validateCode;
+      console.log(path)
+      if (!path){
+          this.$message("二维码还未生成，无法打印。")
+          return;
+      }
       let routeUrl = this.$router.resolve({
           path: `/print/code?path=${path}`
       });
       window.open(routeUrl.href, '_blank');
   
     }
-      });
-      // 在新窗口打开页面
-      window.open(route.href, "_blank");
-    }
   }
 }
 </script>