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

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -2574,10 +2574,6 @@ export default {
         this.$message.error('该处方已经结算或者已经上传医保系统，无法删除')
         return
       }
-      if (targetName == '处方1') {
-        this.$message.error('该处方无法删除')
-        return
-      }
       this.$confirm('处方删除后不可恢复，是否确认删除', '删除', {
         confirmButtonText: '确 定',
         cancelButtonText: '取 消',

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

@@ -185,7 +185,7 @@
         </div> -->
         <!-- 其他基金支付 -->
         <div style="position: absolute;top:340px;left:560px">
-          预交押金:{{parseInt(pre_pay_money) + parseInt(list.order.decimal)}}
+          预交押金:{{parseFloat(pre_pay_money) + parseFloat(list.order.decimal)}}
         </div>
         <div style="position: absolute;top:370px;left:40px">
             <!-- 预交款合计 -->
@@ -193,7 +193,7 @@
         </div>
         <div style="position: absolute;top:370px;left:250px">
             <!-- 补交款 -->
-          实付:{{parseInt(list.order.psn_cash_pay) - parseInt(list.order.decimal)}}
+          实付:{{parseFloat(list.order.psn_cash_pay) - parseFloat(list.order.decimal)}}
         </div>
         <div style="position: absolute;top:370px;left:480px">
             <!-- 应退款 -->