diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue index e74fd628d..61c8c958f 100755 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue @@ -1441,14 +1441,14 @@ function handleSaveBatch() { function setValue(row) { // 构造单位列表 unitCodeList.value = [ - { value: row.unitCode, label: row.unitCode_dictText, type: 'unit' }, + { value: String(row.unitCode), label: row.unitCode_dictText, type: 'unit' }, { - value: row.doseUnitCode, + value: String(row.doseUnitCode), label: row.doseUnitCode_dictText, type: 'dose', }, { - value: row.minUnitCode, + value: String(row.minUnitCode), label: row.minUnitCode_dictText, type: 'minUnit', }, @@ -1514,8 +1514,8 @@ function setValue(row) { // dose: undefined, Removed to preserve dose value from group package unitCodeList: unitCodeList.value, doseUnitCode: row.doseUnitCode, - minUnitCode: row.minUnitCode, - unitCode: row.partAttributeEnum == 1 ? row.minUnitCode : row.unitCode, + minUnitCode: String(row.minUnitCode), + unitCode: row.partAttributeEnum == 1 ? String(row.minUnitCode) : String(row.unitCode), categoryEnum: row.categoryCode, definitionId: row.chargeItemDefinitionId, executeNum: 1, @@ -1531,6 +1531,13 @@ function setValue(row) { ? new Decimal(selectedStock.price).div(row.partPercent).toFixed(6) : prevRow.minUnitPrice, positionName: selectedStock?.locationName, + totalPrice: row.quantity + ? (String(row.unitCode) == String(row.minUnitCode) + ? (row.quantity * (selectedStock + ? new Decimal(selectedStock.price).div(row.partPercent).toFixed(6) + : prevRow.minUnitPrice)).toFixed(6) + : (row.quantity * (selectedStock?.price ?? 0)).toFixed(6)) + : undefined, } : { quantity: 1,