Commit fd5fabb2 authored by 刘怀志's avatar 刘怀志

66355 缴费管理-住院治疗缴费详情页面,押金信息标题旁边要显示住院状态

parent 0ebd05b6
...@@ -83,6 +83,7 @@ export default { ...@@ -83,6 +83,7 @@ export default {
Object.assign(this.ownerData, val.ownerData) Object.assign(this.ownerData, val.ownerData)
Object.assign(this.hospitalData, val.hospitalData) Object.assign(this.hospitalData, val.hospitalData)
console.log('settlementData', this.depositForm, this.ownerData) console.log('settlementData', this.depositForm, this.ownerData)
console.log('depositDataKKKKKKKKKKKKKKKKKKKKK', val)
this.hospitalData['depositShow'] = moneyFormat(this.hospitalData.deposit) this.hospitalData['depositShow'] = moneyFormat(this.hospitalData.deposit)
this.hospitalData['roomNoShow'] = this.hospitalData.status === '4' ? '已出院' : this.hospitalData.roomNo this.hospitalData['roomNoShow'] = this.hospitalData.status === '4' ? '已出院' : this.hospitalData.roomNo
} }
......
...@@ -677,12 +677,12 @@ export default { ...@@ -677,12 +677,12 @@ export default {
settlementData: {}, settlementData: {},
// 充值数据 // 充值数据
depositData: {}, depositData: {},
hospitalData: {},
hospitalStatusMap: { hospitalStatusMap: {
'2': '待入院', '2': '待入院',
'3': '住院中', '3': '住院中',
'4': '已出院' '4': '已出院'
}, },
hospitalStatus: '',
rowData: {}, // 列表传来的数据 rowData: {}, // 列表传来的数据
// 状态下拉框 // 状态下拉框
statusList: [{ statusList: [{
...@@ -751,9 +751,6 @@ export default { ...@@ -751,9 +751,6 @@ export default {
return item.feeItems.indexOf('住院') > -1 return item.feeItems.indexOf('住院') > -1
}) })
return temp.length > 0 return temp.length > 0
},
hospitalStatus() {
return this.hospitalStatusMap[this.hospitalData.status]
} }
}, },
created() { created() {
...@@ -782,8 +779,9 @@ export default { ...@@ -782,8 +779,9 @@ export default {
} }
hospitalGetInfoById(this.rowData.medicalRecordId).then(res => { hospitalGetInfoById(this.rowData.medicalRecordId).then(res => {
console.log('hospitalGetInfoById', res) console.log('hospitalGetInfoById', res)
this.hospitalData = res.data const hospitalData = res.data
this.depositData = { ...this.rowData, ownerData: temp, hospitalData: res.data } hospitalData['status'] = this.detailInfo.inHospitalBo.status
this.depositData = { ...this.rowData, ownerData: temp, hospitalData }
this.depositModal = true this.depositModal = true
}).catch(err => { }).catch(err => {
console.log('hospitalGetInfoByIdErr', err) console.log('hospitalGetInfoByIdErr', err)
...@@ -1025,7 +1023,9 @@ export default { ...@@ -1025,7 +1023,9 @@ export default {
}) })
} else { } else {
getRecord(this.rowData.medicalRecordId).then(response => { getRecord(this.rowData.medicalRecordId).then(response => {
console.log('getRecord', response)
this.detailInfo = { ...response.data } this.detailInfo = { ...response.data }
this.hospitalStatus = this.hospitalStatusMap[this.detailInfo.inHospitalBo.status]
this.detailInfo.petOwnerBo['cardBalanceShow'] = moneyFormat(this.detailInfo.petOwnerBo.cardBalance) this.detailInfo.petOwnerBo['cardBalanceShow'] = moneyFormat(this.detailInfo.petOwnerBo.cardBalance)
this.detailInfo['payAmountShow'] = moneyFormat(this.detailInfo.payAmount) this.detailInfo['payAmountShow'] = moneyFormat(this.detailInfo.payAmount)
}) })
......
...@@ -397,6 +397,7 @@ color: #333333;" ...@@ -397,6 +397,7 @@ color: #333333;"
<div <div
class="tip-text" class="tip-text"
>押金信息 >押金信息
<span v-show="hospitalStatus">({{ hospitalStatus }})</span>
</div> </div>
</div> </div>
<el-button <el-button
...@@ -468,6 +469,7 @@ export default { ...@@ -468,6 +469,7 @@ export default {
data() { data() {
return { return {
parentData: {}, parentData: {},
hospitalStatus: '',
// 收入类目 // 收入类目
tradeTypeMap: tradeTypeMap, tradeTypeMap: tradeTypeMap,
depositList: [], depositList: [],
...@@ -483,6 +485,11 @@ export default { ...@@ -483,6 +485,11 @@ export default {
settlementModal: false, settlementModal: false,
// 结算弹窗数据 // 结算弹窗数据
settlementData: {}, settlementData: {},
hospitalStatusMap: {
'2': '待入院',
'3': '住院中',
'4': '已出院'
},
singleData: {}, singleData: {},
// 状态下拉框 // 状态下拉框
statusList: [{ statusList: [{
...@@ -594,7 +601,9 @@ export default { ...@@ -594,7 +601,9 @@ export default {
} }
hospitalGetInfoById(rowData.medicalRecordId).then(res => { hospitalGetInfoById(rowData.medicalRecordId).then(res => {
console.log('hospitalGetInfoById', res) console.log('hospitalGetInfoById', res)
this.depositData = { ...rowData, ownerData: temp, hospitalData: res.data } const hospitalData = res.data
hospitalData['status'] = this.detailInfo.inHospitalBo.status
this.depositData = { ...rowData, ownerData: temp, hospitalData }
this.depositModal = true this.depositModal = true
}).catch(err => { }).catch(err => {
console.log('hospitalGetInfoByIdErr', err) console.log('hospitalGetInfoByIdErr', err)
...@@ -751,6 +760,7 @@ export default { ...@@ -751,6 +760,7 @@ export default {
this.singleData = { ...temp.singleData } this.singleData = { ...temp.singleData }
// this.depositList = [...temp.depositList] // this.depositList = [...temp.depositList]
this.parentData = { ...temp.parentData } this.parentData = { ...temp.parentData }
this.hospitalStatus = this.hospitalStatusMap[this.detailInfo.inHospitalBo.status]
this.singleData.standardAmountShow = moneyFormat(this.singleData.standardAmount) this.singleData.standardAmountShow = moneyFormat(this.singleData.standardAmount)
console.log('initData', this.detailInfo, this.singleData) console.log('initData', this.detailInfo, this.singleData)
this.singleData['payStatusName'] = this.showStatus(this.singleData.payStatus) this.singleData['payStatusName'] = this.showStatus(this.singleData.payStatus)
......
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