Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/api/project/project.js

@@ -452,4 +452,13 @@ export function changePatient(id,params){
       method:"Get",
       params:params
     })
-  } 
+  } 
+
+  export function getPrescriptionList(id,params){
+     
+    return request({
+      url:"/api/hispatient/getprescription?patient_id="+id,
+      method:"Get",
+      params:params
+    })
+  }

src/router/modules/outpatientDoctorStation.js

@@ -61,6 +61,15 @@ export default {
       is_menu: false,
       name: 'outpatientDoctorStationTreatPrint',
       meta: { title: 'outpatientDoctorStationTreatPrint', noCache: true }
-  },
+   },
+
+   {
+    path: '/outpatientDoctorStation/printone',
+    component: () => import('@/xt_pages/outpatientDoctorStation/template/printOne'),
+    hidden: true,
+    is_menu: false,
+    name: 'outpatientDoctorStationPrint',
+    meta: { title: 'outpatientDoctorStationPrint', noCache: true }
+   },
   ]
 }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -78,6 +78,46 @@
       </div>
 
     </div>
+
+     <el-dialog
+      title="处方打印"
+      :visible.sync="centerDialogVisible"
+      width="600px"
+      center>
+     <el-table
+      ref="multipleTable"
+      :data="tableData"
+      tooltip-effect="dark"
+      style="width: 600px"
+
+      @selection-change="handleSelectionChange">
+      <el-table-column
+        type="selection"
+        width="50">
+      </el-table-column>
+      <el-table-column
+        label="处方编号"
+        width="120">
+        <template  slot-scope="scope">
+          <span>处方编号</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="处方号"
+        width="200">
+        <template slot-scope="scope">
+          <span>
+           <el-input v-model="scope.row.id"></el-input>
+          </span>
+        </template>
+      </el-table-column>
+    </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="centerDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="savePrint">确 定</el-button>
+      </span>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -90,6 +130,7 @@
   import medicalRecord from './components/medicalRecord'
   import saveRecordTemplate from './components/saveRecordTemplate'
   import { uParseTime } from '@/utils/tools'
+  import { getPrescriptionList } from "@/api/project/project"
   export default {
     components: {
       BreadCrumb,
@@ -133,6 +174,12 @@
         prescription_id:0,
         addtions_charge:[],
 
+        patientid:0,
+        prescriptionList:[],
+        centerDialogVisible:false,
+        tableData:[],
+        selecting_schs: [],
+        index:0
       }
     },
     methods: {
@@ -187,10 +234,14 @@
               this.choosePatient(this.patientTableData[0])
             }
 
+            this.prescriptionList = response.data.data.list.prescription
+            this.patientid = this.patientTableData[0].patient_id
+
           }
         })
       },
       choosePatient(val) {
+        this.patientid = val.patients.id
         let params = {
           'record_date': this.record_date,
           'patient_id': val.patients.id
@@ -244,6 +295,7 @@
             } else {
               this.case_history.is_infect = false
             }
+            this.prescriptionList =response.data.data.prescription
             if (response.data.data.prescription.length > 0) {
               for (let i = 0; i < response.data.data.prescription.length; i++) {
                 var prescription = response.data.data.prescription[i]
@@ -319,17 +371,26 @@
         })
       },
       open(index) {
-        console.log("index",index)
+        if(this.prescriptionList.length == 0){
+           this.$message.error("请先开处方")
+           return
+        }
+        this.index = index
         if (index == 1) {
           this.$refs.prescriptions.open(1)
         } else if (index == 2) {
-          this.$router.push("/outpatientDoctorStation/print?record="+this.record_date+"&prescription_id="+this.prescription_id)
+
+          this.getPrescriptionList(this.patientid)
+          // this.$router.push("/outpatientDoctorStation/print?record="+this.record_date+"&prescription_id="+this.prescription_id)
         } else if (index == 3) {
           this.$refs.prescriptions.open(3)
         } else if (index == 4) {
           this.$refs.prescriptions.open(4)
         }else if(index == 6){
-          this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id)
+          // this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id)
+
+          this.getPrescriptionList(this.patientid)
+          // this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id)
 
         }
 
@@ -359,13 +420,13 @@
       // }
 
       getMsgFormSon(id){
-        console.log("id----------",id)
+
         this.detalid = id
       },
       changetwo(data){
         console.log("data000000",data)
         this.prescription_id = data
-      }
+      },
       //  getTemplateDetail(id){
       //     getTemplateDetail(id).then(response=>{
       //         if(response.data.state == 1){
@@ -377,6 +438,38 @@
       //         }
       //     })
       //   },
+      getPrescriptionList(id){
+        getPrescriptionList(id).then(response=>{
+           if(response.data.state == 1){
+             this.centerDialogVisible = true
+             var list = response.data.data.list
+             console.log("list9999999",list)
+             this.tableData = list
+           }
+        })
+      },
+      handleSelectionChange(val){
+       this.selecting_schs = val
+       console.log("99999",this.selecting_schs)
+      },
+      handleClick(){
+
+      },
+      savePrint(){
+        var arr = []
+        for(let i=0;i<this.selecting_schs.length;i++){
+             arr.push(this.selecting_schs[i].id)
+          }
+          console.log("arr",arr)
+         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)
+         }
+         if(this.index == 6){
+            this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id+"&ids="+ids+"&patient_id="+this.patientid)
+         }
+      }
     },
     created() {
       var nowDate = new Date()
@@ -399,6 +492,7 @@
       this.tableHeight = tableHeight
 
     },
+
     mounted(){
       const that = this
       window.onresize = () => {

src/xt_pages/outpatientDoctorStation/print.vue

@@ -15,7 +15,7 @@
     </div>
     <div class="app-container" style="min-height:0;">
         <el-container class="newContainer">
-            <div style="width:270px;margin-right:20px;">
+            <!-- <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>
@@ -29,9 +29,9 @@
                         <template slot-scope="scope">{{ scope.row.his_patient ?scope.row.his_patient.number:''}}</template>
                     </el-table-column>
                 </el-table>
-            </div>
+            </div> -->
             
-            <div class='dialysisPage' style="flex: 1;height: calc(100vh - 178px);overflow-x:auto;::-webkit-scrollbar:height:15px">
+            <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>

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -2,12 +2,12 @@
     <div id='prescription-print' class="prescription-print">
         <div class="printTitle">血液透析中心处方笺</div>
         <div class="infoTitle">
-            <p>姓名：{{patient.name}}</p>
+            <p>姓名：{{patient.name?patient.name:""}}</p>
             <p>性别：
                <span v-if="patient.gender == 1">男</span>
                <span v-if="patient.gender == 2">女</span>
             </p>
-            <p>年龄：{{patient.age}}岁</p>
+            <p>年龄：{{patient.age?patient.age:""}}岁</p>
         </div>
         <div class="infoMain">
             <div style="margin-bottom: 10px;">门诊号：{{this.hisPatient.number?this.hisPatient.number:""}}</div>
@@ -87,9 +87,12 @@ export default {
      },
        getPrescriptionPrint(){
          var params = {
-          patient_id:this.patient_id,
-          record_date:this.record_date,
-          prescription_id:this.prescription_id,
+          // 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 
         }
         console.log("params---",params)
        getPrescriptionPrint(params).then(response=>{
@@ -148,14 +151,16 @@ export default {
    created(){
       this.getAllDoctorList()
       this.getInitData()
+      this.getPrescriptionPrint()
+      this.getHisPatientDetail()
    },
-   watch:{
-     patient_id:function(val){
-       console.log("101000010101010",this.patient_id,this.record_date,this.prescription_id)
-       this.getPrescriptionPrint()
-       this.getHisPatientDetail()
-     }
-   }
+  //  watch:{
+  //    patient_id:function(val){
+  //      console.log("101000010101010",this.patient_id,this.record_date,this.prescription_id)
+  //      this.getPrescriptionPrint()
+  //      this.getHisPatientDetail()
+  //    }
+  //  }
 }
 </script>
 

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -15,7 +15,7 @@
     </div>
     <div class="app-container" style="min-height:0;">
         <el-container class="newContainer">
-            <div style="width:270px;margin-right:20px;">
+            <!-- <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>
@@ -29,9 +29,9 @@
                         <template slot-scope="scope">{{ scope.row.his_patient ?scope.row.his_patient.number:''}}</template>
                     </el-table-column>
                 </el-table>
-            </div>
+            </div> -->
             
-            <div class='dialysisPage' style="flex: 1;height: calc(100vh - 178px);overflow-x:auto;::-webkit-scrollbar:height:15px">
+            <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>

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -150,11 +150,14 @@ export default {
      },
      getPrescriptionPrint(){
          var params = {
-          patient_id:this.patient_id,
-          record_date:this.record_date,
-          prescription_id:this.prescription_id,
+        //   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 
         }
-        console.log("params---",params)
+        console.log("999999",params)
        getPrescriptionPrint(params).then(response=>{
          if(response.data.state == 1){
             var advicePrint =  response.data.data.advicePrint
@@ -163,29 +166,31 @@ export default {
             var patient =  response.data.data.patient
             console.log("patient",patient)
             this.patient = patient
+            this.tableData = arr
+            console.log("3333",this.tableData)
+            var prescriptioninfo = response.data.data.prescriptionInfo
+            console.log("prescriptioninfo",prescriptioninfo)
+            this.prescriptionInfo = prescriptioninfo
+
             var doctorPorject = response.data.data.doctorPorject
           
             var arr = doctorPorject.project
-              console.log("我的中谷歌",arr)
+              console.log("治疗单",arr)
             for(let i=0;i<arr.length;i++){
               console.log("arr",arr[i].project_name)
             }
-            this.tableData = arr
-            console.log("3333",this.tableData)
-            var prescriptioninfo = response.data.data.prescriptionInfo
-            console.log("prescriptioninfo",prescriptioninfo)
-            this.prescriptionInfo = prescriptioninfo
           }
        })
      }
    },
    created(){
       this.getAllDoctorList()
+      this.getPrescriptionPrint()
    },
    watch:{
      patient_id:function(val){
        console.log("101000010101010",this.patient_id,this.record_date,this.prescription_id)
-       this.getPrescriptionPrint()
+    //    this.getPrescriptionPrint()
      }
    }
 }