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_treatTemplate/index.vue

@@ -13,7 +13,7 @@
       </template> -->
 
       <div class='dialysisPage' style="padding-top:40px;">
-        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id == 0" :printData="printData" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id != 0" :printData="printData" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
         <printTwo v-else :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo>
       </div>
   </div>
@@ -137,10 +137,10 @@ export default {
     },
 
     changePatient(row){
-      console.log("row",row)
-      this.patient_id = row.patient_id
-      this.record_date = this.record_date
-      this.prescription_id = this.prescription_id
+      // 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,
@@ -169,26 +169,26 @@ export default {
   },
 
   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)
+    // this.org_id = this.$store.getters.xt_user.org_id
+    // this.getAllDoctorList()
+    // var record_date = this.paramsObj.record_date
+    // 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
+        // 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