diff --git a/openhis-ui-vue3/package-lock.json b/openhis-ui-vue3/package-lock.json index a54415aa..feed423d 100644 --- a/openhis-ui-vue3/package-lock.json +++ b/openhis-ui-vue3/package-lock.json @@ -44,7 +44,7 @@ "sass": "1.69.5", "unplugin-auto-import": "0.17.1", "unplugin-vue-setup-extend-plus": "1.0.0", - "vite": "5.0.4", + "vite": "^5.0.4", "vite-plugin-compression": "0.5.1", "vite-plugin-svg-icons": "2.0.1" } @@ -7020,7 +7020,7 @@ }, "node_modules/vite": { "version": "5.0.4", - "resolved": "https://registry.npmmirror.com/vite/-/vite-5.0.4.tgz", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.4.tgz", "integrity": "sha512-RzAr8LSvM8lmhB4tQ5OPcBhpjOZRZjuxv9zO5UcxeoY2bd3kP3Ticd40Qma9/BqZ8JS96Ll/jeBX9u+LJZrhVg==", "dev": true, "dependencies": { @@ -12419,7 +12419,7 @@ }, "vite": { "version": "5.0.4", - "resolved": "https://registry.npmmirror.com/vite/-/vite-5.0.4.tgz", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.4.tgz", "integrity": "sha512-RzAr8LSvM8lmhB4tQ5OPcBhpjOZRZjuxv9zO5UcxeoY2bd3kP3Ticd40Qma9/BqZ8JS96Ll/jeBX9u+LJZrhVg==", "dev": true, "requires": { diff --git a/openhis-ui-vue3/package.json b/openhis-ui-vue3/package.json index 6082e8e7..8249129b 100644 --- a/openhis-ui-vue3/package.json +++ b/openhis-ui-vue3/package.json @@ -52,7 +52,7 @@ "sass": "1.69.5", "unplugin-auto-import": "0.17.1", "unplugin-vue-setup-extend-plus": "1.0.0", - "vite": "5.0.4", + "vite": "^5.0.4", "vite-plugin-compression": "0.5.1", "vite-plugin-svg-icons": "2.0.1" } diff --git a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue index 0b873763..bf135118 100644 --- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue +++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue @@ -1451,11 +1451,13 @@ function getDiagnosisInfo() { let diagnosisInfo = diagnosisList.value.filter((item) => { return item.maindiseFlag == 1; }); - diagnosisInfo.value = diagnosisInfo[0]; - conditionDefinitionId.value = diagnosisInfo[0].definitionId; - conditionId.value = diagnosisInfo[0].conditionId; - encounterDiagnosisId.value = diagnosisInfo[0].encounterDiagnosisId; - diagnosisName.value = diagnosisInfo[0].name; + if (diagnosisInfo.length > 0) { + diagnosisInfo.value = diagnosisInfo[0]; + conditionDefinitionId.value = diagnosisInfo[0].definitionId; + conditionId.value = diagnosisInfo[0].conditionId; + encounterDiagnosisId.value = diagnosisInfo[0].encounterDiagnosisId; + diagnosisName.value = diagnosisInfo[0].name; + } }); } diff --git a/openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/index.vue index c9115f97..22ddc882 100644 --- a/openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/index.vue +++ b/openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/index.vue @@ -765,10 +765,16 @@ watch( if (newVlaue) { editData.value.editRow = newVlaue?.editRow; editData.value.item = newVlaue?.item; - edit(); + // 使用nextTick确保变量初始化完成后再执行edit + nextTick(() => { + edit(); + }); } else { editData.value = {}; - show(); + // 使用nextTick确保变量初始化完成后再执行show + nextTick(() => { + show(); + }); } }, { immediate: true } @@ -1156,6 +1162,12 @@ function changeValEnd(val, index) { } // 切换仓库类型获取药房/药库/耗材库列表 function handleChangeLocationType(value) { + // 确保locationList变量已初始化 + if (!locationList) { + console.warn('locationList未初始化'); + return; + } + if (value == 16) { // 药房类型 getPharmacyList().then((res) => { diff --git a/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/inventoryReceiptDialog.vue b/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/inventoryReceiptDialog.vue index 053485d4..60b44d4b 100644 --- a/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/inventoryReceiptDialog.vue +++ b/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/inventoryReceiptDialog.vue @@ -590,6 +590,7 @@ const visible = ref(false); const row = ref({}); const rowIndex = ref(-1); const totalAmount = ref(0); +const locationList = ref([]); const props = defineProps({ practitionerListOptions: { type: Object, @@ -768,7 +769,6 @@ function handleSearch(value) { medicineSearchKey.value = value; } -const locationList = ref([]); // 选择药品 function selectRow(rowValue, index) { rowIndex.value = index;