Browse Source

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

csx 4 years ago
parent
commit
3068f014ec

+ 7 - 4
src/xt_pages/outpatientCharges/newStatementPrintTwo.vue View File

109
                   that.info['patient_name'] = response.data.data.patient_name
109
                   that.info['patient_name'] = response.data.data.patient_name
110
                   that.info['doctor_code'] = response.data.data.doctor_code
110
                   that.info['doctor_code'] = response.data.data.doctor_code
111
                   that.info['doctor_name'] = response.data.data.doctor_name
111
                   that.info['doctor_name'] = response.data.data.doctor_name
112
-                  that.info['health_card_no'] = response.data.data.health_card_no_two
112
+                  if(response.data.data.health_card_no_two.length == 0){
113
+                    that.info['health_card_no'] = response.data.data.health_card_no
114
+                  }else{
115
+                    that.info['health_card_no'] = response.data.data.health_card_no_two
116
+                  }
117
+
113
                   that.info['order_number'] = response.data.data.order_number
118
                   that.info['order_number'] = response.data.data.order_number
114
 
119
 
115
                   that.info['department'] =  response.data.data.department
120
                   that.info['department'] =  response.data.data.department
116
                   that.info['yiliao_leibie'] =  response.data.data.yiliao_leibie
121
                   that.info['yiliao_leibie'] =  response.data.data.yiliao_leibie
117
 
122
 
118
                   that.info['before_money'] =  response.data.data.before_money
123
                   that.info['before_money'] =  response.data.data.before_money
119
-                  that.info['after_money'] =  response.data.data.after_money
120
-
121
-
124
+                  that.info['after_money'] =   response.data.data.after_money
122
 
125
 
123
                   that.info['org_name'] = that.$store.getters.xt_user.org.org_name
126
                   that.info['org_name'] = that.$store.getters.xt_user.org.org_name
124
                   console.log("~~~~" + that.info)
127
                   console.log("~~~~" + that.info)

+ 2 - 2
src/xt_pages/outpatientCharges/newTreatTemplate/printOne.vue View File

77
                 </div>
77
                 </div>
78
                 <div class="moneyBox">
78
                 <div class="moneyBox">
79
                     <p>实收金:{{info.transBody.akc264}}元</p>
79
                     <p>实收金:{{info.transBody.akc264}}元</p>
80
-                    <p>记账前金额:{{0.00}}元</p>
80
+                    <p>记账前金额:{{info.before_money}}元</p>
81
                     <p>扣款金额:{{0.00}}元</p>
81
                     <p>扣款金额:{{0.00}}元</p>
82
-                    <p>记账后金额:{{0.00}}元</p>
82
+                    <p>记账后金额:{{info.after_money}}元</p>
83
                     <p>找赎金:{{0.00}}元</p>
83
                     <p>找赎金:{{0.00}}元</p>
84
                 </div>
84
                 </div>
85
                 <div class="actionBar">
85
                 <div class="actionBar">