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

# Conflicts:
#	openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
This commit is contained in:
2026-05-11 09:25:32 +08:00

View File

@@ -41,9 +41,9 @@
</el-col> </el-col>
</el-row> </el-row>
<!-- 工作单位 --> <!-- 工作单位学校 -->
<el-row :gutter="16" class="form-row"> <el-row :gutter="16" class="form-row">
<el-col :span="24" class="form-item"> <el-col :span="12" class="form-item">
<span class="form-label">工作单位学校</span> <span class="form-label">工作单位学校</span>
<el-input v-model="form.workplace" class="underline-input" /> <el-input v-model="form.workplace" class="underline-input" />
</el-col> </el-col>