Merge remote-tracking branch 'origin/dev-20210702' into dev-20210702

src/views/IM/diagnosis-admin/diagnosis-list-new.vue

@@ -529,8 +529,9 @@ export default {
       //   query: { id: row.diagnoseLogId, editorType: flag },
       // });
       let target = this.$refs.target
-        target.setAttribute('href', window.location.origin + `/#/diagnosis-editor?id=${row.diagnoseLogId}&editorType=${flag}`)
-        target.click()
+      const { origin, pathname } = window.location
+      target.setAttribute('href', `${origin}${pathname}#/diagnosis-editor?id=${row.diagnoseLogId}&editorType=${flag}`)
+      target.click()
     },
     //取消/退款
     cancelRefund(row) {