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

src/xt_pages/outpatientDoctorStation/batch_print_checkTemplate/index.vue

@@ -11,7 +11,7 @@
           >打印</el-button
         >
       </template> -->
-            
+
       <div class='dialysisPage' style="padding-top:40px;">
         <printOne :printData="printData" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
       </div>
@@ -32,7 +32,6 @@ export default {
     printOne,
   },
   props:{
-    paramsObj:Object,
     printData:Array
   },
   data() {
@@ -67,104 +66,26 @@ export default {
                 scanStyles: false
             });
         },500)
-        
+
     },
     getAllDoctorList(){
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
                var doctor =  response.data.data.doctor
-               
+
                this.doctorList = doctor
              }
-         })   
+         })
      },
-    getAllHisPatientList(){
-         const params = {
-           record_date:this.record_date
-         }
-      getAllHisPatientList(params).then(response=>{
-         if(response.data.state == 1){
-            this.patientTableData = response.data.data.list
-            this.patientTableDataTwo = response.data.data.list
-
-            console.log('222', this.patientTableData)
-            let cal_one = 0
-            let cal_two = 0
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              if (response.data.data.list[i].prescription == null || response.data.data.list[i].prescription.length == 0) {
-                cal_one = cal_one + 1
-              }
-              if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
-                cal_two = cal_two + 1
-              }
-            }
-            // 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   
-         }
-      })
-    },
-
-    changePatient(row){
-      console.log("row",row)
-      this.patient_id = row.patient_id
-      this.record_date = this.record_date
-      this.prescription_id = this.prescription_id
-      //   var params = {
-      //     patient_id:row.patient_id,
-      //     record_date:this.record_date,
-      //     prescription_id:this.prescription_id,
-      //   }
-      // getPrescriptionPrint(params).then(response=>{
-      //     if(response.data.state == 1){
-      //       var advicePrint =  response.data.data.advicePrint
-      //       console.log("adviceprint",advicePrint)
-      //       this.advicePrint = advicePrint
-      //       // var hisPatient =  response.data.data.hisPatient
-      //       // console.log("hispatient",hisPatient)
-      //       // this.hisPatient = hisPatient
-      //       var patient =  response.data.data.patient
-      //       console.log("patient",patient)
-      //       this.patient = patient
-      //       var doctorPorject = response.data.data.doctorPorject
-      //       console.log("doctorporject",doctorPorject)
-      //     }
-      // })
-    },
     searchAction(){
 
     }
-    
+
   },
 
   created() {
     this.org_id = this.$store.getters.xt_user.org_id
-    this.getAllDoctorList()
-    var record_date = this.paramsObj.record
-    this.record_date = record_date
-    console.log("record_date",record_date)
-    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>
@@ -333,7 +254,7 @@ export default {
   .dialysisPage::-webkit-scrollbar {
     height: 15px;
   }
-  
+
   .el-date-editor{
     .el-input__inner{
       padding-right:0px;