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

src/views/jiesuan/outpatientCharging.vue

@@ -1163,13 +1163,9 @@ export default {
                     authCode: this.fee.weixin,
                     operatorNo: this.jobNumber,
                     payType: e == '1' ? 'cumsNative' : e == '5' ? 'cash' : e == '2'?'智慧医保':'', // 支付类型 cumsNative 聚合支付 cash 现金
-                    rechargeType: 1, // 是否预交金充值 1是 0否,
+                    rechargeType: 0, // 是否预交金充值 1是 0否,
                     patientId: this.patientData.patient_id,
                     deptCode: this.dept,
-                    // amount: this.form.djf,
-                    // auth_code: this.fee.weixin,
-                    // patient_id: this.patientData.patient_id,
-                    // settlement_no: this.bxxxinfo.settlement_no,
                 })
                     .then(response => {
                         if (response.code == 200) {
@@ -1178,21 +1174,21 @@ export default {
                                 type: 'success',
                             })
                             this.payData = response.data
-                            // if (e == '1') {
-                            //     this.xj_amount = 0
-                            //     this.source_pay_amount = this.form.djf
-                            // } else {
-                            //     this.xj_amount = this.form.djf
-                            //     this.source_pay_amount = 0
-                            // }
+                            if (e == '1') {
+                                this.xj_amount = 0
+                                this.source_pay_amount = this.form.djf
+                            } else {
+                                this.xj_amount = this.form.djf
+                                this.source_pay_amount = 0
+                            }
                             this.bxxxinfo.his_deduct_amount = this.form.djf + this.bxxxinfo.his_deduct_amount
                             this.form.djf = 0
                             //接口返回新的院内账户余额
-                            this.bxxxinfo.cash_balance = response.data.hisBalance * 1
+                            // this.bxxxinfo.cash_balance = response.data.hisBalance * 1
                             let djsold = this.round(this.bxxxinfo.brfdje - this.bxxxinfo.grzhzf, 2)
-                            // let chongzhi = this.source_pay_amount * 1 + this.xj_amount * 1
+                            let chongzhi = this.source_pay_amount * 1 + this.xj_amount * 1
                             //充值成功后的代缴费金额
-                            this.form.djf = this.round(this.round(djsold - this.bxxxinfo.his_deduct_amount, 2) - this.bxxxinfo.gjzhzf, 2) //this.round(- chongzhi, 2)
+                            this.form.djf = this.round(this.round(this.round(djsold - this.bxxxinfo.his_deduct_amount, 2) - this.bxxxinfo.gjzhzf, 2)- chongzhi, 2) //this.round(- chongzhi, 2)
 
                             //微信支付宝弹窗
                             this.uploadfeeshow = false
@@ -2016,13 +2012,13 @@ export default {
             }, 1000)
             this.sureshow = true
             let y = {
-                // source_type: this.payData.targetSys,
-                // source_trade_no: this.payData.sourceTradeNo,
+                source_type: this.payData.targetSys,
+                source_trade_no: this.payData.sourceTradeNo,
                 is_gz: this.gz_name,
                 channel: this.channel,
-                // xj_amount: this.xj_amount,
-                // source_pay_amount: this.source_pay_amount,
-                // tradeNo: this.payData.tradeNo,
+                xj_amount: this.xj_amount,
+                source_pay_amount: this.source_pay_amount,
+                tradeNo: this.payData.tradeNo,
                 family_type: this.familyType,
                 patient_id: this.patientData.patient_id,
                 personal_pay: this.bxxxinfo.grzhzf,
@@ -2655,11 +2651,11 @@ export default {
                 return false
             }
             let y = {
-                // source_type: this.payData.targetSys,
-                // source_trade_no: this.payData.sourceTradeNo,
+                source_type: this.payData.targetSys,
+                source_trade_no: this.payData.sourceTradeNo,
                 channel: this.channel,
-                // xj_amount: this.xj_amount,
-                // source_pay_amount: this.source_pay_amount,
+                xj_amount: this.xj_amount,
+                source_pay_amount: this.source_pay_amount,
                 tradeNo: this.payData.tradeNo,
                 patient_id: this.patientData.patient_id,
                 personal_pay: this.bxxxinfo.grzhzf,