Commit 802baa55 authored by 任鸿志's avatar 任鸿志

refactor(settle): 优化结算逻辑和读卡组件

- 修改 ReadcardsNewSFC 组件,增加 man_name 属性并调整 yltclb 的赋值逻辑
- 更新 outpatient 和 outpatientCharging 页面中的结算逻辑
- 移除部分冗余代码,优化程序结构
parent 810f3037
...@@ -50,6 +50,7 @@ import { mzxx, mzxxs, queryBasicInfo, queryReadRard, getInfoByQrCode } from '@/a ...@@ -50,6 +50,7 @@ import { mzxx, mzxxs, queryBasicInfo, queryReadRard, getInfoByQrCode } from '@/a
export default { export default {
components: {}, components: {},
props: { props: {
man_name:Array,
isOpenCarded: Boolean, isOpenCarded: Boolean,
physicalCardType: { physicalCardType: {
type: String, type: String,
...@@ -376,7 +377,7 @@ export default { ...@@ -376,7 +377,7 @@ export default {
id_card: this.form.physicalCard, id_card: this.form.physicalCard,
insurance: this.insurance, insurance: this.insurance,
cache: '1', cache: '1',
yltclb: this.selectTableArr[0].settle_type.is_mb ? '4' : '6', yltclb:this.man_name=='4'?'4': this.selectTableArr[0].settle_type.is_mb ? '4' : '6',
xzbz: this.selectTableArr[0].settle_type.is_gs ? 'D' : 'C', xzbz: this.selectTableArr[0].settle_type.is_gs ? 'D' : 'C',
card_type: '02', card_type: '02',
} }
...@@ -410,7 +411,7 @@ export default { ...@@ -410,7 +411,7 @@ export default {
is_yd: this.isYDpatint == true ? '1' : '0', is_yd: this.isYDpatint == true ? '1' : '0',
insurance: this.insurance, //this.insurance insurance: this.insurance, //this.insurance
cache: '1', cache: '1',
yltclb: this.selectTableArr[0].settle_type.is_mb ? '4' : '6', yltclb:this.man_name=='4'?'4': this.selectTableArr[0].settle_type.is_mb ? '4' : '6',
card_type: '03', card_type: '03',
qr_code: '', qr_code: '',
id_card: this.form.physicalCard, //,'370104202109020049' id_card: this.form.physicalCard, //,'370104202109020049'
...@@ -439,7 +440,7 @@ export default { ...@@ -439,7 +440,7 @@ export default {
is_yd: this.isYDpatint == true ? '1' : '0', is_yd: this.isYDpatint == true ? '1' : '0',
insurance: this.insurance, //this.insurance insurance: this.insurance, //this.insurance
cache: '1', cache: '1',
yltclb: this.selectTableArr[0].settle_type.is_mb ? '4' : '6', yltclb:this.man_name=='4'?'4': this.selectTableArr[0].settle_type.is_mb ? '4' : '6',
card_type: '01', card_type: '01',
id_card: this.patientData.id_card, id_card: this.patientData.id_card,
qr_code: this.form.physicalCard, qr_code: this.form.physicalCard,
......
...@@ -1847,18 +1847,17 @@ export default { ...@@ -1847,18 +1847,17 @@ export default {
return false return false
} }
if (this.select_type == '01') { if (this.select_type == '01') {
if (this.form.insurance_type == 'LOCAL') { // if (this.form.insurance_type == 'LOCAL') {
this.jeizhishow = true this.jeizhishow = true
const that = this const that = this
setTimeout(function () { setTimeout(function () {
that.handleSetFocusLast() that.handleSetFocusLast()
}, 300) }, 300)
// setTimeout(() => { // setTimeout(() => {
// }, 500); // }, 500);
} else { // } else {
this.qrjs() // this.qrjs()
} // }
// this.jeizhishow = true // this.jeizhishow = true
// this.yibaoshowNew=true // this.yibaoshowNew=true
} else if (this.ztvalue.value == 'SELF_PAY' || this.man_name == true) { } else if (this.ztvalue.value == 'SELF_PAY' || this.man_name == true) {
......
...@@ -550,7 +550,7 @@ ...@@ -550,7 +550,7 @@
<!-- 读卡 --> <!-- 读卡 -->
<Readcards :isOpenCarded="carddialogFormVisible" @getyibaoinfo="getyibaoinfo" @closeReadcard="closeReadcard" /> <Readcards :isOpenCarded="carddialogFormVisible" @getyibaoinfo="getyibaoinfo" @closeReadcard="closeReadcard" />
<!-- 确认结算-新-不选择卡类型 --> <!-- 确认结算-新-不选择卡类型 -->
<ReadcardsNew :isOpenCarded="yibaoshowNew" :patientcard="form" :patientData="patientData" :selectTableArr="selectTableArr" @getyibaoinfo="selectCardYiboPreselect" @close="closeSelectCard" /> <ReadcardsNew :isOpenCarded="yibaoshowNew" :man_name='man_name' :patientcard="form" :patientData="patientData" :selectTableArr="selectTableArr" @getyibaoinfo="selectCardYiboPreselect" @close="closeSelectCard" />
<invoicepost :isOpenCarded="invoicepostVisible" :patientData="invoicepostData" @success="invoicepostSuccess"></invoicepost> <invoicepost :isOpenCarded="invoicepostVisible" :patientData="invoicepostData" @success="invoicepostSuccess"></invoicepost>
<!-- loaidng 动画 --> <!-- loaidng 动画 -->
<div v-if="false" class="grey-cloth" id="loading"> <div v-if="false" class="grey-cloth" id="loading">
......
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