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

2026-05-29 18:01:21 +08:00
parent b946a8a143 5c29c0f09e
commit 19233876a4
3 changed files with 22 additions and 0 deletions
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -1345,6 +1345,18 @@
            </span>
          </template>
        </el-table-column>
+        <el-table-column
+          label="退回原因"
+          align="center"
+          prop="reasonText"
+          width="160"
+        >
+          <template #default="scope">
+            <span v-if="!scope.row.isEdit" style="color: #e6a23c;">
+              {{ scope.row.reasonText || '-' }}
+            </span>
+          </template>
+        </el-table-column>
        <el-table-column
          label="诊断"
          align="center"