提交merge1.3

2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions
--- a/openhis-ui-vue3/src/views/doctorstation/components/eprescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/eprescriptionlist.vue
@@ -276,7 +276,10 @@ function getRowDisabled(row) {
 * 新增处方按钮操作
 */
 function handleAddPrescription() {
+<<<<<<< HEAD
  console.log('新增处方按钮操作 - 打开新增处方弹窗');
+=======
+>>>>>>> v1.3
  title.value = '新增处方';
  openPrescriptionDialog();
 }