提交merge1.3

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