diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/applicationFormBottomBtn.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/applicationFormBottomBtn.vue index 29bcaeac..82f449d8 100644 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/applicationFormBottomBtn.vue +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/applicationFormBottomBtn.vue @@ -36,7 +36,7 @@ { if (res.code === 200) { applicationListAll.value = res.data.records; applicationList.value = res.data.records.map((item) => { + const priceInfo = item.priceList?.[0] || {}; + const price = priceInfo.price != null ? Number(priceInfo.price).toFixed(2) : '0.00'; + const unit = item.unitCode_dictText || item.unitCode || ''; return { adviceDefinitionId: item.adviceDefinitionId, orgId: item.orgId, - label: item.adviceName + item.adviceDefinitionId, + label: item.adviceName + ' (¥' + price + '/' + unit + ')', key: item.adviceDefinitionId, }; }); @@ -310,7 +313,7 @@ defineExpose({ state, submit, getLocationInfo, getDiagnosisList }); } .el-transfer { - --el-transfer-panel-width: 400px !important; + --el-transfer-panel-width: 480px !important; } .bloodTransfusion-form { diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue index 8e5ebc1f..42da085f 100644 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue @@ -122,10 +122,13 @@ const getList = () => { if (res.code === 200) { applicationListAll.value = res.data.records; applicationList.value = res.data.records.map((item) => { + const priceInfo = item.priceList?.[0] || {}; + const price = priceInfo.price != null ? Number(priceInfo.price).toFixed(2) : '0.00'; + const unit = item.unitCode_dictText || item.unitCode || ''; return { adviceDefinitionId: item.adviceDefinitionId, orgId: item.orgId, - label: item.adviceName + item.adviceDefinitionId, + label: item.adviceName + ' (¥' + price + '/' + unit + ')', key: item.adviceDefinitionId, }; }); @@ -312,7 +315,7 @@ defineExpose({ state, submit, getLocationInfo, getDiagnosisList }); } .el-transfer { - --el-transfer-panel-width: 400px !important; + --el-transfer-panel-width: 480px !important; } .bloodTransfusion-form { diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue index 9004a95d..07c239bf 100644 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue @@ -122,10 +122,13 @@ const getList = () => { if (res.code === 200) { applicationListAll.value = res.data.records; applicationList.value = res.data.records.map((item) => { + const priceInfo = item.priceList?.[0] || {}; + const price = priceInfo.price != null ? Number(priceInfo.price).toFixed(2) : '0.00'; + const unit = item.unitCode_dictText || item.unitCode || ''; return { adviceDefinitionId: item.adviceDefinitionId, orgId: item.orgId, - label: item.adviceName + item.adviceDefinitionId, + label: item.adviceName + ' (¥' + price + '/' + unit + ')', key: item.adviceDefinitionId, }; }); @@ -311,7 +314,7 @@ defineExpose({ state, submit, getLocationInfo, getDiagnosisList }); } .el-transfer { - --el-transfer-panel-width: 400px !important; + --el-transfer-panel-width: 480px !important; } .bloodTransfusion-form { diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/surgery.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/surgery.vue index 887660cf..5a717052 100644 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/surgery.vue +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/surgery.vue @@ -122,10 +122,13 @@ const getList = () => { if (res.code === 200) { applicationListAll.value = res.data.records; applicationList.value = res.data.records.map((item) => { + const priceInfo = item.priceList?.[0] || {}; + const price = priceInfo.price != null ? Number(priceInfo.price).toFixed(2) : '0.00'; + const unit = item.unitCode_dictText || item.unitCode || ''; return { adviceDefinitionId: item.adviceDefinitionId, orgId: item.orgId, - label: item.adviceName + item.adviceDefinitionId, + label: item.adviceName + ' (¥' + price + '/' + unit + ')', key: item.adviceDefinitionId, }; }); @@ -312,7 +315,7 @@ defineExpose({ state, submit, getLocationInfo, getDiagnosisList }); } .el-transfer { - --el-transfer-panel-width: 400px !important; + --el-transfer-panel-width: 480px !important; } .bloodTransfusion-form {