22

.env.development

@@ -12,8 +12,8 @@ VUE_APP_BASE_API = ''
 VUE_APP_BASE_URL_change = 'http://10.10.8.230:6200/fancy'
 # VUE_APP_BASE_URL = 'http://127.0.0.1:9902'
 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: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://127.0.0.1:9902'
 # VUE_APP_BASE_URL = 'http://192.169.4.171:8002'
 # VUE_APP_BASE_URL = 'http://10.10.40.10:8099'

src/views/jiesuan/outpatientCharging.vue

@@ -232,7 +232,7 @@
                                         <el-form-item>
                                             <div class="form_item">
                                                 <el-tag class="label" color="#E7EEFF">结算类型</el-tag>
-                                                <el-input v-model="bxxxinfo.settle_type.name" disabled></el-input>
+                                                <el-input v-model="bxxxinfo.settle_type" disabled></el-input>
                                             </div>
                                         </el-form-item>
 
@@ -677,6 +677,9 @@ export default {
             cardType: '', // 卡类型
             patientData: {
                 type: {},
+                settle_type:{
+                    name:''
+                }
             },
             tableDataList: [],
             only_qq: 0,
@@ -1815,7 +1818,7 @@ export default {
             this.carddialogFormVisible = true
         },
         ybjs() {
-            if ((this.checktipes() && this.man_name != '1') || this.man_name == '2') {
+            if ((this.checktipes() && this.man_name != '1') || this.man_name == '2' || this.man_name == '3') {
                 // this.yibaoshow = true
                 this.yibaoshowNew = true
                 this.yujiesuanload = false
@@ -1830,7 +1833,7 @@ export default {
                 return false
             }
             // //离休
-            // if (this.typelistno == '9') {
+            // if (this.typelistno == '9') {?
             //     return false
             // }
             // //伤残
@@ -2450,7 +2453,7 @@ export default {
             if (this.man_name == '2' || this.man_name == '3' || this.man_name == '1') {
                 zhenduan = ''
             }
-             this.patientData.settle_type.name=this.man_name=='1'?'自费':this.man_name=='2'?'门诊统筹':this.man_name=='3'?'医保个账':this.man_name=='4'?'门诊慢性病': this.patientData.type.name
+            
             this.yujiesuanLoading = true
             this.xj_amount = 0
             this.source_pay_amount = 0
@@ -2477,13 +2480,14 @@ export default {
                 .then(res => {
                     this.bxxxinfo = res.data
                     this.bxxxinfo.his_deduct_amount = 0
+                     this.bxxxinfo.settle_type=this.man_name=='1'?'自费':this.man_name=='2'?'门诊统筹':this.man_name=='3'?'医保个账':this.man_name=='4'?'门诊慢性病': this.patientData.type.name
                     if (res.data.mzxets != '') {
                         this.dataText = res.data.mzxets
                         this.GSshow = true
                     }
                     this.yujiesuanLoading = false
                     this.moreLoading = false
-
+.0
                     console.log(res.data.his_deduct_amount, '*********************')
                     familybalanceinfor({
                         patient_id: this.patientData.patient_id,
@@ -2587,19 +2591,23 @@ export default {
                 channel: this.channel,
             })
                 .then(res => {
+                    console.log("=----------------------")
                     this.yujiesuanLoading = false
                     this.dialogVisible = true
                     this.bxxxinfo = res.data
+                    console.log(  this.bxxxinfo,'++++++++++++++++++++')
+                    this.bxxxinfo.settle_type=this.man_name=='1'?'自费':this.man_name=='2'?'门诊统筹':this.man_name=='3'?'医保个账':this.man_name=='4'?'门诊慢性病': this.patientData.type.name
                     this.bxxxinfo.gjzhzf = 0
                     this.bxxxinfo.his_deduct_amount = 0
                     this.bxxxinfo.grzhzf = 0
+                      
                     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)
                     if (this.bxxxinfo.cash_balance >= djf) {
                         this.bxxxinfo.his_deduct_amount = djf
                     } else {
                         this.bxxxinfo.his_deduct_amount = this.bxxxinfo.cash_balance
                     }
-
+                  
                     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 => {