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

src/router/router.js

@@ -14,6 +14,7 @@ const downList = r => require.ensure([], () => r(require('../views/IM/diagnosis-
 export default [{
     path: '/',
     component: App,
+    mode: 'history',
     children: [
         {
             path: '',
@@ -45,7 +46,6 @@ export default [{
         }, {
             path: '/diagnosis-list-new',
             component: diagnosisListNew
-            
         }, {
             path: '/down-list',
             component: downList

src/utils/constants.js

@@ -323,7 +323,7 @@ export const RUN_TAB_LIST = [
 export const TRIAGE_TAB_LIST = [
   {
     label: '全部',
-    active: '1'
+    active: '99'
   },
   {
     label: '待诊断',
@@ -335,7 +335,7 @@ export const TRIAGE_TAB_LIST = [
 export const  RECEPTION_TAB_LIST = [
   {
     label: '全部',
-    active: '1'
+    active: '99'
   },
   {
     label: '待匹配医生',

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

@@ -231,11 +231,11 @@
       <appointment-time :appointmentTimeVisible.sync="appointmentTimeVisible" :diagnoseLogId="diagnoseLogId" :bizType="bizType"></appointment-time>
       <diagnosis-time :diagnosisTimeVisible.sync="diagnosisTimeVisible" :diagnoseLogId="diagnoseLogId" :bizType="bizType"></diagnosis-time>
     </div>
+    <a class="target" href="" target="_blank" ref="target"></a>
   </div>
 </template>
 <script>
 import {updateDiagnosis} from "../../../utils/diagnosis";
-let vm = null;
 const DOWN_URL= '/diagnose/admin/diagnose/export';
 const LIST_URL= '/diagnose/admin/diagnose/list';
 const DEP_URL= '/hospital/departments/0'
@@ -335,17 +335,32 @@ export default {
   activated() {
     this.search();
   },
+  watch: { 
+    '$route': {
+      handler(newVal, oldVal) {
+          // this.getview(newVal, oldVal)
+          if (newVal) {
+            this.init()
+          }
+      },
+      deep: true,
+      immediate: true,
+    } 
+  },
   created() {
-    vm = this;
-    this.fromType = +(this.$route.query.fromType || 1);
-    this.setTable();
     this.getDep()
   },
   mounted() {
     this.setTableHeight();
-    this.search();
   },
   methods: {
+    init(){
+      this.fromType = +(this.$route.query.fromType || 1);
+      this.activeName =  "99";
+      this.status = '99'
+      this.setTable();
+      this.search();
+    }, 
     // 不同也main切换不同的tab
     setTable() {
       let tabs = ALL_TAB_LIST;
@@ -372,6 +387,7 @@ export default {
           break;
       }
       this.tabpaneList = tabs;
+     
     },
     // 设置table的高度
     setTableHeight() {
@@ -473,10 +489,13 @@ export default {
     },
     //查看详情/编辑详情
     goDetail(row,flag) {
-      this.$router.push({
-        path: "/diagnosis-editor",
-        query: { id: row.diagnoseLogId, editorType: flag },
-      });
+      // this.$router.push({
+      //   path: "/diagnosis-editor",
+      //   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()
     },
     //取消/退款
     cancelRefund(row) {
@@ -529,13 +548,13 @@ export default {
         }
         updateDiagnosis(req).then(function (res) {
           if (res.code == "000000") {
-            // vm.cancel();
-            vm.search();
+            // this.cancel();
+            this.search();
           } else {
-            vm.$message.error(res.message);
+            this.$message.error(res.message);
           }
         }).catch(function (error) {
-          vm.$message.error(error);
+          this.$message.error(error);
         });
 
       })
@@ -594,13 +613,13 @@ export default {
         }
         updateDiagnosis(req).then(function (res) {
           if (res.code == "000000") {
-            // vm.cancel();
-            vm.search();
+            // this.cancel();
+            this.search();
           } else {
-            vm.$message.error(res.message);
+            this.$message.error(res.message);
           }
         }).catch(function (error) {
-          vm.$message.error(error);
+          this.$message.error(error);
         });
 
       })