Skip to content

省
省二结算
Commit cc5b9ee5 authored by 任鸿志's avatar 任鸿志
Browse files
Options

Merge branch 'master' of http://60.216.109.204:8082/renhongzhi/sle-web-settlement

parents 2f0baa15 79be0c2a
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
.env.test
View file @ cc5b9ee5
...@@ -8,7 +8,7 @@ NODE_ENV = 'production' ...@@ -8,7 +8,7 @@ NODE_ENV = 'production'
VUE_APP_BASE_API = '' VUE_APP_BASE_API = ''
# VUE_APP_BASE_URL = 'http://newfinance-system.fancyinfo.net' # VUE_APP_BASE_URL = 'http://newfinance-system.fancyinfo.net'
VUE_APP_BASE_URL = 'http://10.10.9.219:9902' VUE_APP_BASE_URL = 'http://10.10.9.219:9902'
VUE_APP_BASE_URL_SFC = 'http://10.10.9.219:8802' VUE_APP_BASE_URL_SFC = 'http://10.10.9.219:9902'
VUE_APP_BASE_URL_change = 'http://10.10.8.230:6200/fancy' VUE_APP_BASE_URL_change = 'http://10.10.8.230:6200/fancy'
# VUE_APP_BASE_URL = 'http://med-api.fancyinfo.net' # VUE_APP_BASE_URL = 'http://med-api.fancyinfo.net'
# VUE_APP_BASE_URL = 'http://10.10.40.10:9902' # VUE_APP_BASE_URL = 'http://10.10.40.10:9902'
src/views/jiesuan/outpatientCharging.vue
View file @ cc5b9ee5
...@@ -2496,15 +2496,15 @@ export default { ...@@ -2496,15 +2496,15 @@ export default {
let djf = this.round(this.round(this.round(this.bxxxinfo.patient_burden - this.bxxxinfo.gjzhzf, 2) - this.bxxxinfo.his_deduct_amount, 2) - this.bxxxinfo.grzhzf, 2) //this.round(this.round(this.round(this.round(this.bxxxinfo.patient_burden - this.bxxxinfo.gjzhzf, 2) - this.bxxxinfo.his_deduct_amount, 2) - this.bxxxinfo.grzhzf, 2) - this.bxxxinfo.personal_pay_syd,2) let djf = this.round(this.round(this.round(this.bxxxinfo.patient_burden - this.bxxxinfo.gjzhzf, 2) - this.bxxxinfo.his_deduct_amount, 2) - this.bxxxinfo.grzhzf, 2) //this.round(this.round(this.round(this.round(this.bxxxinfo.patient_burden - this.bxxxinfo.gjzhzf, 2) - this.bxxxinfo.his_deduct_amount, 2) - this.bxxxinfo.grzhzf, 2) - this.bxxxinfo.personal_pay_syd,2)
if (this.bxxxinfo.personal_balance >= djf) { if (this.bxxxinfo.personal_balance >= djf) {
this.bxxxinfo.grzhzf = djf this.bxxxinfo.grzhzf = djf
if (this.form.insurance_type == 'LONGDISTANCE') { // if (this.form.insurance_type == 'LONGDISTANCE') {
this.bxxxinfo.grzhzf = 0 // this.bxxxinfo.grzhzf = 0
} // }
} }
if (this.bxxxinfo.personal_balance < djf) { if (this.bxxxinfo.personal_balance < djf) {
this.bxxxinfo.grzhzf = this.bxxxinfo.personal_balance this.bxxxinfo.grzhzf = this.bxxxinfo.personal_balance
if (this.form.insurance_type == 'LONGDISTANCE') { // if (this.form.insurance_type == 'LONGDISTANCE') {
this.bxxxinfo.grzhzf = 0 // this.bxxxinfo.grzhzf = 0
} // }
if (res2.data.family_type != '1') { if (res2.data.family_type != '1') {
if (res2.data.gjzhye > this.round(djf - this.bxxxinfo.grzhzf, 2)) { if (res2.data.gjzhye > this.round(djf - this.bxxxinfo.grzhzf, 2)) {
this.bxxxinfo.gjzhzf = this.round(djf - this.bxxxinfo.grzhzf, 2) this.bxxxinfo.gjzhzf = this.round(djf - this.bxxxinfo.grzhzf, 2)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment