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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yangkexiang
2026-04-30 16:49:26 +08:00
parent c4a7261de0 7799282b86
commit d5d112b2cc
5 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/applicationFormBottomBtn.vue
View File

@@ -36,7 +36,7 @@
<el-dialog <el-dialog
v-model="applicationFormDialogVisible" v-model="applicationFormDialogVisible"
destroy-on-close destroy-on-close
width="1000px" width="1200px"
:close-on-click-modal="false" :close-on-click-modal="false"
:title="applicationFormTitle" :title="applicationFormTitle"
@close="closeDialog" @close="closeDialog"

7
openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/bloodTransfusion.vue
View File

@@ -121,10 +121,13 @@ const getList = () => {
if (res.code === 200) { if (res.code === 200) {
applicationListAll.value = res.data.records; applicationListAll.value = res.data.records;
applicationList.value = res.data.records.map((item) => { 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 { return {
adviceDefinitionId: item.adviceDefinitionId, adviceDefinitionId: item.adviceDefinitionId,
orgId: item.orgId, orgId: item.orgId,
label: item.adviceName + item.adviceDefinitionId, label: item.adviceName + ' (￥' + price + '/' + unit + ')',
key: item.adviceDefinitionId, key: item.adviceDefinitionId,
}; };
}); });
@@ -310,7 +313,7 @@ defineExpose({ state, submit, getLocationInfo, getDiagnosisList });
} }
.el-transfer { .el-transfer {
--el-transfer-panel-width: 400px !important; --el-transfer-panel-width: 480px !important;
} }
.bloodTransfusion-form { .bloodTransfusion-form {

7
openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue
View File

@@ -122,10 +122,13 @@ const getList = () => {
if (res.code === 200) { if (res.code === 200) {
applicationListAll.value = res.data.records; applicationListAll.value = res.data.records;
applicationList.value = res.data.records.map((item) => { 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 { return {
adviceDefinitionId: item.adviceDefinitionId, adviceDefinitionId: item.adviceDefinitionId,
orgId: item.orgId, orgId: item.orgId,
label: item.adviceName + item.adviceDefinitionId, label: item.adviceName + ' (￥' + price + '/' + unit + ')',
key: item.adviceDefinitionId, key: item.adviceDefinitionId,
}; };
}); });
@@ -312,7 +315,7 @@ defineExpose({ state, submit, getLocationInfo, getDiagnosisList });
} }
.el-transfer { .el-transfer {
--el-transfer-panel-width: 400px !important; --el-transfer-panel-width: 480px !important;
} }
.bloodTransfusion-form { .bloodTransfusion-form {

7
openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue
View File

@@ -122,10 +122,13 @@ const getList = () => {
if (res.code === 200) { if (res.code === 200) {
applicationListAll.value = res.data.records; applicationListAll.value = res.data.records;
applicationList.value = res.data.records.map((item) => { 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 { return {
adviceDefinitionId: item.adviceDefinitionId, adviceDefinitionId: item.adviceDefinitionId,
orgId: item.orgId, orgId: item.orgId,
label: item.adviceName + item.adviceDefinitionId, label: item.adviceName + ' (￥' + price + '/' + unit + ')',
key: item.adviceDefinitionId, key: item.adviceDefinitionId,
}; };
}); });
@@ -311,7 +314,7 @@ defineExpose({ state, submit, getLocationInfo, getDiagnosisList });
} }
.el-transfer { .el-transfer {
--el-transfer-panel-width: 400px !important; --el-transfer-panel-width: 480px !important;
} }
.bloodTransfusion-form { .bloodTransfusion-form {

7
openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/surgery.vue
View File

@@ -122,10 +122,13 @@ const getList = () => {
if (res.code === 200) { if (res.code === 200) {
applicationListAll.value = res.data.records; applicationListAll.value = res.data.records;
applicationList.value = res.data.records.map((item) => { 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 { return {
adviceDefinitionId: item.adviceDefinitionId, adviceDefinitionId: item.adviceDefinitionId,
orgId: item.orgId, orgId: item.orgId,
label: item.adviceName + item.adviceDefinitionId, label: item.adviceName + ' (￥' + price + '/' + unit + ')',
key: item.adviceDefinitionId, key: item.adviceDefinitionId,
}; };
}); });
@@ -312,7 +315,7 @@ defineExpose({ state, submit, getLocationInfo, getDiagnosisList });
} }
.el-transfer { .el-transfer {
--el-transfer-panel-width: 400px !important; --el-transfer-panel-width: 480px !important;
} }
.bloodTransfusion-form { .bloodTransfusion-form {