12月11

src/router/modules/dialysis.js

@@ -350,6 +350,18 @@ export default {
       is_menu: false,
       noCache: true
     },
+    // 透析记录2
+    {
+      path: '/dialysis/details/indexs',
+      component: () => import('@/xt_pages/dialysis/details/indexs'),
+      name: 'details',
+      meta: {
+        title: 'details'
+      },
+      hidden: true,
+      is_menu: false,
+      noCache: true
+    },
 
     {
       path: '/dialysis/print/batch',

src/xt_pages/outpatientDoctorStation/components/dialysishistory.vue

@@ -300,10 +300,14 @@ export default{
 
     },
     rowclick(event){
-      this.patient_id = event.patient_id
-      this.dialysis_date = parseTime(event.dialysis_date, '{y}-{m}-{d}')
-      this.drawer =true
-      this.dialysisShow =true
+      this.$router.push({
+        path: "/dialysis/details/indexs",
+        query: { patient_id: event.patient_id, date: event.dialysis_date }
+      });
+      // this.patient_id = event.patient_id
+      // this.dialysis_date = parseTime(event.dialysis_date, '{y}-{m}-{d}')
+      // this.drawer =true
+      // this.dialysisShow =true
     },
     clickCurrent(){
 

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -111,7 +111,7 @@
             <el-tab-pane label="透析记录" name="透析记录">
             </el-tab-pane>
             <el-tab-pane label="电子病历" name="电子病历"></el-tab-pane>
-            <!-- <el-tab-pane label="透析历史" name="透析历史"></el-tab-pane> -->
+            <el-tab-pane label="透析历史" name="透析历史"></el-tab-pane>
 
           </el-tabs>
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子处方'">
@@ -191,7 +191,7 @@
         <dialysis-index v-if="titleType == '透析记录'" :record_date="record_date" :patientid='patientid'
                         :dialysisShow="dialysisShow"></dialysis-index>
 
-        <!-- <dialysishistory v-if="titleType == '透析历史'" :patientid='patientid'></dialysishistory> -->
+        <dialysishistory v-if="titleType == '透析历史'" :patientid='patientid'></dialysishistory>
       </div>
 
     </div>

src/xt_pages/user/dialysisRecord.vue

@@ -418,7 +418,7 @@
           </div> -->
 
 
-          <dialysisIndextwo :record_date="dialysis_date" :patientid='patient_id' :dialysisShow="dialysisShow" :dialysis_date="dialysis_date"></dialysisIndextwo>
+          <!-- <dialysisIndextwo :record_date="dialysis_date" :patientid='patient_id' :dialysisShow="dialysisShow" :dialysis_date="dialysis_date"></dialysisIndextwo> -->
         </div>
 
       </el-drawer>
@@ -432,7 +432,6 @@ import {getDialysisScheduleDetail,getLongAdviceTwo} from '@/api/dialysis_record'
 import { uParseTime } from "@/utils/tools";
 import { parseTime } from '@/utils'
 import { fetchAllDoctorAndNurse } from "@/api/doctor";
-import dialysisIndextwo from '../outpatientDoctorStation/components/dialysisIndextwo'
 import print from "print-js";
 
 export default {
@@ -478,7 +477,6 @@ export default {
   },
   components: {
     PatientSidebar,
-    dialysisIndextwo
   },
   methods: {
     getTime(record){
@@ -682,24 +680,25 @@ export default {
       }, 1);
     },
     clickCurrent(val) {
-      
+
       this.patient_id = val.patient_id
       this.dialysis_date = val.dialysis_date
     },
     rowclick(val){
+      // console.log('kkkkkkk',val.dialysis_date);
       this.$router.push({
-        path: "/dialysis/details",
+        path: "/dialysis/details/indexs",
         query: { patient_id: val.patient_id, date: val.dialysis_date }
       });
       // console.log('kkkkkkk',event);
-      // this.patient_id = event.patient_id
-      // this.dialysis_date = parseTime(event.dialysis_date, '{y}-{m}-{d}')
+      // this.patient_id = val.patient_id
+      // this.dialysis_date = parseTime(val.dialysis_date, '{y}-{m}-{d}')
       // this.drawer =true
       // this.dialysisShow =true
     },
     exportList(){
       import('@/vendor/Export2Excel').then(excel => {
-       
+
          if(this.recordData!=null && this.recordData.length > 0){
           for(let i=0;i<this.recordData.length;i++){
             this.recordData[i].dialysis_date_one = this.getTimeOne(this.recordData[i].dialysis_date)