Compare commits
15 Commits
bugfix/523
...
0daf71f07a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0daf71f07a | ||
|
|
f563713743 | ||
|
|
484c15658b | ||
| c8d729dd07 | |||
|
|
781582c9d3 | ||
|
|
85d2b9990b | ||
|
|
c2941f5948 | ||
|
|
3dfb2b8d76 | ||
|
|
4b9553323e | ||
|
|
c9a158ddee | ||
|
|
a2095775bd | ||
|
|
c6f58596c0 | ||
|
|
4492666008 | ||
|
|
884fe09706 | ||
|
|
94040e68fb |
@@ -1503,16 +1503,16 @@ function handleSaveBatch() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function setValue(row) {
|
function setValue(row) {
|
||||||
// 构造单位列表,确保 value 始终为 String 类型,避免 el-select 值类型不匹配
|
// 构造单位列表
|
||||||
unitCodeList.value = [
|
unitCodeList.value = [
|
||||||
{ value: String(row.unitCode ?? ''), label: row.unitCode_dictText, type: 'unit' },
|
{ value: row.unitCode, label: row.unitCode_dictText, type: 'unit' },
|
||||||
{
|
{
|
||||||
value: String(row.doseUnitCode ?? ''),
|
value: row.doseUnitCode,
|
||||||
label: row.doseUnitCode_dictText,
|
label: row.doseUnitCode_dictText,
|
||||||
type: 'dose',
|
type: 'dose',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
value: String(row.minUnitCode ?? ''),
|
value: row.minUnitCode,
|
||||||
label: row.minUnitCode_dictText,
|
label: row.minUnitCode_dictText,
|
||||||
type: 'minUnit',
|
type: 'minUnit',
|
||||||
},
|
},
|
||||||
@@ -1577,9 +1577,9 @@ function setValue(row) {
|
|||||||
orgName: row.adviceType != 3 ? undefined : (findOrgName(row.orgId || row.positionId || patientInfo.value?.inHospitalOrgId) || row.orgName || patientInfo.value?.inHospitalOrgName || ''),
|
orgName: row.adviceType != 3 ? undefined : (findOrgName(row.orgId || row.positionId || patientInfo.value?.inHospitalOrgId) || row.orgName || patientInfo.value?.inHospitalOrgName || ''),
|
||||||
// dose: undefined, Removed to preserve dose value from group package
|
// dose: undefined, Removed to preserve dose value from group package
|
||||||
unitCodeList: unitCodeList.value,
|
unitCodeList: unitCodeList.value,
|
||||||
doseUnitCode: String(row.doseUnitCode ?? ''),
|
doseUnitCode: row.doseUnitCode,
|
||||||
minUnitCode: String(row.minUnitCode ?? ''),
|
minUnitCode: row.minUnitCode,
|
||||||
unitCode: row.partAttributeEnum == 1 ? String(row.minUnitCode ?? '') : String(row.unitCode ?? ''),
|
unitCode: row.partAttributeEnum == 1 ? row.minUnitCode : row.unitCode,
|
||||||
categoryEnum: row.categoryCode,
|
categoryEnum: row.categoryCode,
|
||||||
definitionId: row.chargeItemDefinitionId,
|
definitionId: row.chargeItemDefinitionId,
|
||||||
executeNum: 1,
|
executeNum: 1,
|
||||||
@@ -1595,10 +1595,6 @@ function setValue(row) {
|
|||||||
? new Decimal(selectedStock.price).div(row.partPercent).toFixed(6)
|
? new Decimal(selectedStock.price).div(row.partPercent).toFixed(6)
|
||||||
: prevRow.minUnitPrice,
|
: prevRow.minUnitPrice,
|
||||||
positionName: selectedStock?.locationName,
|
positionName: selectedStock?.locationName,
|
||||||
// 🔧 Bug #523 修复:初始化 totalPrice 为 0,避免总金额列显示为横杠
|
|
||||||
totalPrice: row.quantity
|
|
||||||
? new Decimal(row.quantity).mul(selectedStock?.price ?? 0).toFixed(6)
|
|
||||||
: '0',
|
|
||||||
}
|
}
|
||||||
: {
|
: {
|
||||||
quantity: 1,
|
quantity: 1,
|
||||||
|
|||||||
@@ -1057,8 +1057,8 @@ function confirmCharge() {
|
|||||||
params.recordingDate = formData.value.recordingDate || moment(new Date()).format('YYYY-MM-DD');
|
params.recordingDate = formData.value.recordingDate || moment(new Date()).format('YYYY-MM-DD');
|
||||||
|
|
||||||
addVitalSigns(params).then(res => {
|
addVitalSigns(params).then(res => {
|
||||||
|
console.log('保存成功:', res);
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
proxy.msgSuccess('保存成功');
|
|
||||||
// 保存成功后刷新列表
|
// 保存成功后刷新列表
|
||||||
getPatientList();
|
getPatientList();
|
||||||
// 清空表单
|
// 清空表单
|
||||||
@@ -1087,6 +1087,8 @@ function confirmCharge() {
|
|||||||
urineVolume: '',
|
urineVolume: '',
|
||||||
stoolVolume: '',
|
stoolVolume: '',
|
||||||
};
|
};
|
||||||
|
// 保存成功后关闭弹窗
|
||||||
|
closeDialog();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user