diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue index 1e87feded..03d3a205d 100755 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue @@ -164,7 +164,7 @@ onMounted(() => { * type(1:watch监听类型 2:点击保存类型) * selectProjectIds(选中项目的id数组) * */ -const projectWithDepartment = (selectProjectIds, type) => { +const projectWithDepartment = (selectProjectIds) => { //1.获取选中的项目 2.判断项目的执行科室是否相同 3.判断执行科室是否配置 4.将项目的执行科室复值到执行科室下拉选位置 let isRelease = true; // 选中项目的数组 diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue index c320f833d..17f205fd2 100755 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue @@ -483,7 +483,7 @@ const submit = () => { encounterId: patientInfo.value.encounterId, organizationId: patientInfo.value.inHospitalOrgId, requestFormId: '', - name: applicationListAllFilter.map(item => item.adviceName).join('、'), + name: '检查申请单', descJson: JSON.stringify(submitForm), categoryEnum: '2', }).then((res) => { diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue index 0f1592c3e..d72431122 100755 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue @@ -801,7 +801,9 @@ function clickRowDb(row, column, event) { return; } row.showPopover = false; - // 仅”待签发(statusEnum==1)”允许编辑;”已签发(statusEnum==2)”及之后状态不允许编辑 + // 允许所有 statusEnum==1 的医嘱进入编辑: + // 1. 新医嘱(无 requestId):待保存 + // 2. 护士退回医嘱(有 requestId):退回后状态重置为 DRAFT(1),需允许医生编辑修改后重新签发 if (row.statusEnum == 1) { // 确保治疗类型为字符串,方便与单选框 label 对齐,默认为长期医嘱('1') row.therapyEnum = String(row.therapyEnum ?? '1'); diff --git a/openhis-ui-vue3/src/views/surgicalschedule/index.vue b/openhis-ui-vue3/src/views/surgicalschedule/index.vue index fc71b67a0..c2cb39e3e 100755 --- a/openhis-ui-vue3/src/views/surgicalschedule/index.vue +++ b/openhis-ui-vue3/src/views/surgicalschedule/index.vue @@ -1416,12 +1416,9 @@ function closeChargeDialog() { if (prescriptionRef.value && prescriptionRef.value.closeAllPopovers) { prescriptionRef.value.closeAllPopovers() } - // 等 Vue 完成 DOM 更新后再关闭弹窗,确保 popover 先消失 - nextTick(() => { - showChargeDialog.value = false - chargePatientInfo.value = {} - chargeSurgeryInfo.value = {} - }) + showChargeDialog.value = false + chargePatientInfo.value = {} + chargeSurgeryInfo.value = {} } // 🔧 新增:标志位,用于区分是"打开"还是"刷新"