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

src/xt_pages/outpatientCharges/statementTemplate/printFour.vue

@@ -80,7 +80,7 @@
                             </div>
                             <div class="chargeUl" style="border-top:1px solid #000;border-bottom:1px solid #000;">
                                 <p style="width:50%;">现金支付</p>
-                                <p style="width:50%;">{{info.psn_cash_pay?info.psn_cash_pay:0}}元</p>
+                                <p style="width:50%;">{{info.psn_pay?info.psn_pay:0}}元</p>
                             </div>
                         </div>
                         <div style="width:80%;max-height:500px;">

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -51,7 +51,7 @@
                     </tr>
                     <tr v-for="(it,index) in item.project" :key="index">
                         <td>{{index+1}}</td>
-                        <td>{{it.type == 2 ?getProjectName(it.project_id):it.good_info.good_name}}</td>
+                        <td>{{it.type == 2 ? it.project.project_name : it.good_info.good_name}}</td>
                         <td>{{it.single_dose}}</td>
                         <td>{{getUnit(it.unit)}}</td>
                         <td>{{it.price}}</td>