解决合并冲突

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/clinicmanagement/historicalPrescription/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/index.vue
@@ -112,7 +112,7 @@ import historicalPrescriptionDetail from './component/details.vue';
 import Prescription from './component/prescription.vue';
 const { proxy } = getCurrentInstance();

-const { item_type } = proxy.useDict('item_type');
+const { item_category_code } = proxy.useDict('item_category_code');
 const prescriptionNo = ref('');
 const typeDetail = ref('1');
 const purchaseinventoryList = ref([]);