1

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -208,6 +208,13 @@
       </div>
     </div>
     <additionalCharges ref='additionalCharges' @click="addCharges" :addtions_charge="addtions_charge"></additionalCharges>
+    <el-dialog
+      class="centerDialog"
+      width="900px"
+      title="打印"
+      :visible.sync="treatVisible">
+      <treatPrint :paramsObj='paramsObj'></treatPrint>
+    </el-dialog>
   </div>
 </template>
 
@@ -221,6 +228,7 @@
   import additionalCharges from './components/additionalCharges'
   import { getPatientInformation, getPatientList } from '@/api/project/project'
   import { getPatientInfo, getSchedulePatientList, register, upload,Refund } from '@/api/his/his'
+  import treatPrint from './treatPrint'
 
   const moment = require('moment')
   export default {
@@ -230,7 +238,9 @@
       charged,
       medicalInsuranceRefund,
       prescriptionTable,
-      additionalCharges
+      additionalCharges,
+      treatPrint,
+      
     },
     data() {
       return {
@@ -276,6 +286,8 @@
         all_table_data:[],
         order:{},
         addtions_charge:[],
+        treatVisible:false,
+        paramsObj:{}
       }
     },
     created() {
@@ -478,7 +490,14 @@
           this.$router.push('/outpatientDoctorStation/printtwo?record=' + this.record_date)
 
         } else if (index == 3) {
-          this.$router.push('/outpatientCharges/treatPrint?record_date=' + this.record_date + '&patient_id=' + this.patient_id + '&prescription_id=' + this.prescription_id)
+          let obj = {
+            record_date:this.record_date,
+            patient_id:this.patient_id,
+            prescription_id:this.prescription_id
+          }
+          this.paramsObj = obj
+          this.treatVisible = true
+          // this.$router.push('/outpatientCharges/treatPrint?record_date=' + this.record_date + '&patient_id=' + this.patient_id + '&prescription_id=' + this.prescription_id)
         } else if (index == 4) {
 
           if(this.hisPatientInfo.id == 0){

src/xt_pages/outpatientCharges/treatPrint.vue

@@ -1,21 +1,19 @@
 <template>
-  <div class="main-contain">
-    <div class="position">
-      <bread-crumb :crumbs="crumbs"></bread-crumb>
-       <template>
-        <el-button
-          :loading="loading"
-          size="small"
-          icon="el-icon-printer"
-          @click="printThisPage"
-          type="primary"
-          >打印</el-button
-        >
-      </template>
-    </div>
-    <div class="app-container" style="min-height:0;">
-        <div class='dialysisPage' style="flex: 1;height: calc(100vh - 178px);overflow-x:auto;::-webkit-scrollbar:height:15px">
-            <printOne v-bind:childResponse="childResponse"></printOne>
+  <div>
+    <template>
+      <el-button
+        style="position:fixed;right:25px;z-index:999"
+        :loading="loading"
+        size="small"
+        icon="el-icon-printer"
+        @click="printThisPage"
+        type="primary"
+        >打印</el-button
+      >
+    </template>
+    <div class="app-container" style="padding-top:40px;">
+        <div class='dialysisPage'>
+            <printOne v-bind:childResponse="childResponse" :paramsObj="paramsObj"></printOne>
         </div>
     </div>
   </div>
@@ -41,6 +39,9 @@ export default {
     BreadCrumb,
     printOne
   },
+  props:{
+    paramsObj:Object
+  },
   data() {
     return {
       crumbs: [
@@ -48,6 +49,7 @@ export default {
         { path: false, name: "打印单" }
       ],
       childResponse: {},
+      paramsObj:{}
       
 
     };
@@ -100,6 +102,15 @@ export default {
   },
   created() {
   },
+  watch:{
+    paramsObj:{//深度监听，可监听到对象、数组的变化
+      handler(val, oldVal){
+        this.paramsObj = val
+        
+      },
+      deep:true
+    }
+  }
 };
 </script>
 

src/xt_pages/outpatientCharges/treatTemplate/printOne.vue

@@ -93,6 +93,9 @@ export default {
           patient:{},
       } 
     },
+    props:{
+        paramsObj:Object
+    },
     methods:{
        getChargePrint(record_date,patient_id,prescription_id){
            var params = {
@@ -117,19 +120,40 @@ export default {
        }
     },
     created(){
-       var record_date =  this.$route.query.record_date
+       var record_date =  this.paramsObj.record_date
        console.log("record_date",record_date)
-       var patient_id = this.$route.query.patient_id
+       var patient_id = this.paramsObj.patient_id
        console.log("patient_id",patient_id)
-       var prescription_id = this.$route.query.prescription_id
+       var prescription_id = this.paramsObj.prescription_id
        this.getChargePrint(record_date,patient_id,prescription_id)
 
+    },
+    watch:{
+        paramsObj:{//深度监听，可监听到对象、数组的变化
+        handler(val, oldVal){
+            this.paramsObj = val
+            this.patient_id = this.paramsObj.patient_id
+            var record_date = this.paramsObj.record
+            this.record_date = record_date
+            var prescription_id = this.paramsObj.prescription_id
+            this.prescription_id = prescription_id
+            
+        },
+        deep:true
+        }
     }
 }
 </script>
 
 
 <style lang="scss" scoped>
+.prescription-print{
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    margin-bottom: 20px;
+    padding:20px 10px;
+}
 .printTitle{
     font-size: 22px;
     text-align: center;

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -114,18 +114,26 @@
     </el-table>
     <el-dialog
       class="centerDialog"
-      width="560px"
+      width="600px"
       title="打印"
       :visible.sync="innerVisible"
       append-to-body>
       
-      <print :paramsObj='paramsObj'></print>
+      <print v-if="index == 2" :paramsObj='paramsObj'></print>
+      <treatPrint v-if="index == 6" :paramsObj='paramsObj'></treatPrint>
     </el-dialog>
       <span slot="footer" class="dialog-footer">
         <el-button @click="centerDialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="savePrint">确 定</el-button>
       </span>
     </el-dialog>
+    <el-dialog
+      class="centerDialog"
+      width="600px"
+      title="打印"
+      :visible.sync="recordVisible">
+      <recordPrint :patientid="patientid"></recordPrint>
+    </el-dialog>
 
   </div>
 </template>
@@ -141,6 +149,8 @@
   import { uParseTime } from '@/utils/tools'
   import { getPrescriptionList } from "@/api/project/project"
   import print from './print'
+  import treatPrint from './treatPrint'
+  import recordPrint from './recordPrint'
   export default {
     components: {
       BreadCrumb,
@@ -148,7 +158,9 @@
       deskRecord,
       medicalRecord,
       saveRecordTemplate,
-      print
+      print,
+      treatPrint,
+      recordPrint
     },
     data() {
       return {
@@ -196,7 +208,9 @@
         admin_info:{},
         saveLoading:false,
         innerVisible:false,
-        paramsObj:{}
+        paramsObj:{},
+        recordVisible:false,
+        recordObj:{}
 
       }
     },
@@ -640,7 +654,8 @@
           }
           this.$refs.child.createCaseHistory()
         } else if (index == 2) {
-          this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date+"&patient_id="+this.patientid)
+          this.recordVisible = true
+          // this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date+"&patient_id="+this.patientid)
         } else if (index == 3) {
            var mode_status =   this.$refs.saveRecordTemplate.mode_status
            console.log("数据返回",mode_status)
@@ -713,7 +728,15 @@
           //  this.$router.push("/outpatientDoctorStation/print?record="+this.record_date+"&prescription_id="+this.prescription_id+"&ids="+ids+"&patient_id="+this.patientid)
          }
          if(this.index == 6){
-            this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id+"&ids="+ids+"&patient_id="+this.patientid)
+          let obj = {
+            record:this.record_date,
+            prescription_id:this.prescription_id,
+            ids:ids,
+            patient_id:this.patientid
+          }
+          this.paramsObj = obj
+          this.innerVisible = true
+          // this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id+"&ids="+ids+"&patient_id="+this.patientid)
          }
       }
     },
@@ -1003,6 +1026,7 @@
   .centerDialog{
     .el-dialog__body{
       max-height: calc(100vh - 100px) !important;
+      padding: 0 20px;
     }
   }
 </style>

src/xt_pages/outpatientDoctorStation/print.vue

@@ -1,7 +1,8 @@
 <template>
   <div>
-       <template>
+      <template>
         <el-button
+          style="position:fixed;right:25px;z-index:999"
           :loading="loading"
           size="small"
           icon="el-icon-printer"
@@ -11,7 +12,7 @@
         >
       </template>
             
-    <div class='dialysisPage'>
+    <div class='dialysisPage' style="padding-top:40px;">
       <printOne v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
     </div>
   </div>

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -1,42 +1,18 @@
 <template>
-  <div class="main-contain">
-    <div class="position">
-      <bread-crumb :crumbs="crumbs"></bread-crumb>
-       <template>
-        <el-button
-          size="small"
-          icon="el-icon-printer"
-          @click="printThisPage"
-          type="primary"
-          >打印</el-button
-        >
-      </template>
-    </div>
-    <div class="app-container" style="min-height:0;">
-        <el-container class="newContainer">
-            <!-- <div style="width:270px;margin-right:20px;">
-                <div class="cell clearfix" style="margin-bottom:10px;">
-                    <el-input size="small"  v-model.trim="search_input" class="filter-item"/>
-                    <el-button size="small" class="filter-item" type="primary" :model="keyword" @click="searchAction">搜索</el-button>
-                </div>
-                <el-table ref="tab" @row-click="changePatient" highlight-current-row :data="patientTableData" height="480" border style="width: 100%">
-                    <el-table-column prop="date"  label="患者">
-                        <template slot-scope="scope">
-                            {{scope.row.patients.name?scope.row.patients.name:''}}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="name" label="就诊号">
-                        <template slot-scope="scope">
-                           {{ scope.row.his_patient.number ?scope.row.his_patient.number:''}}
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div> -->
+  <div>
+    <template>
+      <el-button
+        style="position:fixed;right:25px;z-index:999"
+        size="small"
+        icon="el-icon-printer"
+        @click="printThisPage"
+        type="primary"
+        >打印</el-button
+      >
+    </template>
             
-            <div class='dialysisPage' style="flex: 1;height: calc(100vh - 178px);overflow-x:auto;::-webkit-scrollbar:height:15px">
-              <printOne v-bind:childResponse="childResponse" :patient="patient" :hispatient = "hispatient" :history="history"></printOne>
-            </div>
-        </el-container>
+    <div class='dialysisPage' style="padding-top:40px;">
+      <printOne v-bind:childResponse="childResponse" :patient="patient" :hispatient="hispatient" :history="history" :patientid="patientid"></printOne>
     </div>
   </div>
 </template>
@@ -57,6 +33,9 @@ export default {
     BreadCrumb,
     printOne
   },
+  props:{
+    patientid:Number,
+  },
   data() {
     return {
       crumbs: [
@@ -70,7 +49,8 @@ export default {
       hispatient:{},
       educationOptions:[],
       history:{},
-      keyword:""
+      keyword:"",
+      patientid:''
     };
   },
   methods: {
@@ -160,7 +140,7 @@ export default {
     
   },
   created() {
-    this.getPatientList() 
+    // this.getPatientList() 
    
   },
   // computed:{

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

@@ -1,5 +1,6 @@
 <template>
-    <div id='prescription-print' class="prescription-print">
+<div id='prescription-print'>
+    <div class="prescription-print">
         <div class="printTitle">门诊病历</div>
         <div class="infoTitle">
             <div>姓名：{{patient.name?patient.name:''}}</div>
@@ -37,8 +38,9 @@
             <div style="flex:1;">{{patient.id?patient.id:''}}</div>
         </div>
         <div style="page-break-after:always;margin-top:50px;"></div>
+    </div>
 
-
+    <div class="prescription-print">
         <div class="printTitle">病历内容</div>
         <div class="recordTitle">
             <div>科别：{{getDeparment(hispatient.departments)?getDeparment(hispatient.departments):''}}</div>
@@ -89,6 +91,7 @@
             医生签名：{{getDoctor(history.doctor)?getDoctor(history.doctor):''}}
         </div>
     </div>
+</div>
 </template>
 <script>
 
@@ -98,6 +101,7 @@ export default {
     props:{
       patient:Object,
       hispatient:Object,
+      patientid:Number
     //   history:Object,
     },
     data(){
@@ -140,7 +144,7 @@ export default {
       getPatientCaseHistory(){
 
         const params = {
-          patient_id:this.$route.query.patient_id
+          patient_id:this.patientid
         }
       console.log("病历22222",params)
       getPatientCaseHistory(params).then(response=>{
@@ -179,6 +183,13 @@ export default {
 
 
 <style lang="scss" scoped>
+.prescription-print{
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    margin-bottom: 20px;
+    padding:20px 10px;
+}
 .printTitle{
     font-size: 22px;
     text-align: center;

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -183,13 +183,12 @@ export default {
 
      
    },
-  //  watch:{
-  //    patient_id:function(val){
-  //      console.log("101000010101010",this.patient_id,this.record_date,this.prescription_id)
-  //      this.getPrescriptionPrint()
-  //      this.getHisPatientDetail()
-  //    }
-  //  }
+   watch:{
+    ids:function(val){
+      this.ids = val
+      this.getPrescriptionPrint()
+    }
+   }
 }
 </script>
 
@@ -200,7 +199,7 @@ export default {
     -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     margin-bottom: 20px;
-    padding:20px 0px;
+    padding:20px 10px;
 }
 .printTitle{
     font-size: 22px;

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -1,9 +1,8 @@
 <template>
-  <div class="main-contain">
-    <div class="position">
-      <bread-crumb :crumbs="crumbs"></bread-crumb>
+  <div>
        <template>
         <el-button
+          style="position:fixed;right:25px;z-index:999"
           :loading="loading"
           size="small"
           icon="el-icon-printer"
@@ -12,30 +11,10 @@
           >打印</el-button
         >
       </template>
-    </div>
-    <div class="app-container" style="min-height:0;">
-        <el-container class="newContainer">
-            <!-- <div style="width:270px;margin-right:20px;">
-                <div class="cell clearfix" style="margin-bottom:10px;">
-                    <el-input size="small"  v-model.trim="search_input" class="filter-item"/>
-                    <el-button size="small" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
-                </div>
-                <el-table ref="tab"   @current-change="changePatient" highlight-current-row :data="patientTableData" 
-                 height="480" border style="width: 100%">
-                    <el-table-column prop="date"  label="患者">   
-                      <template slot-scope="scope">{{scope.row.patients?scope.row.patients.name:''}}</template> 
-                    </el-table-column>
-                    <el-table-column prop="name" label="就诊号">
-                        <template slot-scope="scope">{{ scope.row.his_patient ?scope.row.his_patient.number:''}}</template>
-                    </el-table-column>
-                </el-table>
-            </div> -->
             
-            <div class='dialysisPage' style="flex: 1;height: calc(100vh - 178px);overflow-x:auto;::-webkit-scrollbar:height:15px;margin：0 auto；width：960px;">
-              <printOne v-bind:childResponse="childResponse" :advicePrint="advicePrint" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
-            </div>
-        </el-container>
-    </div>
+      <div class='dialysisPage' style="padding-top:40px;">
+        <printOne v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+      </div>
   </div>
 </template>
 
@@ -57,6 +36,9 @@ export default {
     BreadCrumb,
     printOne
   },
+  props:{
+    paramsObj:Object
+  },
   data() {
     return {
       crumbs: [
@@ -71,7 +53,8 @@ export default {
       search_input:"",
       loading:false,
       patient_id:0,
-      prescription_id:0
+      prescription_id:0,
+      ids:''
     };
   },
   methods:{
@@ -126,9 +109,9 @@ export default {
                 cal_two = cal_two + 1
               }
             }
-            this.$refs.tab.setCurrentRow(this.patientTableData[0])
-            console.log(this.patientTableData[0])
-            this.choosePatient(this.patientTableData[0])
+            // this.$refs.tab.setCurrentRow(this.patientTableData[0])
+            // console.log(this.patientTableData[0])
+            // this.choosePatient(this.patientTableData[0])
             this.cal_one = cal_one
             this.cal_two = cal_two   
          }
@@ -169,12 +152,29 @@ export default {
 
   created() {
     this.getAllDoctorList()
-    var record_date = this.$route.query.record
+    var record_date = this.paramsObj.record
     this.record_date = record_date
     console.log("record_date",record_date)
-    this.prescription_id = this.$route.query.prescription_id
+    this.prescription_id = this.paramsObj.prescription_id
+    this.patient_id = this.paramsObj.patient_id
+    this.ids = this.paramsObj.ids
     this.getAllHisPatientList(record_date)
   },
+  watch:{
+    paramsObj:{//深度监听，可监听到对象、数组的变化
+      handler(val, oldVal){
+        this.paramsObj = val
+        this.patient_id = this.paramsObj.patient_id
+        var record_date = this.paramsObj.record
+        this.record_date = record_date
+        var prescription_id = this.paramsObj.prescription_id
+        this.prescription_id = prescription_id
+        this.ids = this.paramsObj.ids
+        
+      },
+      deep:true
+    }
+  }
 
 };
 </script>

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -102,7 +102,7 @@
      </div>
 
 
-    <div id='prescriptionPrint'>
+    <!-- <div id='prescriptionPrint'>
 
         <div v-for="(item,index) in advicePrint" :key="index">
             <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
@@ -204,7 +204,7 @@
 
         </div>
 
-    </div>
+    </div> -->
   </div>
 </template>
 <script>
@@ -214,7 +214,8 @@ export default {
     props:{
       patient_id:Number,
       record_date:String,
-      prescription_id:Number
+      prescription_id:Number,
+      ids:String
     },
     data(){
       return {
@@ -271,10 +272,10 @@ export default {
         //   patient_id:this.patient_id,
         //   record_date:this.record_date,
         //   prescription_id:this.prescription_id,
-          patient_id:this.$route.query.patient_id,
-          record_date:this.$route.query.record,
-          prescription_id:this.$route.query.prescription_id,
-          ids:this.$route.query.ids,
+          patient_id:this.patient_id,
+          record_date:this.record_date,
+          prescription_id:this.prescription_id,
+          ids:this.ids,
         }
         console.log("999999",params)
        getPrescriptionPrint(params).then(response=>{
@@ -340,6 +341,11 @@ export default {
      patient_id:function(val){
        console.log("101000010101010",this.patient_id,this.record_date,this.prescription_id)
     //    this.getPrescriptionPrint()
+     },
+     ids:function(val){
+         this.ids = val
+         console.log('this.idsids',this.ids)
+         this.getPrescriptionPrint()
      }
    }
 }
@@ -347,6 +353,13 @@ export default {
 
 
 <style lang="scss" scoped>
+.prescription-print{
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    margin-bottom: 20px;
+    padding:20px 10px;
+}
 .prescription-print{
     font-size: 14px;
 }