Yajentine/his
2
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
王志康
2025-10-29 09:04:25 +08:00
parent 4afe0d107c d8af11412f
commit a64edace55
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openhis-ui-vue3/.env.spug
View File

@@ -1,5 +1,5 @@
# 开发环境：本地只启动前端项目，依赖开发环境（后端、APP） # 开发环境：本地只启动前端项目，依赖开发环境（后端、APP）
NODE_ENV=spug
VITE_DEV=true VITE_DEV=true

0
openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionmedicineList.vue → openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionMedicineList.vue
View File

2
openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
View File

@@ -746,7 +746,7 @@ import {
getAdviceBaseInfo, getAdviceBaseInfo,
getActivityBindDevice, getActivityBindDevice,
} from '../api'; } from '../api';
import adviceBaseList from '../advicebaselist'; import adviceBaseList from '../adviceBaseList.vue';
import { computed, getCurrentInstance, nextTick, watch } from 'vue'; import { computed, getCurrentInstance, nextTick, watch } from 'vue';
import { calculateQuantityByDays, formatNumber } from '@/utils/his'; import { calculateQuantityByDays, formatNumber } from '@/utils/his';
import OrderGroupDrawer from './orderGroupDrawer'; import OrderGroupDrawer from './orderGroupDrawer';

4
openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/applicationFormBottomBtn.vue
View File

@@ -55,10 +55,10 @@
</template> </template>
<script setup> <script setup>
import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref, computed } from 'vue'; import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref, computed } from 'vue';
import BloodTransfusion from './bloodTransfusion.vue'; import BloodTransfusion from './bloodTransfusion';
import { patientInfo } from '../../../store/patient.js'; import { patientInfo } from '../../../store/patient.js';
import Surgery from './surgery.vue'; import Surgery from './surgery.vue';
import LaboratoryTests from './LaboratoryTests.vue'; import laboratoryTests from './laboratoryTests.vue';
import MedicalExaminations from './medicalExaminations.vue'; import MedicalExaminations from './medicalExaminations.vue';
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const emits = defineEmits([]); const emits = defineEmits([]);