Merge branch '20230223_pad_vue_new_branch' of http://git.shengws.com/csx/Pad_New into 20230223_pad_vue_new_branch

src/pages/main/PrintIndex.vue

@@ -423,9 +423,14 @@
         ref="childOne"
         style="margin-top: 60px"
         v-bind:childResponse="childResponse"
-        v-if="org_template_info.template_id == 80 && (org_id == 10206 || org_id ==0)">
-
+        v-if="org_template_info.template_id == 80">
       </DialysisPrintOrdereighty>
+
+      <DialysisPrintOrdereightyone ref="childOne"
+        style="margin-top: 60px"
+        v-bind:childResponse="childResponse"
+        v-if="org_template_info.template_id == 81">
+      </DialysisPrintOrdereightyone>
     </div>
     
     <!--<side-bar :active_index="0" v-if="isShow == true"></side-bar>-->
@@ -498,6 +503,7 @@ import DialysisPrintOrderSeventysix from './template/DialysisPrintOrderSeventysi
 import DialysisPrintOrderSeventyeight from './template/DialysisPrintOrderSeventyeight'
 import DialysisPrintOrderServentynine from './template/DialysisPrintOrderServentynine'
 import DialysisPrintOrdereighty from './template/DialysisPrintOrdereighty'
+import DialysisPrintOrdereightyone from './template/DialysisPrintOrdereightyone'
 export default {
   name: "PrintIndex",
   components: {
@@ -561,7 +567,8 @@ export default {
     DialysisPrintOrderSeventysix,
     DialysisPrintOrderSeventyeight,
     DialysisPrintOrderServentynine,
-    DialysisPrintOrdereighty
+    DialysisPrintOrdereighty,
+    DialysisPrintOrdereightyone
   },
   data() {
     return {
@@ -720,7 +727,7 @@ export default {
         if (response.data.state == 1) {
             this.childResponse = response;
             
-          if(this.org_id != 10206 && response.data.data.template_id != 80){
+          if(this.org_id != 10206){
             this.org_template_info = response.data.data.org_template_info;
           }else{
             this.org_template_info.template_id = 80

src/pages/main/template/DialysisPrintOrderSeventythree.vue

@@ -65,15 +65,15 @@
         </div>
       </div>
 
-      <div class="row" :style=" this.totollength > 13?'margin-bottom:400px;':''">
+      <div class="row">
         <table class="proj_table" >
           <tbody>
             <tr>
-              <td 
+              <td
                 style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;
                 padding: 6px 8px;line-height: 30px;width: 50%;">透析前评估
               </td>
-              <td 
+              <td
                 style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;
                 padding: 6px 8px;line-height: 30px;width: 50%;">透析后评估
               </td>
@@ -241,7 +241,7 @@
                     <div
                       style="width: 50%; text-align: left;display: inline-block;border-bottom: 1px solid #999;"
                     >
-                      {{ predialysis.weight_before ? 
+                      {{ predialysis.weight_before ?
                         parseFloat( predialysis.weight_before - predialysis.additional_weight ).toFixed(1) : "/"
                       }}
                     </div>kg
@@ -254,8 +254,8 @@
                       class="under_line"
                       style=" width: 50%; text-align: center; white-space: normal;"
                     >
-                    {{ predialysis.weight_before > 0 && predialysis.additional_weight > 0 && predialysis.dry_weight > 0 ? 
-                        parseFloat(predialysis.weight_before - predialysis.additional_weight - predialysis.dry_weight ).toFixed(2): "/" 
+                    {{ predialysis.weight_before > 0 && predialysis.additional_weight > 0 && predialysis.dry_weight > 0 ?
+                        parseFloat(predialysis.weight_before - predialysis.additional_weight - predialysis.dry_weight ).toFixed(2): "/"
                       }}
                     </div>kg
                   </div>
@@ -346,7 +346,7 @@
                       {{ afterdialysis.symptom_after_dialysis ? afterdialysis.symptom_after_dialysis : "/" }}
                     </div>
                   </div>
-                  
+
                 </div>
                 <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                   <div class="inline_block" style="flex: 1">
@@ -467,9 +467,9 @@
                     处方脱水量：
                     <div class="under_line" style="width: 50px; text-align: center">
                       {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "/" }}
-                    </div>L
+                    </div>ml
                   </div>
-                    <div class="inline_block" style="flex: 1">
+                  <div class="inline_block" style="flex: 1">
                     超滤总量：
                     <div class="under_line" style="width: 50px; text-align: center">
                       {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "/" }}
@@ -481,6 +481,7 @@
                       {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "/" }}h
                       <span v-if="prescription.dialysis_duration_minute>0">{{prescription.dialysis_duration_minute}}min</span>
                     </div>
+
                   </div>
                   <div class="inline_block" style="flex: 1">
                     <span >透析方式：</span>
@@ -552,33 +553,34 @@
                       {{ prescription.blood_flow_volume ? prescription.blood_flow_volume : "/" }}
                     </div>ml/min
                   </div>
-                  
+
                 </div>
 
                 <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                   <div class="inline_block" style="flex: 2">
                     人工肾装置：
                     <div class="under_line" style="width: 50%; text-align: center">
-                        {{  prescription.dialysis_irrigation ? prescription.dialysis_irrigation : "" }} &nbsp;
-                        {{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : ""}}        
+                        <!-- {{  prescription.dialysis_irrigation ? prescription.dialysis_irrigation : "" }} &nbsp;
+                        {{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : ""}} -->
+                        {{prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus :''}}
                     </div>
                   </div>
                     <div class="inline_block" style="flex: 1">
                     膜面积：
                     <div class="under_line" style="width: 50px; text-align: center">
-                    
+                    /
                     </div>㎡
                   </div>
                   <div class="inline_block" style="flex: 1">
                     膜材质：
                     <div class="under_line" style="width: 80px; text-align: center">
-                      
+                      /
                     </div>
                   </div>
                   <div class="inline_block" style="flex: 1">
                     透析机型：
                     <div class="under_line" style="width: 80px; text-align: center">
-                      {{ predialysis.machine_type ? predialysis.machine_type : '' }}
+                      {{ predialysis.machine_type ? predialysis.machine_type : '/' }}
                     </div>
                   </div>
                   <div class="inline_block" style="flex: 1">
@@ -587,7 +589,7 @@
                       {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0
                       ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}
                     </div>
-                    
+
                   </div>
                 </div>
 
@@ -727,7 +729,7 @@
                         <span v-if="prescription.anticoagulant == 4">mg/h</span>
                         <span v-if="prescription.anticoagulant == 3">iu/h</span>
                         <span v-if="prescription.anticoagulant == 2">iu/h</span>
-                        <span v-if="prescription.anticoagulant == 1">mg/h</span>                   
+                        <span v-if="prescription.anticoagulant == 1">mg/h</span>
                         <span v-if="prescription.anticoagulant == 6">iu/h</span>
                         <span v-if="prescription.anticoagulant == 7">iu/h</span>
                         <span v-if="prescription.anticoagulant == 8">iu/h</span>
@@ -790,11 +792,11 @@
                           : "/"
                       }}
                     </div>
-                    
+
                     <span v-if="prescription.anticoagulant == 4">mg</span>
                     <span v-if="prescription.anticoagulant == 3">iu</span>
                     <span v-if="prescription.anticoagulant == 2">iu</span>
-                    <span v-if="prescription.anticoagulant == 1">mg</span> 
+                    <span v-if="prescription.anticoagulant == 1">mg</span>
                       <span v-if="prescription.anticoagulant == 5">ml</span>
                       <span v-if="prescription.anticoagulant == 6">iu</span>
                       <span v-if="prescription.anticoagulant == 7">iu</span>
@@ -803,9 +805,9 @@
                       <span v-if="prescription.anticoagulant == 10">iu</span>
                     <span v-if="prescription.anticoagulant == 11">iu</span>
                     <span v-if="prescription.anticoagulant == 13">iu</span>
-                 
+
                   </div>
-                  
+
                 </div>
               </td>
             </tr>
@@ -814,7 +816,7 @@
                 <table class="inside_table">
                   <tbody>
                     <tr style="line-height:35px;padding:8px 5px;">
-                      <td colspan="7" 
+                      <td colspan="7"
                         style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;
                         padding: 6px 8px;line-height: 30px;"
                       >
@@ -867,7 +869,7 @@
                 <table class="inside_table">
                   <tbody>
                     <tr>
-                      <td colspan=" 14" 
+                      <td colspan=" 14"
                         style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;"
                       >
                         监测 记录
@@ -914,16 +916,16 @@
                         </td>
                         <td>
                           {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : '0'  }} /
-                          {{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '0' }}  
+                          {{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '0' }}
                         </td>
                         <td>
-                          {{ monitor.replacement_rate ? monitor.replacement_rate : '0' }} / 
+                          {{ monitor.replacement_rate ? monitor.replacement_rate : '0' }} /
                           {{ monitor.displacement_quantity ? monitor.displacement_quantity : '0'  }}
                         </td>
                         <!-- 钠浓度(mmol/L)/温度°C -->
                         <td>
-                          {{ monitor.sodium_concentration ? monitor.sodium_concentration : "0" }} / 
-                          {{  monitor.temperature ? monitor.temperature : '0' }}
+                          {{ monitor.sodium_concentration ? monitor.sodium_concentration : "0" }} /
+                          {{  monitor.dialysate_temperature ? monitor.dialysate_temperature : '0' }}
                         </td>
                         <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: "/"}}</td>
                         <td >{{monitor.breathing_rate ? monitor.breathing_rate : "/"}}</td>
@@ -1000,7 +1002,7 @@
         </table>
       </div>
 
-      <template v-if="this.totollength > 13">
+      <!-- <template v-if="this.totollength > 13">
         <div style="display:inline-block;width:100%;text-align:center;">
           <div class="order-yy-name" style="letter-spacing: 0;font-weight:600;font-size:22px;display:inline-block;">{{orgname}}</div>
           <div class="order-title" style="letter-spacing: 0;font-weight:600;font-size:22px;display:inline-block;" >
@@ -1062,10 +1064,10 @@
             诊断：
             <div class="under_line" style="width: 500px;text-align: left">{{patientInfo.diagnose}}</div>
           </div>
-          
-          
+
+
         </div>
-      </template>
+      </template> -->
       <div class="row" style="margin-top:-11px;position: relative;" >
         <table class="proj_table">
           <tbody>
@@ -1169,7 +1171,16 @@
           </tr>
           </tbody>
         </table>
-        <!-- <div  class="print-yema">1</div> -->
+        <div style="width:100%;text-align: right;margin-top: 10px;">
+          患者签名：
+          <div class="under_line" style="width: 120px;">
+            <img v-if="dialysisOrder.url!=''&&dialysisOrder !=null"
+              style="height: 30px"
+              :src="dialysisOrder == null? 0: dialysisOrder.url"
+              alt="" srcset=""
+            />
+          </div>
+        </div>
       </div>
     </div>
 
@@ -2049,13 +2060,13 @@ export default {
   width: 50%;
 }
 
-.under_line::before {
+/* .under_line::before {
   content: "\00A0";
 }
 
 .under_line::after {
   content: "\00A0";
-}
+} */
 
 .flex {
   display: -webkit-box;

src/pages/new_Patientscheduling/new_content.vue

@@ -55,9 +55,8 @@
         ></el-table-column>
         <el-table-column prop="Mon_M" label="上午" min-width="60" align="center">
           <template slot-scope="scope">
-            <div >
-              <el-popover ref="popover"
-                placement="top"
+            <div>
+              <el-popover ref="popover" placement="top"
                 title=""
                 width=""
                 trigger="click"
@@ -70,9 +69,10 @@
                 <div style="text-align: center;" v-if="scope.row.Mon_M.patient_id == 0" >
                   <el-button @click='newappend(scope.row.Mon_M)'>新增</el-button>
                 </div>
-                <schedule-item slot="reference" :schedule-detail="scope.row.Mon_M"></schedule-item>
+                <!-- <schedule-item slot="reference" :schedule-detail="scope.row.Mon_M"></schedule-item> -->
               </el-popover>
-              <!-- v-popover:popover -->
+              <schedule-item v-popover:popover :schedule-detail="scope.row.Mon_M"></schedule-item>
+              <!-- v-popover:popover slot="reference" -->
             </div>
           </template>
         </el-table-column>
@@ -344,8 +344,8 @@
 
           <div style="flex: 1;">
             日期：
-            <el-date-picker 
-              class="datepicker2"
+            <el-date-picker
+              class="datepicker"
               v-model="currentData.schedule_date"
               type="date"
               placeholder="选择日期"
@@ -654,7 +654,7 @@ export default{
               fenqu_arr.push(fenquobj)
               console.log('444444',params.device.sort());
               if(params.device.length>0){
-                  
+
                 params.device.forEach(function(device) {
                   console.log('5555',device.sort)
                   console.log();
@@ -791,11 +791,11 @@ export default{
             })
 
             arr.sort(this.compare('sort'))
-              
+
               this.fenqu_arr=fenqu_arr
               this.jihao_arr = jihao
               this.jihao_arr2 = jihao
-              // console.log("3445555557777777",this.jihao_arr);
+              console.log("3445555557777777",this.jihao_arr);
             // console.log("34455555566666",this.schedulingVal);
             if(this.area_type=='全部病区'){
               scheduleZone =arr
@@ -1410,7 +1410,7 @@ export default{
         // })
       }
 
-      
+
     },
     // 删除排班接口
     getDeleteSchedule(id){
@@ -1608,13 +1608,13 @@ export default{
   .toastIndex{
     z-index: 10000 !important;
   }
-  // .datepicker{
-  //   font-size: 14px;
-  //   .el-input__inner{
-  //     font-size: 14px;
-  //   }
-  //   .el-input__prefix{
-  //     font-size: 14px;
-  //   }
-  // }
+  .datepicker{
+    font-size: 14px;
+    .el-input__inner{
+      font-size: 14px;
+    }
+    .el-input__prefix{
+      font-size: 14px;
+    }
+  }
 </style>