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

src/xt_pages/hospitalStation/components/dialysisIndex.vue

@@ -145,7 +145,7 @@
           title="治疗小结"
         ></treatment-of>
       </div>
-      
+
     </div>
     <div style="padding-top: 56px;width:100%;text-align:center;font-size:22px;color:red;" v-else>该患者未排班，请先去排班</div>
   </div>
@@ -319,8 +319,8 @@ export default {
     var date = this.record_date
     this.patient_id = patient_id
     this.date = date
-    var ymd = parseTime(new Date(), '{y}-{m}-{d}')
-    getDialysisSchedules(ymd).then(rs => {
+    // var ymd = parseTime(this.record_date, '{y}-{m}-{d}')
+    getDialysisSchedules(this.record_date).then(rs => {
       var resp = rs.data
       if (resp.state == 1) {
         var schedules = resp.data.schedules
@@ -343,22 +343,22 @@ export default {
       }
     })
 
-    
+
 
   },
   mounted() {
     if(this.dialysisShow == true){
-      
+
       this.getScheduleDetail()
       this.getLongAdvice()
     }
-    
+
   },
   watch:{
         patientid:{
             handler(newVal){
-              var ymd = parseTime(new Date(), '{y}-{m}-{d}')
-              getDialysisSchedules(ymd).then(rs => {
+              // var ymd = parseTime(new Date(), '{y}-{m}-{d}')
+              getDialysisSchedules(this.record_date).then(rs => {
                 var resp = rs.data
                 if (resp.state == 1) {
                   var schedules = resp.data.schedules
@@ -582,7 +582,7 @@ export default {
         if (resp.state == 1) {
           var patient = resp.data.patient // 患者信息
           var schedual = resp.data.schedual // 患者排班信息
-         
+
           var prescription = resp.data.prescription // 透析处方
           console.log("投产出大发大发233232323232233232",prescription)
           if (prescription != null) {
@@ -592,7 +592,7 @@ export default {
           }
 
           var solution = resp.data.solution // 透析方案
-         
+
           var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
 
           var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估

src/xt_pages/hospitalStation/listPrint.vue

@@ -3,7 +3,6 @@
     <template>
       <el-button
         style="position:fixed;right:25px;z-index:999"
-        :loading="loading"
         size="small"
         icon="el-icon-printer"
         @click="printThisPage"
@@ -59,7 +58,6 @@
           } else {
             this.order = response.data.data.order
             this.patient = response.data.data.patient
-            console.log(this.patient)
             this.admin = response.data.data.admin_info
 
 
@@ -70,15 +68,14 @@
                 price: infos.pric,
                 count: infos.cnt
               }
-              console.log(infos)
+              console.log("-----1-------")
+
               if (infos.advice && infos.advice.id == 0 && infos.project && infos.project.id > 0) {
                 obj['p_time'] = this.getTimes(infos.project.prescription.ctime)
                 if(infos.project.type == 2){
                   obj['name'] = infos.project.project.project_name
 
-
                 }else if (infos.project.type == 3){
-
                   obj['name'] = infos.project.good_info.good_name
 
                 }
@@ -86,6 +83,7 @@
                 obj['unit'] = infos.project.unit
 
               }
+              console.log("-----2-------")
 
               if (infos.advice && infos.advice.id > 0 && infos.project && infos.project.id == 0) {
                 obj['p_time'] = this.getTimes(infos.advice.prescription.ctime)
@@ -94,10 +92,13 @@
                 obj['unit'] = infos.advice.drug.max_unit
 
               }
+              console.log("～～～3～～～～～～")
+
               this.list.push(obj)
               this.list.sort(function(a, b) {
                 return b.p_time < a.p_time ? 1 : -1
               })
+              console.log(this.list)
 
             }
           }

src/xt_pages/outpatientCharges/listPrint.vue

@@ -14,9 +14,8 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne v-if="org_id != 10106 && this.paramsObj.balance_accounts_type != 2" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+      <printOne v-if="org_id != 10106" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
-      <!--<printThree v-if="org_id == 0 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printThree>-->
       <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
     </div>
   </div>