Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -12,15 +12,15 @@
     </template>
     <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567 "><!--&& org_id != 10188 && org_id != 0-->
         <div class='dialysisPage'>
-          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 " >
+          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 && org_id != 0 " >
             <printOne v-if="org_id != 10088 && org_id != 10510 && org_id != 0" :paramsObj="invoiceParams"></printOne>
             <printThree v-if="org_id == 10088 " :paramsObj="invoiceParams"></printThree>
             <printfifteen v-if="org_id == 10510 " :paramsObj="invoiceParams"></printfifteen>
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
-          <printFive v-if="org_id == 10188 || org_id == 0 " :paramsObj="invoiceParams"></printFive>
-          <!-- <printthirteen v-if="org_id == 10188 || org_id == 0 " :paramsObj="invoiceParams"></printthirteen> -->
+          <!-- <printFive v-if="org_id == 10188 " :paramsObj="invoiceParams"></printFive> -->
+          <printthirteen v-if="org_id == 10188 || org_id == 0 " :paramsObj="invoiceParams"></printthirteen>
 <!--         <printEight v-if="org_id == 10387 || org_id == 0" :paramsObj="invoiceParams"></printEight>-->
           <print-eight v-if="org_id == 10387" :paramsObj="invoiceParams"></print-eight>
           <PrintNight v-if="org_id == 10210" :paramsObj="invoiceParams"></PrintNight>

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

@@ -686,13 +686,16 @@ export default {
       this.patient_id = val.patient_id
       this.dialysis_date = val.dialysis_date
     },
-    rowclick(event){
-
-      console.log('kkkkkkk',event);
-      this.patient_id = event.patient_id
-      this.dialysis_date = parseTime(event.dialysis_date, '{y}-{m}-{d}')
-      this.drawer =true
-      this.dialysisShow =true
+    rowclick(val){
+      this.$router.push({
+        path: "/dialysis/details",
+        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.drawer =true
+      // this.dialysisShow =true
     },
     exportList(){
       import('@/vendor/Export2Excel').then(excel => {