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

                 <div class="inline_block">
                     置换液总量(L):
                     <div class="under_line" style="width: 100px;text-align: center;">
-                        {{ prescription.replacement_total ? prescription.replacement_total : "/" }}
+                        {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "/" }}
                     </div>
                 </div>
                 <div class="inline_block">

src/xt_pages/outpatientCharges/invoiceTemplate/printThree.vue

             <!-- <div>{{ list.id_card_no }}</div> -->
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div  style="position: absolute;left:400px;top:85px;">{{ list.department_name }}</div>
+            <div  style="position: absolute;left:250px;top:100px;">{{ list.department_name }}</div>
             <!-- <div  style="position: absolute;top:40px;left:300px">{{ list.number }}</div> -->
             <div></div>
             <div>
-                <span style="position: absolute;left:120px;top:60px;">{{ paramsObj.setl_time.split(' ')[0].slice(0,10) }}</span>
+                <span style="position: absolute;left:80px;top:80px;">{{ paramsObj.setl_time.split(' ')[0].slice(0,10) }}</span>
                 <!-- <span style="position: absolute;left:630px;top:40px;">{{ paramsObj.setl_time.split(' ')[0].slice(5,7) }}</span>
                 <span style="position: absolute;left:690px;top:40px;">{{ paramsObj.setl_time.split(' ')[0].slice(8,11) }}</span>-->
             </div> 
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:80px;left:120px;"> {{ paramsObj.name }}</div>
+            <div style="position: absolute;top:100px;left:80px;"> {{ paramsObj.name }}</div>
             <!-- <div style="position: absolute;top:60px;left:210px;">√</div> -->
             <!-- <div>{{ list.pay_way }}</div> -->
             <!-- <div style="position: absolute;top:60px;left:460px;">{{ getTime(list.date, '{y}-{m}-{d}') }}</div>
             <div style="position: absolute;top:90px;left:640px;">门慢结算</div>
         </div> -->
         <!-- <div style="display:flex;justify-content: space-between;"> -->
-            <div style="position: absolute;top:120px;left:120px">西药 {{ list.westernMedicineCostTotal }}</div>
+            <div style="position: absolute;top:120px;left:80px">西药 {{ list.westernMedicineCostTotal }}</div>
             <!-- <div style="position: absolute;top:140px;left:80px"></div> -->
-            <div style="position: absolute;top:140px;left:120px">检查费 {{ list.checkCostTotal }}</div>
+            <div style="position: absolute;top:140px;left:80px">检查费 {{ list.checkCostTotal }}</div>
             <!-- <div style="position: absolute;top:180px;left:80px"></div> -->
-            <div style="position: absolute;top:160px;left:120px">治疗费 {{ list.treatCostTotal }}</div>
+            <div style="position: absolute;top:160px;left:80px">治疗费 {{ list.treatCostTotal }}</div>
             <!-- <div style="position: absolute;top:140px;left:80px"></div> -->
-            <div style="position: absolute;top:180px;left:120px">床位费 {{ list.bedCostTotal }}</div>
+            <div style="position: absolute;top:180px;left:80px">床位费 {{ list.bedCostTotal }}</div>
             <!-- <div style="position: absolute;top:140px;left:80px"></div> -->
         <!-- </div> -->
         <!-- <div style="display:flex;justify-content: space-between;"> -->
-            <div style="position: absolute;top:200px;left:120px">中成药 {{ list.chineseTraditionalMedicineCostTotal }}</div>
+            <div style="position: absolute;top:200px;left:80px">中成药 {{ list.chineseTraditionalMedicineCostTotal }}</div>
             <!-- <div style="position: absolute;top:170px;left:80px"></div> -->
-            <div style="position: absolute;top:220px;left:120px">化验费 {{ list.laboratoryCostTotal }}</div>
+            <div style="position: absolute;top:220px;left:80px">化验费 {{ list.laboratoryCostTotal }}</div>
             <!-- <div style="position: absolute;top:170px;left:80px"></div> -->
-            <div style="position: absolute;top:240px;left:120px">手术费 {{ list.operationCostTotal }}</div>
+            <div style="position: absolute;top:240px;left:80px">手术费 {{ list.operationCostTotal }}</div>
             <!-- <div style="position: absolute;top:170px;left:80px"></div> -->
-            <div style="position: absolute;top:260px;left:120px">其他费 {{ list.otherCostTotal }}</div>
+            <div style="position: absolute;top:260px;left:80px">其他费 {{ list.otherCostTotal }}</div>
             <!-- <div style="position: absolute;top:170px;left:80px"></div> -->
         <!-- </div> -->
         <!-- <div style="display:flex;justify-content: space-between;"> -->
             <div style="position: absolute;top:200px;left:110px"></div>
             <div style="position: absolute;top:200px;left:200px"></div>
             <div style="position: absolute;top:200px;left:280px"></div> -->
-            <div style="position: absolute;top:280px;left:120px">材料费 {{ list.materialCostTotal }}</div>
+            <div style="position: absolute;top:280px;left:80px">材料费 {{ list.materialCostTotal }}</div>
             <!-- <div style="position: absolute;top:200px;left:460px"></div> -->
             <!-- <div style="position: absolute;top:200px;left:560px"></div>
             <div style="position: absolute;top:200px;left:640px"></div> -->
             </span>
             <span style="position: absolute;top:250px;left:610px">{{ totalPrice.toFixed(2) }}</span>
         </div> -->
-        <div style="position: absolute;top:300px;left:120px">合计大写 {{ zhongwen }}</div>
-        <div style="position: absolute;top:300px;left:400px">合计小写 {{ list.psn_cash_money }}</div>
+        <div style="position: absolute;top:300px;left:80px">合计大写 {{ zhongwen }}</div>
+        <div style="position: absolute;top:300px;left:300px">合计小写 {{ list.psn_cash_money }}</div>
         <div>
             <!-- <div style="position: absolute;top:320px;left:120px">{{ org_name }}</div> -->
-            <div style="position: absolute;top:320px;left:120px">{{ list.name }}</div>
+            <div style="position: absolute;top:340px;left:120px">{{ paramsObj.chargeName }}</div>
         </div>
     </div>
 </template>