Просмотр исходного кода

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

28169 7 месяцев назад
Родитель
Сommit
ff344149f1

+ 7 - 7
src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue Просмотреть файл

1664
       ) {
1664
       ) {
1665
         const obj14 ='预透时间'
1665
         const obj14 ='预透时间'
1666
         checkDate.push(obj14)
1666
         checkDate.push(obj14)
1667
-      } if (this.prescription.dialyzer_perfusion_apparatus == '' && 
1667
+      } if (this.prescription.dialyzer_perfusion_apparatus == '' &&
1668
             this.prescription.dialysis_dialyszers ==''
1668
             this.prescription.dialysis_dialyszers ==''
1669
       ) {
1669
       ) {
1670
         const obj15 ='透析(滤)器'
1670
         const obj15 ='透析(滤)器'
1707
       ) {
1707
       ) {
1708
         const obj27 ='首剂'
1708
         const obj27 ='首剂'
1709
         checkDate.push(obj27)
1709
         checkDate.push(obj27)
1710
-      } if (this.prescription.anticoagulant_zongliang == 0 && this.prescription.anticoagulant !=1 
1710
+      } if (this.prescription.anticoagulant_zongliang == 0 && this.prescription.anticoagulant !=1
1711
             && this.prescription.anticoagulant !='' && this.prescription.anticoagulant != 5
1711
             && this.prescription.anticoagulant !='' && this.prescription.anticoagulant != 5
1712
       ) {
1712
       ) {
1713
         const obj28 ='总量'
1713
         const obj28 ='总量'
1714
         checkDate.push(obj28)
1714
         checkDate.push(obj28)
1715
-      } if (this.dialysisOrder.DeviceNumber.number == 0 && 
1715
+      } if (this.dialysisOrder.DeviceNumber.number == 0 &&
1716
             this.patientInfo.DialysisSchedule.device_number.number ==''
1716
             this.patientInfo.DialysisSchedule.device_number.number ==''
1717
       ) {
1717
       ) {
1718
         const obj29 ='透析机号'
1718
         const obj29 ='透析机号'
1719
         checkDate.push(obj29)
1719
         checkDate.push(obj29)
1720
-      } if (this.patientInfo.DialysisSchedule.bed_id == 0 && 
1720
+      } if (this.patientInfo.DialysisSchedule.bed_id == 0 &&
1721
             this.dialysisOrder && this.dialysisOrder.bed_id ==0
1721
             this.dialysisOrder && this.dialysisOrder.bed_id ==0
1722
       ) {
1722
       ) {
1723
         const obj30 ='型号'
1723
         const obj30 ='型号'
1849
           ){
1849
           ){
1850
             const obj58 = '监测第'+((i*1)+1)+'行置换率'
1850
             const obj58 = '监测第'+((i*1)+1)+'行置换率'
1851
             monearr.push(obj58)
1851
             monearr.push(obj58)
1852
-          } 
1852
+          }
1853
           // if(this.monitors[i].displacement_quantity == 0 && this.prescription.mode =='HDF'&& i !=0){
1853
           // if(this.monitors[i].displacement_quantity == 0 && this.prescription.mode =='HDF'&& i !=0){
1854
           //   const obj54 = '监测第'+((i*1)+1)+'行置换量'
1854
           //   const obj54 = '监测第'+((i*1)+1)+'行置换量'
1855
           //   monearr.push(obj54)
1855
           //   monearr.push(obj54)
1856
-          // }  
1856
+          // }
1857
           if(this.monitors[i].sodium_concentration ==0 ){
1857
           if(this.monitors[i].sodium_concentration ==0 ){
1858
             // this.monitors[i].temperature == 0
1858
             // this.monitors[i].temperature == 0
1859
-            const obj59 = '监测第'+((i*1)+1)+'行钠浓度/温度'
1859
+            const obj59 = '监测第'+((i*1)+1)+'行钠浓度'
1860
             monearr.push(obj59)
1860
             monearr.push(obj59)
1861
           } if(this.monitors[i].pulse_frequency ==0){
1861
           } if(this.monitors[i].pulse_frequency ==0){
1862
             const obj60 = '监测第'+((i*1)+1)+'行脉搏'
1862
             const obj60 = '监测第'+((i*1)+1)+'行脉搏'

+ 6 - 4
src/xt_pages/user/components/PatientDetail.vue Просмотреть файл

1348
                     {{ patientPrint.id_card_no }}
1348
                     {{ patientPrint.id_card_no }}
1349
                   </td>
1349
                   </td>
1350
                 </tr>
1350
                 </tr>
1351
-                 <tr>
1351
+                <tr>
1352
                   <td style="padding: 5px 0px;font-size: 22px;font-weight: 500;">
1352
                   <td style="padding: 5px 0px;font-size: 22px;font-weight: 500;">
1353
                     联系人
1353
                     联系人
1354
                   </td>
1354
                   </td>
1476
                   </td>
1476
                   </td>
1477
                   <td colspan="9">
1477
                   <td colspan="9">
1478
                     <div
1478
                     <div
1479
-                      class="td_proj_content td_align_left"
1479
+                      class="td_proj_content td_align_left wrapper"
1480
                       v-html="patientPrint.diagnose"
1480
                       v-html="patientPrint.diagnose"
1481
                     ></div>
1481
                     ></div>
1482
                   </td>
1482
                   </td>
1820
     printThisInfo() {
1820
     printThisInfo() {
1821
       var ptime = Math.round(new Date().getTime() / 1000);
1821
       var ptime = Math.round(new Date().getTime() / 1000);
1822
       this.print_time = uParseTime(ptime, "{y}年{m}月{d}日");
1822
       this.print_time = uParseTime(ptime, "{y}年{m}月{d}日");
1823
-
1824
       const style =
1823
       const style =
1825
         "@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;} }";
1824
         "@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;} }";
1826
       const style1 =
1825
       const style1 =
1827
-        "@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;} }";
1826
+        "@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;} }";
1828
       if(this.org_id != 10206 && this.org_id !=0){
1827
       if(this.org_id != 10206 && this.org_id !=0){
1829
         console.log('1111111');
1828
         console.log('1111111');
1830
 
1829
 
2721
 .el-select-dropdown {
2720
 .el-select-dropdown {
2722
   z-index: 998 !important;
2721
   z-index: 998 !important;
2723
 }
2722
 }
2723
+.wrapper {
2724
+  white-space: pre-wrap;
2725
+}
2724
 </style>
2726
 </style>