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

src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue

@@ -1664,7 +1664,7 @@ export default {
       ) {
         const obj14 ='预透时间'
         checkDate.push(obj14)
-      } if (this.prescription.dialyzer_perfusion_apparatus == '' && 
+      } if (this.prescription.dialyzer_perfusion_apparatus == '' &&
             this.prescription.dialysis_dialyszers ==''
       ) {
         const obj15 ='透析(滤)器'
@@ -1707,17 +1707,17 @@ export default {
       ) {
         const obj27 ='首剂'
         checkDate.push(obj27)
-      } if (this.prescription.anticoagulant_zongliang == 0 && this.prescription.anticoagulant !=1 
+      } if (this.prescription.anticoagulant_zongliang == 0 && this.prescription.anticoagulant !=1
             && this.prescription.anticoagulant !='' && this.prescription.anticoagulant != 5
       ) {
         const obj28 ='总量'
         checkDate.push(obj28)
-      } if (this.dialysisOrder.DeviceNumber.number == 0 && 
+      } if (this.dialysisOrder.DeviceNumber.number == 0 &&
             this.patientInfo.DialysisSchedule.device_number.number ==''
       ) {
         const obj29 ='透析机号'
         checkDate.push(obj29)
-      } if (this.patientInfo.DialysisSchedule.bed_id == 0 && 
+      } if (this.patientInfo.DialysisSchedule.bed_id == 0 &&
             this.dialysisOrder && this.dialysisOrder.bed_id ==0
       ) {
         const obj30 ='型号'
@@ -1849,14 +1849,14 @@ export default {
           ){
             const obj58 = '监测第'+((i*1)+1)+'行置换率'
             monearr.push(obj58)
-          } 
+          }
           // if(this.monitors[i].displacement_quantity == 0 && this.prescription.mode =='HDF'&& i !=0){
           //   const obj54 = '监测第'+((i*1)+1)+'行置换量'
           //   monearr.push(obj54)
-          // }  
+          // }
           if(this.monitors[i].sodium_concentration ==0 ){
             // this.monitors[i].temperature == 0
-            const obj59 = '监测第'+((i*1)+1)+'行钠浓度/温度'
+            const obj59 = '监测第'+((i*1)+1)+'行钠浓度'
             monearr.push(obj59)
           } if(this.monitors[i].pulse_frequency ==0){
             const obj60 = '监测第'+((i*1)+1)+'行脉搏'

src/xt_pages/user/components/PatientDetail.vue

@@ -1348,7 +1348,7 @@
                     {{ patientPrint.id_card_no }}
                   </td>
                 </tr>
-                 <tr>
+                <tr>
                   <td style="padding: 5px 0px;font-size: 22px;font-weight: 500;">
                     联系人
                   </td>
@@ -1476,7 +1476,7 @@
                   </td>
                   <td colspan="9">
                     <div
-                      class="td_proj_content td_align_left"
+                      class="td_proj_content td_align_left wrapper"
                       v-html="patientPrint.diagnose"
                     ></div>
                   </td>
@@ -1820,11 +1820,10 @@ export default {
     printThisInfo() {
       var ptime = Math.round(new Date().getTime() / 1000);
       this.print_time = uParseTime(ptime, "{y}年{m}月{d}日");
-
       const style =
         "@page {margin-top:10px;}@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0; } .print_main_content .order_title { text-align: center; font-size: 23px; line-height: 50px; font-weight: 500; } .print_main_content table { width: 100%; border-collapse: collapse; padding: 2px; }  .print_main_content table tbody tr{page-break-inside:avoid;} .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px; } .td_proj_title { font-size: 18px; line-height: 25px; font-weight: 500; } .td_proj_content { font-size: 18px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 17px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj .proj_title { font-weight: 500;} }";
       const style1 =
-        "@page {margin-top:10px;}@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0; } .print_main_content table { width: 100%; padding: 2px; }  .print_main_content table tbody tr{page-break-inside:avoid;} .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px; } .td_proj_title { font-size: 22px; line-height: 25px; font-weight: 500; } .td_proj_content { font-size: 22px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 22px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj .proj_title { font-weight: 500;} }";
+        "@page {margin-top:10px;}@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0; } .print_main_content table { width: 100%; padding: 2px; }  .print_main_content table tbody tr{page-break-inside:avoid;} .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px; } .td_proj_title { font-size: 22px; line-height: 25px; font-weight: 500; } .td_proj_content { font-size: 22px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 22px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj .proj_title { font-weight: 500;} .wrapper {white-space: pre-wrap;} }";
       if(this.org_id != 10206 && this.org_id !=0){
         console.log('1111111');
 
@@ -2721,4 +2720,7 @@ export default {
 .el-select-dropdown {
   z-index: 998 !important;
 }
+.wrapper {
+  white-space: pre-wrap;
+}
 </style>