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/DialysisPrintOrderThirtySix.vue

@@ -175,9 +175,9 @@
                 <tbody>
                   <tr>
                     <!-- <td width="190"></td> -->
-                    <td width='100'>穿刺针：</td>
-                    <td style="text-align:left;">
-                      <span>{{ predialysis.puncture_needle ? predialysis.puncture_needle : '/' }}</span>
+                    <td width='100'>穿刺针型号：</td>
+                    <td>
+                      <div class="under-line" style="text-align:left;">{{ predialysis.puncture_needle ? predialysis.puncture_needle : '/' }}</div>
                       <!-- <div>
                         <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G') > -1 ? true : predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G-静脉') > -1 ? true : false" showValue="16G"></label-box>
                         &nbsp;
@@ -558,9 +558,9 @@
       <table class="print-table" style="border-left:1px solid #000;border-right:1px solid #000;">
         <tbody>
           <tr>
-            <td width="120" style="height:40px;">主管医生:</td>
+            <td width="70" style="height:40px;">主管医生:</td>
             <td width="100">
-                <div>
+                <div style="text-align: left;">
                     <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
                     <img class="es-img" style="height:38px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
                 </div>
@@ -568,15 +568,15 @@
             <td width="70">预冲护士:</td>
             <td width="100">
 
-                <div>
+                <div style="text-align: left;">
                     <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.washpipe_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.washpipe_nurse)}}</span>
                     <img class="es-img" style="height:38px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.washpipe_nurse)" alt="" srcset="" v-else>
                 </div>
             </td>
-            <td width="100">穿刺护士:</td>
+            <td width="100">穿刺/开管护士:</td>
             <td width="100">
 
-                <div>
+                <div style="text-align: left;">
                     <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.puncture_nurse)}}</span>
                     <img class="es-img" style="height:38px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse)" alt="" srcset="" v-else>
                 </div>
@@ -584,7 +584,7 @@
             <td width="70">核对护士:</td>
             <td width="100">
 
-                <div>
+                <div style="text-align: left;">
                   <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
                   {{ getAdminUser(check == null ? 0 : check.modifier) }}
                   </span>
@@ -618,7 +618,7 @@
             <td width="60">动脉压<br />mmHg</td>
             <td width="60">静脉压<br />mmHg</td>
             <td width="60">跨膜压<br />mmHg</td>
-            <td width="60">超滤量<br />ml</td>
+            <td width="60">超滤量<br />L</td>
             <td width="60">钠浓度<br/>mmol/L</td>
             <td width="60">电导度<br/>ms/cm</td>
             <td width="40">液温<br/>℃</td>
@@ -719,7 +719,7 @@
                         &nbsp;{{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "" }}
                       </div>
                     </td>
-                    <td width="20">ml</td>
+                    <td width="20">L</td>
                     <td width="20"></td>
                     <td width="50">血流量</td>
                     <td width='140'>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -442,14 +442,27 @@
         this.$refs.multipleTable3.toggleAllSelection()
       },
       printThisPage() {
-        const style =
+        if(this.org_id == 10138){
+          const style =
           '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 87%;}}}'
-        printJS({
-          printable: 'printMain',
-          type: 'html',
-          style: style,
-          scanStyles: false
-        })
+          printJS({
+            printable: 'printMain',
+            type: 'html',
+            style: style,
+            scanStyles: false
+          })
+        }else{
+          const style =
+          '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}}'
+          printJS({
+            printable: 'printMain',
+            type: 'html',
+            style: style,
+            scanStyles: false
+          })
+        }
+        
+        
         this.innerVisible = false
         // this.$nextTick(() => {
         //   this.$refs.print.printThisPage()