解决合并冲突

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/earlyWarning.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/earlyWarning.vue
@@ -34,7 +34,7 @@
          style="width: 150px"
        >
          <el-option
-            v-for="categoryCode in item_type"
+            v-for="categoryCode in item_category_code"
            :key="categoryCode.value"
            :label="categoryCode.label"
            :value="categoryCode.value"
@@ -203,7 +203,7 @@ import { getExpirationWarning } from './statisticalManagent';

 const { proxy } = getCurrentInstance();

-const { item_type } = proxy.useDict('item_type');
+const { item_category_code } = proxy.useDict('item_category_code');

 const purchaseinventoryList = ref([]);
 const loading = ref(true);