From 7799282b864e39b66f54469c4611e170b06f2bec Mon Sep 17 00:00:00 2001 From: wangjian963 <15215920+aprilry@user.noreply.gitee.com> Date: Thu, 30 Apr 2026 16:48:59 +0800 Subject: [PATCH] =?UTF-8?q?=20=20fix:=20=E4=BF=AE=E5=A4=8D#420=20#416=20?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E7=94=B3=E8=AF=B7=E5=8D=95=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8E=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #420: 申请单项目列表显示"售价/单位"替代数据库ID - 从priceList取售价price，从AdviceBaseDto取单位unitCode_dictText - 诊疗类项目priceList不含unitCode，须从顶层item取单位 - 同步修复检验、检查、输血、手术四个申请单 #416: 申请单弹窗布局调整 - 弹窗宽度 1000px → 1200px - transfer穿梭框面板 400px → 480px - 优化左右双栏视觉效果，减少滚动 --- .../order/applicationForm/applicationFormBottomBtn.vue | 2 +- .../components/order/applicationForm/bloodTransfusion.vue | 7 +++++-- .../components/order/applicationForm/laboratoryTests.vue | 7 +++++-- .../order/applicationForm/medicalExaminations.vue | 7 +++++-- .../home/components/order/applicationForm/surgery.vue | 7 +++++-- 5 files changed, 21 insertions(+), 9 deletions(-) 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 {