diff --git a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
index 129764da..58772e5a 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -356,265 +356,39 @@
-
-
-
-
-
-
- =
-
-
-
-
-
-
-
-
-
-
-
- {
- inputRefs[scope.$index]?.methodCode?.blur();
- }
- "
- @visible-change="
- (value) => {
- if (!value) {
- handleEnter('methodCode', scope.row, scope.$index);
- }
- }
- "
- >
- (scope.row.methodCode_dictText = dict.label)"
- @keyup="handleEnter('methodCode', scope.row, scope.$index)"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
-
-
-
- {
- inputRefs[scope.$index]?.rateCode?.blur();
- }
- "
- @change="calculateTotalAmount(scope.row, scope.$index)"
- @visible-change="
- (value) => {
- if (!value) {
- handleEnter('rateCode', scope.row, scope.$index);
- }
- // inputRefs.rateCode.blur();
- }
- "
- :ref="
- (el) => {
- if (!inputRefs[scope.$index])
- inputRefs[scope.$index] = {};
- inputRefs[scope.$index].rateCode = el;
- }
- "
- >
- (scope.row.rateCode_dictText = dict.label)"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
-
-
-
-
-
-
-
-
+
+
+
+ 确定
+
+
-
+
确定
@@ -1152,6 +926,12 @@ const adviceTypeList = ref([
},
]);
+// 根据类型值获取显示标签,避免非编辑态出现空标签
+const mapAdviceTypeLabel = (type) => {
+ const found = adviceTypeList.value.find((item) => item.value === type);
+ return found ? found.label : '';
+};
+
// 西药处方管理相关变量
const westernPrescriptions = ref([]); // 西药处方列表
const currentPrescriptionId = ref(null); // 当前活跃的处方ID
@@ -2321,6 +2101,8 @@ function handleSaveSign(row, index, prescriptionId) {
row.patientId = props.patientInfo.patientId;
row.encounterId = props.patientInfo.encounterId;
row.accountId = accountId.value;
+ // 确保非编辑态显示正确的医嘱类型标签
+ row.adviceType_dictText = mapAdviceTypeLabel(row.adviceType);
if (row.adviceType == 1 || row.adviceType == 2) {
row.minUnitQuantity =
row.minUnitCode == row.unitCode ? row.quantity : row.quantity * row.partPercent;