1

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -3,6 +3,7 @@
     <el-table v-if="prescription.type == 1" :data="prescription.advices" border style="width: 99%;"
               :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
       <el-table-column align="center" prop="name" label="名称">
         <template slot-scope="scope"><span :title='scope.row.drug_name'>{{ scope.row.drug_name }}</span></template>
       </el-table-column>
@@ -55,7 +56,7 @@
     <el-table v-if="prescription.type == 2" :data="prescription.project" border style="width: 99%;"
               :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
       <el-table-column align="center" prop="project_name" label="名称">
         <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
@@ -189,7 +190,7 @@
           white-space: nowrap;
           overflow: hidden;
           text-overflow: ellipsis;
-          width:60px;
+          width:80px;
           display: inline-block;
           font-size: 14px;
         }

src/xt_pages/outpatientDoctorStation/components/additionalCharges.vue

@@ -1,16 +1,16 @@
 <template>
   <el-dialog
     title="附加收费"
-    width="300px"
+    width="600px"
     :visible.sync="visible"
     :before-close="_close"
   >
-    <el-table :data="chargeTable" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }"
+    <el-table :data="chargeTable" border style="width: 100%;" height="350" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row
               @select-all="handleSelectionChange"
               @select='selectDrugs'>
-      <el-table-column align="center" type="selection" width="40"></el-table-column>
-      <el-table-column align="center" prop="name" label="名称" width="100">
+      <el-table-column align="center" type="selection" width="60"></el-table-column>
+      <el-table-column align="center" prop="name" label="名称" width="160">
         <template slot-scope="scope">{{ scope.row.item_name }}</template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="金额(元)">

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -129,7 +129,7 @@
 
     <div class="additionalBox">
       <div class="additionalOne" v-for="(item,index) in prescription.addition" :key="index">
-        <span>{{item.item_name}}</span>
+        <span :title="item.item_name">{{item.item_name}}</span>
         <el-input v-model="item.price" placeholder="" style="width:50px;"></el-input>
         共
         <el-input v-model="item.count" placeholder="" style="width:50px;"></el-input>
@@ -371,7 +371,7 @@
           white-space: nowrap;
           overflow: hidden;
           text-overflow: ellipsis;
-          width:60px;
+          width:80px;
           display: inline-block;
           font-size: 14px;
         }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -92,19 +92,19 @@
 
       @selection-change="handleSelectionChange">
       <el-table-column
+        align='center'
         type="selection"
         width="50">
       </el-table-column>
       <el-table-column
+        align='center'
         label="处方编号"
         width="120">
         <template  slot-scope="scope">
           <span>处方编号</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="处方号"
-        width="200">
+      <el-table-column label="处方号">
         <template slot-scope="scope">
           <span>
            <el-input v-model="scope.row.prescription_number" :disabled="true"></el-input>
@@ -112,6 +112,15 @@
         </template>
       </el-table-column>
     </el-table>
+    <el-dialog
+      class="centerDialog"
+      width="560px"
+      title="打印"
+      :visible.sync="innerVisible"
+      append-to-body>
+      
+      <print :paramsObj='paramsObj'></print>
+    </el-dialog>
       <span slot="footer" class="dialog-footer">
         <el-button @click="centerDialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="savePrint">确 定</el-button>
@@ -131,13 +140,15 @@
   import saveRecordTemplate from './components/saveRecordTemplate'
   import { uParseTime } from '@/utils/tools'
   import { getPrescriptionList } from "@/api/project/project"
+  import print from './print'
   export default {
     components: {
       BreadCrumb,
       deskPrescription,
       deskRecord,
       medicalRecord,
-      saveRecordTemplate
+      saveRecordTemplate,
+      print
     },
     data() {
       return {
@@ -184,6 +195,8 @@
         index:0,
         admin_info:{},
         saveLoading:false,
+        innerVisible:false,
+        paramsObj:{}
 
       }
     },
@@ -688,7 +701,16 @@
          var ids = arr.join(",")
          console.log("ids",ids)
          if(this.index == 2){
-           this.$router.push("/outpatientDoctorStation/print?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/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)
@@ -978,4 +1000,9 @@
   }
 
   }
+  .centerDialog{
+    .el-dialog__body{
+      max-height: calc(100vh - 100px) !important;
+    }
+  }
 </style>

src/xt_pages/outpatientDoctorStation/print.vue

@@ -1,7 +1,5 @@
 <template>
-  <div class="main-contain">
-    <div class="position">
-      <bread-crumb :crumbs="crumbs"></bread-crumb>
+  <div>
        <template>
         <el-button
           :loading="loading"
@@ -12,29 +10,9 @@
           >打印</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" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
-            </div>
-        </el-container>
+    <div class='dialysisPage'>
+      <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>
 </template>
@@ -57,6 +35,9 @@ export default {
     BreadCrumb,
     printOne
   },
+  props:{
+    paramsObj:Object
+  },
   data() {
     return {
       crumbs: [
@@ -72,7 +53,9 @@ export default {
        search_input:"",
        loading:false,
        patient_id:"",
-       prescription_id:""
+       prescription_id:"",
+       ids:'',
+       paramsObj:{}
     };
   },
   methods:{
@@ -127,9 +110,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   
          }
@@ -171,13 +154,35 @@ 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)
-    var prescription_id = this.$route.query.prescription_id
+    var prescription_id = this.paramsObj.prescription_id
     this.prescription_id = prescription_id
+    this.patient_id = this.paramsObj.patient_id
+    this.ids = this.paramsObj.ids
+    // var record_date = this.$route.query.record
+    // this.record_date = record_date
+    // console.log("record_date",record_date)
+    // var prescription_id = this.$route.query.prescription_id
+    // this.prescription_id = prescription_id
     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
+        console.log("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/template/printOne.vue

@@ -57,7 +57,8 @@ export default {
     props:{
       patient_id:Number,
       record_date:String,
-      prescription_id:Number
+      prescription_id:Number,
+      ids:String
     }, 
     data(){
       return {
@@ -104,10 +105,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("params",params)
        getPrescriptionPrint(params).then(response=>{
@@ -194,6 +195,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 0px;
+}
 .printTitle{
     font-size: 22px;
     text-align: center;