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

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -51,7 +51,7 @@
             {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}
           </div>
         </div>
-        
+
         <div class="inline_block">
           透析次数：
           <div class="under_line" style="width: 50px;text-align: left">
@@ -73,7 +73,7 @@
             {{ patientInfo.DialysisSchedule.device_zone.name ? patientInfo.DialysisSchedule.device_zone.name : '' }}
           </div>
         </div>
-        
+
       </div> -->
 
       <div class="row">
@@ -570,7 +570,7 @@
                         <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{ getAdminUser(advice.advice_doctor) }}</span>
                         <img style="height:30px" :src="setAdminUserES(advice.advice_doctor)" alt="" srcset="" v-else />
                       </td>
-                      
+
                       <td height="30px" style="padding:4px 5px;">
                         <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
                       </td>
@@ -588,7 +588,7 @@
                 </table>
               </td>
             </tr>
-            
+
             <tr>
               <td style="padding: 0; position: relative;" colspan="2">
                 <table class="inside_table">
@@ -637,7 +637,7 @@
                         <div style="min-height:20px;line-height:20px; overflow:hidden;">
                           <span v-if="getTime(monitor.operate_time, '{h}:{i}')" style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
                             <template v-if="(dialysisOrder && monitor.operate_time == dialysisOrder.start_time)">【开始透析】引血100ml/min</template>
-                            <span v-if="dialysisOrder && monitor.operate_time == dialysisOrder.end_time">{{ monitor.end }}</span> 
+                            <span v-if="dialysisOrder && monitor.operate_time == dialysisOrder.end_time">{{ monitor.end }}</span>
                             {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
                           </span>
                         </div>
@@ -1059,7 +1059,7 @@ export default {
         this.check = response.data.data.check
         this.xtdate = response.data.data.xtdate
         this.predialysis = response.data.data.PredialysisEvaluation
-        console.log("透前评估",this.predialysis)
+        // console.log("透前评估",this.predialysis)
         this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(
           this.predialysis.blood_access_part_opera_id
         )

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -127,7 +127,6 @@
                 <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"
                              :hisPatientInfo="hisPatientInfo" v-if="titleType == '电子病历'" :detalid="detalid"
                              ref="child"></desk-record>
-                c
                 <medicalRecord ref='medicalRecord' @func="getMsgFormSon"></medicalRecord>
                 <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
                 <!--<dialysis-index v-if="titleType == '透析记录'" :record_date="record_date" :patientid='patientid'></dialysis-index>-->
@@ -4179,7 +4178,7 @@
 
       // this.diagnoses = this.getDictionaryDataConfig('system', 'diagnose')
       // this.other_sick = this.getDictionaryDataConfig('system', 'other_sick_history')
-      let tableHeight = document.body.clientHeight - 263
+      let tableHeight = document.body.clientHeight - 323
       this.tableHeight = tableHeight
 
     },
@@ -4197,7 +4196,7 @@
       fullHeight(val) {
         if (!this.timer) {
           this.fullHeight = val
-          let tableHeight = val - 263
+          let tableHeight = val - 323
           this.tableHeight = tableHeight
           this.timer = true
           let that = this