Commit bad6abb4 authored by 任鸿志's avatar 任鸿志

refactor(outpatientCharging): 优化付款方式显示和结算逻辑

- 调整付款方式对话框宽度为70%
- 修复订单列表处理逻辑,使用settle_type替代group_id
- 优化医保结算类型显示逻辑
- 添加对共济账户支付金额的空值处理
parent 91c5c0a9
...@@ -482,7 +482,7 @@ ...@@ -482,7 +482,7 @@
</div> </div>
</el-form> </el-form>
</el-dialog> </el-dialog>
<el-dialog width="50%" title="付款方式" :visible.sync="uploadfeeshow" :close-on-click-modal="false"> <el-dialog width="70%" title="付款方式" :visible.sync="uploadfeeshow" :close-on-click-modal="false">
<el-form :model="feelist" :inline="true" @submit.native.prevent> <el-form :model="feelist" :inline="true" @submit.native.prevent>
<div> <div>
<div style="text-align: center"> <div style="text-align: center">
...@@ -1672,10 +1672,11 @@ export default { ...@@ -1672,10 +1672,11 @@ export default {
} }
this.ismb = false this.ismb = false
this.orders.forEach(element => { this.orders.forEach(element => {
if (element) { if (element.is_mb) {
this.ismb = true this.ismb = true
} }
}) })
console.log( this.orders, 'ppppppppppppppp')
// 医技预约channel=4不走审核 省职也要加审核 25-7-10 慢病审核 // 医技预约channel=4不走审核 省职也要加审核 25-7-10 慢病审核
if ((this.channel != '4' && (this.man_name == '4' || (this.ismb && this.man_name == ''))) || (this.form.insurance_type == 'PROVINCE' && this.man_name != '1' && this.man_name != '3')) { if ((this.channel != '4' && (this.man_name == '4' || (this.ismb && this.man_name == ''))) || (this.form.insurance_type == 'PROVINCE' && this.man_name != '1' && this.man_name != '3')) {
this.yujiesuanLoading = true this.yujiesuanLoading = true
...@@ -1876,6 +1877,7 @@ export default { ...@@ -1876,6 +1877,7 @@ export default {
}, },
//确认结算判断 //确认结算判断
qrjsmiss(e) { qrjsmiss(e) {
console.log(this.typelistno,'oiiiiiiiiiiii')
this.saveLoding = true this.saveLoding = true
if (this.typelistno == 'UNKNOWN') { if (this.typelistno == 'UNKNOWN') {
this.$message({ this.$message({
...@@ -2152,7 +2154,7 @@ export default { ...@@ -2152,7 +2154,7 @@ export default {
var cost_ids = [] var cost_ids = []
x.slice(0, x.length - 1).forEach(function (element) { x.slice(0, x.length - 1).forEach(function (element) {
total += element.total * 1 * 1 total += element.total * 1 * 1
orders.push(element.group_id) orders.push(element.settle_type)
cost_ids.push(element.serial_no) cost_ids.push(element.serial_no)
costint.push(element) costint.push(element)
}) })
...@@ -2191,7 +2193,7 @@ export default { ...@@ -2191,7 +2193,7 @@ export default {
var cost_ids = [] var cost_ids = []
array.forEach(function (element) { array.forEach(function (element) {
total += element.total * 1 * 1 total += element.total * 1 * 1
orders.push(element.group_id) orders.push(element.settle_type)
cost_ids.push(element.serial_no) cost_ids.push(element.serial_no)
costint.push(element) costint.push(element)
}) })
...@@ -2231,7 +2233,7 @@ export default { ...@@ -2231,7 +2233,7 @@ export default {
var cost_ids = [] var cost_ids = []
array.forEach(function (element) { array.forEach(function (element) {
total += element.total * 1 * 1 total += element.total * 1 * 1
orders.push(element.group_id) orders.push(element.settle_type)
cost_ids.push(element.serial_no) cost_ids.push(element.serial_no)
costint.push(element) costint.push(element)
}) })
...@@ -2239,7 +2241,6 @@ export default { ...@@ -2239,7 +2241,6 @@ export default {
this.cost_id = cost_ids this.cost_id = cost_ids
this.orders = orders this.orders = orders
this.total = total.toFixed(2) this.total = total.toFixed(2)
if (array.length != 0) { if (array.length != 0) {
info({ info({
serial_no: cost_ids.toString(), serial_no: cost_ids.toString(),
...@@ -2456,8 +2457,8 @@ export default { ...@@ -2456,8 +2457,8 @@ export default {
// this.yibaoshowNew=false // this.yibaoshowNew=false
this.bxxxinfo = res.data this.bxxxinfo = res.data
this.bxxxinfo.his_deduct_amount = 0 this.bxxxinfo.his_deduct_amount = 0
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.man_name == '1' ? '自费' : this.man_name == '2' ? '门诊统筹' : this.man_name == '3' ? '医保个账' : this.man_name == '4' ? '门诊慢性病' : this.typeList[0].settle_type.name
if (res.data.mzxets != '') { if (res.data.mzxets != '') {
this.dataText = res.data.mzxets this.dataText = res.data.mzxets
this.GSshow = true this.GSshow = true
...@@ -2524,6 +2525,9 @@ export default { ...@@ -2524,6 +2525,9 @@ export default {
} }
} }
} }
if (this.bxxxinfo.gjzhzf==''|| 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) //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.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) //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.form.djf=0 // this.form.djf=0
this.dialogVisible = true this.dialogVisible = true
......
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