wangyizhe/his
3
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

解决合并冲突

Browse Source
This commit is contained in:
chenqi
2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
openhis-ui-vue3/src/views/charge/clinicrefund/index.vue
View File

@@ -322,9 +322,13 @@ function handleRefund(row) {
// }, 0);
getReturnDetail({ id: row.paymentId }).then((res) => {
if (res.data.length > 0) {
totalAmount.value = res.data.find((item) => item.payEnum === 220000).amount;
totalAmount.value =
res.data.find((item) => item.payEnum === 220000).amount -
(res.data.find((item) => item.payEnum === 220500)?.amount || 0);
}
details.value = res.data;
details.value = res.data.filter((item) => {
return item.amount > 0;
});
});
paymentId.value = row.paymentId;
patientInfo.value.patientId = row.patientId;