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

@@ -2989,16 +2989,17 @@ export default {
                 price: temp2[b].price,
                 remark: '',
                 medical_code: temp2[b].medical_code,
-                unit: temp2[b].unit,
                 type: temp2[b].type
               }
 
               if (temp2[b].type == 2) {
                 obj['project'] = temp2[b].project
+                obj['unit'] = temp2[b].project.unit
 
               } else if (temp2[b].type == 3) {
-
                 obj['good_info'] = temp2[b].good_info
+                obj['unit'] = temp2[b].good_info.packing_unit
+
 
               }
               if (temp2[b].team_id == undefined) {

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

@@ -184,22 +184,20 @@
           {{list.order.hifmi_pay?list.order.hifmi_pay:''}}
         </div> -->
         <!-- 其他基金支付 -->
-        <!-- <div style="position: absolute;top:340px;left:560px">
-
-          {{list.order.oth_pay?list.order.oth_pay:''}}
-
-        </div> -->
+        <div style="position: absolute;top:340px;left:560px">
+          预交押金:{{parseInt(pre_pay_money) + parseInt(list.order.decimal)}}
+        </div>
         <div style="position: absolute;top:370px;left:40px">
             <!-- 预交款合计 -->
-            预交款合计:{{pre_pay_money}}
+          押金支付:{{list.order.decimal}}
         </div>
         <div style="position: absolute;top:370px;left:250px">
             <!-- 补交款 -->
-            补交款:0.00
+          实付:{{parseInt(list.order.psn_cash_pay) - parseInt(list.order.decimal)}}
         </div>
         <div style="position: absolute;top:370px;left:480px">
             <!-- 应退款 -->
-            应退款:0.00
+            应退款:{{list.refund_sum}}
         </div>
         <div>
             <div style="position: absolute;top:400px;left:40px">

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2968,7 +2968,6 @@
                   price: temp2[b].price,
                   remark: '',
                   medical_code: temp2[b].medical_code,
-                  unit: temp2[b].unit,
                   type: temp2[b].type,
                   execution_state:2,
 
@@ -2976,10 +2975,13 @@
 
                 if (temp2[b].type == 2){
                   obj['project'] = temp2[b].project
+                  obj['unit'] = temp2[b].project.unit
 
-                }else if(temp2[b].type == 3){
 
+                }else if(temp2[b].type == 3){
                   obj['good_info'] = temp2[b].good_info
+                  obj['unit'] = temp2[b].good_info.packing_unit
+
 
                 }
                 if (temp2[b].team_id == undefined) {

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1548,7 +1548,6 @@
                   price: temp2[b].price,
                   remark: '',
                   medical_code: temp2[b].medical_code,
-                  unit: temp2[b].unit,
                   type: temp2[b].type,
                   frequency_type: 1,
                   day_count: 0,
@@ -1556,11 +1555,10 @@
                 }
                 if (temp2[b].type == 2) {
                   obj['project'] = temp2[b].project
-
+                  obj['unit'] = temp2[b].project.unit
                 } else if (temp2[b].type == 3) {
-
                   obj['good_info'] = temp2[b].good_info
-
+                  obj['unit'] = temp2[b].good_info.packing_unit
                 }
                 if (obj.total == 0 || obj.total == undefined) {
                   obj.total = 1