解决合并冲突

2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
--- a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/pharmacyMonthlybalance.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/pharmacyMonthlybalance.vue
@@ -296,7 +296,7 @@ function handleCurrentChange(val) {
 }
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.$download.downloadGet("report-manage/medication-device/excel-out", {
+  proxy.$download.downloadGet("/report-manage/medication-device/excel-out", {
    ...rightQueryParams.value,
  }, `config_${new Date().getTime()}.xlsx`);
 }