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

src/views/jiesuan/outpatientCharging.vue

@@ -1962,8 +1962,9 @@ export default {
                     // this.yibaoshowNew=false
                     this.bxxxinfo = res.data
                     this.bxxxinfo.his_deduct_amount = 0
+                    console.log(this.orders,'ooooooooooooooooooooooo')
                     this.bxxxinfo.settle_type = //this.bxxxinfo.settle_type.name
-                        this.man_name == '1' ? '自费' : this.man_name == '2' ? '门诊统筹' : this.man_name == '3' ? '医保个账' : this.man_name == '4' ? '门诊慢性病' : this.typeList[0].settle_type.name
+                     this.man_name == '1' ? '自费' : this.man_name == '2' ? '门诊统筹' : this.man_name == '3' ? '医保个账' : this.man_name == '4' ? '门诊慢性病' : this.orders[0].name
                     if (res.data.mzxets != '') {
                         this.dataText = res.data.mzxets
                         this.GSshow = true
@@ -2073,8 +2074,8 @@ export default {
                     this.yujiesuanLoading = false
                     this.dialogVisible = true
                     this.bxxxinfo = res.data
-                    this.bxxxinfo.settle_type = //this.bxxxinfo.settle_type = this.bxxxinfo.settle_type.name
-                        this.man_name == '1' ? '自费' : this.man_name == '2' ? '门诊统筹' : this.man_name == '3' ? '医保个账' : this.man_name == '4' ? '门诊慢性病' : this.typeList[0].settle_type.name
+                    this.bxxxinfo.settle_type =  //this.bxxxinfo.settle_type = this.bxxxinfo.settle_type.name
+                        this.man_name == '1' ? '自费' : this.man_name == '2' ? '门诊统筹' : this.man_name == '3' ? '医保个账' : this.man_name == '4' ? '门诊慢性病' : this.orders[0].name//this.typeList[0].settle_type.name
                     this.bxxxinfo.gjzhzf = 0
                     this.bxxxinfo.his_deduct_amount = 0
                     this.bxxxinfo.grzhzf = 0
@@ -2085,7 +2086,9 @@ export default {
                     } else {
                         this.bxxxinfo.his_deduct_amount = this.bxxxinfo.cash_balance
                     }
-
+if (this.bxxxinfo.gjzhzf == '' || this.bxxxinfo.gjzhzf == null || this.bxxxinfo.gjzhzf == undefined || this.bxxxinfo.gjzhzf == 'undefined' || this.bxxxinfo.gjzhzf == 'null') {
+                            this.bxxxinfo.gjzhzf = 0
+                        }
                     this.form.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)
                 })
                 .catch(err => {