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

src/xt_pages/outpatientCharges/components/chargeDialog.vue

         this.form.total = total + this.form.medical_insurance_price
         this.form.discount_price = 0.0
         this.form.preferential_price = 0.0
-        this.form.acct_pay = this.order.acct_pay
-        this.form.psn_pay = this.order.psn_cash_pay
+
 
 
         this.form.fapiao_code =""
         this.order = order
 
         if(this.order && this.order.id > 0){
+          this.form.acct_pay = this.order.acct_pay
+          this.form.psn_pay = this.order.psn_cash_pay
           this.form.total = this.order.medfee_sumamt
           this.form.pay_price = this.order.medfee_sumamt
           this.form.medical_insurance_price = this.order.fund_pay_sumamt