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

                   prescription.target_ultrafiltration
                     ? prescription.target_ultrafiltration
                     : "/"
-                }}L
+                }}ml
               </span>
             </td>
             <td style="text-align: left" colspan="1">
                   afterdialysis.actual_ultrafiltration
                     ? afterdialysis.actual_ultrafiltration
                     : "/"
-                }}L
+                }}ml
               </span>
             </td>
             <td style="text-align: left" colspan="2">
               <span style="display: inline-block; margin-left: 15px"
                 >使用特殊药物:</span
               >
-              <!-- <label-box :isChecked="prescription.special_medicine == 1 ? true : false" showValue="无"></label-box>
+              <label-box :isChecked="prescription.special_medicine == 1 ? true : false" showValue="无"></label-box>
               <label-box :isChecked="prescription.special_medicine == 2 ? true : false" showValue="有"></label-box>:
               <label-box
                 :isChecked="prescription.special_medicine == 3 ? true : false"
               <label-box
                 :isChecked="prescription.special_medicine == 4 ? true : false"
                 showValue="抗凝药"
-              ></label-box> -->
+              ></label-box>
               其他：{{ prescription.special_medicine_other }}
             </td>
           </tr>

src/xt_pages/outpatientCharges/invoiceTemplate/printSix.vue

 <template>
     <div id='invoice-print'>
         <div v-for='(i,index) in pageArr.length' :key="index" >
-            <div :style="{position: 'absolute',top:(20 + (index * 570))  + 'px',left:200+ 'px',}">盐城大丰悦达金骆驼血液透析中心</div>
-            <div :style="{position: 'absolute',top:(80 + (index * 570))  + 'px',left:150+ 'px',}">{{ list.order_number }}</div>
+            <div :style="{position: 'absolute',top:(20 + (index * 660))  + 'px',left:200+ 'px',}">盐城大丰悦达金骆驼血液透析中心</div>
+            <div :style="{position: 'absolute',top:(70 + (index * 660))  + 'px',left:150+ 'px',}">{{ list.order_number }}</div>
             <div style="display:flex;justify-content: space-between;">
-                <div :style="{position: 'absolute',top:(130 + (index * 570))  + 'px',left:80+ 'px',}">{{ paramsObj.name }}</div>
+                <div :style="{position: 'absolute',top:(100 + (index * 660))  + 'px',left:100+ 'px',}">{{ paramsObj.name }}</div>
             </div>
-            <div :style="{position: 'absolute',top:(190 + (index * 570))  + 'px',left:80+ 'px',}">
+            <div :style="{position: 'absolute',top:(190 + (index * 660))  + 'px',left:120+ 'px',}">
                 <div v-if="list.westernMedicineCostTotal">西药 {{ list.westernMedicineCostTotal }}</div>
                 <div v-if="list.treatCostTotal">治疗费 {{ list.treatCostTotal }}</div>
                 <div v-if="list.bedCostTotal">床位费 {{ list.bedCostTotal }}</div>
                 <div v-if="list.otherCostTotal">其他费 {{ list.otherCostTotal }}</div>
                 <div v-if="list.materialCostTotal">材料费 {{ list.materialCostTotal }}</div>
             </div>
-            <div :style="{position: 'absolute',top:(190 + (index * 570))  + 'px',left:260+ 'px'}">
+            <div :style="{position: 'absolute',top:(190 + (index * 660))  + 'px',left:300+ 'px'}">
                 <div v-for="item in list.order_info.slice(index * 10,(index * 10) + pageArr[index])">
                     <span style="display:inline-block;width:200px;">
                         <span v-if="item.advice.id == 0">
                     </span>
                 </div>
             </div>
-            <div :style="{position: 'absolute',top:(390 + (index * 570))  + 'px',left:110+ 'px'}">{{ zhongwen }}</div>
-            <div :style="{position: 'absolute',top:(390 + (index * 570))  + 'px',left:460+ 'px'}">{{ list.medfee_sumamt }}</div>
-            <div v-if="index == pageArr.length - 1" :style="{position: 'absolute',top:(420 + (index * 570))  + 'px',left:110+ 'px',width:100 + '%',fontSize:12+'px'}">
+            <div :style="{position: 'absolute',top:(390 + (index * 660))  + 'px',left:130+ 'px'}">{{ zhongwen }}</div>
+            <div :style="{position: 'absolute',top:(390 + (index * 660))  + 'px',left:480+ 'px'}">{{ list.medfee_sumamt }}</div>
+            <div v-if="index == pageArr.length - 1" :style="{position: 'absolute',top:(420 + (index * 660))  + 'px',left:110+ 'px',width:100 + '%',fontSize:12+'px'}">
                 <div style="display:flex;">
                   <div style="width:140px">医疗总费用：{{ list.order.medfee_sumamt }}</div>
                   <div style="width:140px">基金支付总额：{{ list.order.fund_pay_sumamt }}</div>
 
             </div>
             <div>
-                <div :style="{position: 'absolute',top:(500 + (index * 570))  + 'px',left:100+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
-                <div :style="{position: 'absolute',top:(500 + (index * 570))  + 'px',left:360+ 'px'}">{{ paramsObj.chargeName }}</div>
-                <div :style="{position: 'absolute',top:(500 + (index * 570))  + 'px',left:520+ 'px'}">
+                <div :style="{position: 'absolute',top:(480 + (index * 660))  + 'px',left:140+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
+                <div :style="{position: 'absolute',top:(480 + (index * 660))  + 'px',left:410+ 'px'}">{{ paramsObj.chargeName }}</div>
+                <div :style="{position: 'absolute',top:(480 + (index * 660))  + 'px',left:550+ 'px'}">
                     <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
                 </div>
-                <div :style="{position: 'absolute',top:(500 + (index * 570))  + 'px',left:560+ 'px'}">
+                <div :style="{position: 'absolute',top:(480 + (index * 660))  + 'px',left:610+ 'px'}">
                     <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</span>
                 </div>
-                <div :style="{position: 'absolute',top:(500 + (index * 570))  + 'px',left:600+ 'px'}">
+                <div :style="{position: 'absolute',top:(480 + (index * 660))  + 'px',left:650+ 'px'}">
                     <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</span>
                 </div>
             </div>