提交merge1.3

This commit is contained in:
2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions

View File

@@ -22,13 +22,18 @@
<el-form-item label="姓名" prop="patientName" class="grid-item required">
<el-input v-model="formData.patientName" placeholder="请输入患者姓名" clearable />
</el-form-item>
<<<<<<< HEAD
=======
>>>>>>> v1.3
<el-form-item label="性别" prop="gender" class="grid-item required">
<el-select v-model="formData.gender" placeholder="请选择性别">
<el-option label="男" value="男" />
<el-option label="女" value="女" />
</el-select>
</el-form-item>
<<<<<<< HEAD
<el-form-item label="年龄" prop="age" class="grid-item required">
<div class="input-with-unit">
@@ -45,6 +50,24 @@
<el-input v-model="formData.bedNo" placeholder="如307-12" clearable />
</el-form-item>
=======
<el-form-item label="年龄" prop="age" class="grid-item required">
<div class="input-with-unit">
<el-input v-model.number="formData.age" placeholder="请输入年龄" clearable />
<span class="unit"></span>
</div>
</el-form-item>
<el-form-item label="科室/病区" prop="department" class="grid-item required">
<el-input v-model="formData.department" placeholder="如:内科疗区" clearable />
</el-form-item>
<el-form-item label="病房/床号" prop="bedNo" class="grid-item required">
<el-input v-model="formData.bedNo" placeholder="如307-12" clearable />
</el-form-item>
>>>>>>> v1.3
<el-form-item label="入院日期" prop="admissionDate" class="grid-item required">
<el-date-picker
v-model="formData.admissionDate"
@@ -63,11 +86,19 @@
<el-form-item label="经治医师" prop="treatingDoctor" class="grid-item required">
<el-input v-model="formData.treatingDoctor" placeholder="请输入医师姓名" clearable />
</el-form-item>
<<<<<<< HEAD
<el-form-item label="主治医师" prop="attendingDoctor" class="grid-item required">
<el-input v-model="formData.attendingDoctor" placeholder="请输入医师姓名" clearable />
</el-form-item>
=======
<el-form-item label="主治医师" prop="attendingDoctor" class="grid-item required">
<el-input v-model="formData.attendingDoctor" placeholder="请输入医师姓名" clearable />
</el-form-item>
>>>>>>> v1.3
<el-form-item label="科主任" prop="departmentHead" class="grid-item required">
<el-input v-model="formData.departmentHead" placeholder="请输入主任姓名" clearable />
</el-form-item>
@@ -77,7 +108,11 @@
<!-- 病情与诊断 -->
<section class="doc-section">
<h2 class="section-title">病情与诊断</h2>
<<<<<<< HEAD
=======
>>>>>>> v1.3
<el-form-item label="病情状况" prop="condition" class="full-width-item required">
<el-input
v-model="formData.condition"
@@ -88,7 +123,11 @@
show-word-limit
/>
</el-form-item>
<<<<<<< HEAD
=======
>>>>>>> v1.3
<div class="diagnosis-container">
<el-form-item label="中医诊断" prop="tcmDiagnosis" class="diagnosis-item">
<el-input
@@ -100,7 +139,11 @@
show-word-limit
/>
</el-form-item>
<<<<<<< HEAD
=======
>>>>>>> v1.3
<el-form-item label="西医诊断" prop="westernDiagnosis" class="diagnosis-item">
<el-input
v-model="formData.westernDiagnosis"
@@ -117,7 +160,11 @@
<!-- 治疗与检查计划 -->
<section class="doc-section">
<h2 class="section-title">治疗与检查计划</h2>
<<<<<<< HEAD
=======
>>>>>>> v1.3
<el-form-item label="治疗方案" prop="treatmentPlan" class="full-width-item required">
<el-input
v-model="formData.treatmentPlan"
@@ -128,8 +175,17 @@
show-word-limit
/>
</el-form-item>
<<<<<<< HEAD
<el-form-item label="进一步检查项目" prop="examinationItems" class="full-width-item required">
=======
<el-form-item
label="进一步检查项目"
prop="examinationItems"
class="full-width-item required"
>
>>>>>>> v1.3
<el-input
v-model="formData.examinationItems"
type="textarea"
@@ -159,38 +215,72 @@
<!-- 签署区域优化后三列自适应+细节样式 -->
<section class="doc-section">
<h2 class="section-title">签署确认</h2>
<<<<<<< HEAD
<div class="adaptive-grid signature-area" style="grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));">
=======
<div
class="adaptive-grid signature-area"
style="grid-template-columns: repeat(auto-fit, minmax(240px, 1fr))"
>
>>>>>>> v1.3
<el-form-item label="患者或家属签字" prop="patientSignature" class="grid-item required">
<el-input v-model="formData.patientSignature" placeholder="请签字" clearable />
<div class="signature-tip">请填写患者或家属签字</div>
</el-form-item>
<<<<<<< HEAD
<el-form-item label="与患者关系" prop="relationship" class="grid-item">
<el-input v-model="formData.relationship" placeholder="如:本人、配偶、子女" clearable />
</el-form-item>
=======
<el-form-item label="与患者关系" prop="relationship" class="grid-item">
<el-input
v-model="formData.relationship"
placeholder="如:本人、配偶、子女"
clearable
/>
</el-form-item>
>>>>>>> v1.3
<el-form-item label="签字日期" prop="signatureDate" class="grid-item required">
<el-date-picker
v-model="formData.signatureDate"
type="date"
placeholder="选择签字日期"
value-format="YYYY-MM-DD"
<<<<<<< HEAD
style="width: 100%;"
/>
</el-form-item>
=======
style="width: 100%"
/>
</el-form-item>
>>>>>>> v1.3
<el-form-item label="沟通医师签字" prop="doctorSignature" class="grid-item required">
<el-input v-model="formData.doctorSignature" placeholder="请签字" clearable />
<div class="signature-tip">请填写沟通医师签字</div>
</el-form-item>
<<<<<<< HEAD
=======
>>>>>>> v1.3
<el-form-item label="沟通日期" prop="communicationDate" class="grid-item required">
<el-date-picker
v-model="formData.communicationDate"
type="datetime"
placeholder="选择沟通日期时间"
value-format="YYYY-MM-DD HH:mm"
<<<<<<< HEAD
style="width: 100%;"
=======
style="width: 100%"
>>>>>>> v1.3
/>
</el-form-item>
</div>
@@ -208,13 +298,62 @@
<script setup>
import { ref, reactive, onMounted } from 'vue';
<<<<<<< HEAD
import { ElMessage, ElMessageBox, ElForm, ElFormItem, ElInput, ElSelect, ElOption, ElDatePicker, ElButton } from 'element-plus';
=======
import {
ElMessage,
ElMessageBox,
ElForm,
ElFormItem,
ElInput,
ElSelect,
ElOption,
ElDatePicker,
ElButton,
} from 'element-plus';
>>>>>>> v1.3
// 医院名称
const hospitalName = '长春市朝阳区中医院';
defineOptions({
<<<<<<< HEAD
name: 'InHospitalCommunicate'
});
=======
name: 'InHospitalCommunicate',
});
// Props与事件
const props = defineProps({
patientInfo: {
type: Object,
required: true,
},
});
// 生命周期
onMounted(() => {
if (!formData.patientName) {
formData.patientName = patient?.patientName || '';
}
if (!formData.gender) {
formData.gender = patient?.genderEnum_enumText || '';
}
if (!formData.age) {
formData.age = patient?.age || '';
}
if (!formData.hospitalNo) {
formData.hospitalNo = patient?.busNo || '';
}
if (!formData.department) {
formData.department = patient?.inHospitalOrgName || '';
}
if (!formData.bedNo) {
formData.bedNo = patient?.houseName + '-' + patient?.bedName;
}
});
const patient = props.patientInfo;
console.log('patient1111=======>', JSON.stringify(patient));
>>>>>>> v1.3
// 表单引用
const formRef = ref(null);
@@ -228,16 +367,25 @@ const formData = reactive({
department: '',
bedNo: '',
admissionDate: '',
<<<<<<< HEAD
=======
>>>>>>> v1.3
// 医疗团队
treatingDoctor: '',
attendingDoctor: '',
departmentHead: '',
<<<<<<< HEAD
=======
>>>>>>> v1.3
// 病情诊断
condition: '',
tcmDiagnosis: '',
westernDiagnosis: '',
<<<<<<< HEAD
// 治疗检查
treatmentPlan: '',
@@ -246,16 +394,31 @@ const formData = reactive({
// 风险告知
riskNotification: '',
=======
// 治疗检查
treatmentPlan: '',
examinationItems: '',
// 风险告知
riskNotification: '',
>>>>>>> v1.3
// 签署信息
patientSignature: '',
relationship: '',
signatureDate: '',
doctorSignature: '',
<<<<<<< HEAD
communicationDate: ''
=======
communicationDate: '',
>>>>>>> v1.3
});
// 表单验证规则
const rules = reactive({
<<<<<<< HEAD
hospitalNo: [
{ required: true, message: '请填写住院号', trigger: ['blur', 'submit'] }
],
@@ -311,6 +474,33 @@ const rules = reactive({
communicationDate: [
{ required: true, message: '请选择沟通日期', trigger: ['change', 'submit'] }
]
=======
hospitalNo: [{ required: true, message: '请填写住院号', trigger: ['blur', 'submit'] }],
patientName: [{ required: true, message: '请填写患者姓名', trigger: ['blur', 'submit'] }],
gender: [{ required: true, message: '请选择性别', trigger: ['change', 'submit'] }],
age: [
{ required: true, message: '请填写年龄', trigger: ['blur', 'submit'] },
{ type: 'number', min: 0, max: 150, message: '年龄需在0-150之间', trigger: ['blur', 'submit'] },
],
department: [{ required: true, message: '请填写科室/病区', trigger: ['blur', 'submit'] }],
bedNo: [{ required: true, message: '请填写病房/床号', trigger: ['blur', 'submit'] }],
admissionDate: [{ required: true, message: '请选择入院日期', trigger: ['change', 'submit'] }],
treatingDoctor: [{ required: true, message: '请填写经治医师', trigger: ['blur', 'submit'] }],
attendingDoctor: [{ required: true, message: '请填写主治医师', trigger: ['blur', 'submit'] }],
departmentHead: [{ required: true, message: '请填写科主任', trigger: ['blur', 'submit'] }],
condition: [{ required: true, message: '请描述病情状况', trigger: ['blur', 'submit'] }],
treatmentPlan: [{ required: true, message: '请填写治疗方案', trigger: ['blur', 'submit'] }],
examinationItems: [{ required: true, message: '请填写检查项目', trigger: ['blur', 'submit'] }],
riskNotification: [
{ required: true, message: '请填写风险告知内容', trigger: ['blur', 'submit'] },
],
patientSignature: [
{ required: true, message: '请填写患者或家属签字', trigger: ['blur', 'submit'] },
],
signatureDate: [{ required: true, message: '请选择签字日期', trigger: ['change', 'submit'] }],
doctorSignature: [{ required: true, message: '请填写医师签字', trigger: ['blur', 'submit'] }],
communicationDate: [{ required: true, message: '请选择沟通日期', trigger: ['change', 'submit'] }],
>>>>>>> v1.3
});
// 生命周期
@@ -322,16 +512,35 @@ onMounted(() => {
formData.communicationDate = formatDateTime(today);
});
<<<<<<< HEAD
=======
const emits = defineEmits(['submitOk']);
>>>>>>> v1.3
// 提交表单
const submit = () => {
formRef.value.validate((valid) => {
if (valid) {
ElMessage.success('记录保存成功');
console.log('表单数据:', formData);
<<<<<<< HEAD
=======
emits('submitOk', formData);
>>>>>>> v1.3
}
});
};
<<<<<<< HEAD
=======
// 表单数据赋值
const setFormData = (data) => {
if (data) {
Object.assign(formData, data);
}
};
>>>>>>> v1.3
// 打印功能
const handlePrint = () => {
formRef.value.validate((valid) => {
@@ -345,6 +554,7 @@ const handlePrint = () => {
// 重置表单
const handleReset = () => {
<<<<<<< HEAD
ElMessageBox.confirm(
'确定要重置表单吗?所有已填写内容将被清空',
'确认重置',
@@ -354,6 +564,13 @@ const handleReset = () => {
type: 'warning'
}
).then(() => {
=======
ElMessageBox.confirm('确定要重置表单吗?所有已填写内容将被清空', '确认重置', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
>>>>>>> v1.3
formRef.value.resetFields();
const today = new Date();
formData.admissionDate = formatDate(today);
@@ -379,6 +596,11 @@ const formatDateTime = (date) => {
const minute = String(date.getMinutes()).padStart(2, '0');
return `${year}-${month}-${day} ${hour}:${minute}`;
};
<<<<<<< HEAD
=======
defineExpose({ submit, setFormData });
>>>>>>> v1.3
</script>
<style scoped>
@@ -510,6 +732,7 @@ const formatDateTime = (date) => {
.medical-document {
padding: 15px;
}
<<<<<<< HEAD
.diagnosis-container {
grid-template-columns: 1fr;
@@ -523,6 +746,21 @@ const formatDateTime = (date) => {
font-size: 18px;
}
=======
.diagnosis-container {
grid-template-columns: 1fr;
}
.adaptive-grid {
grid-template-columns: 1fr;
}
.doc-title {
font-size: 18px;
}
>>>>>>> v1.3
.section-title {
font-size: 16px;
}
@@ -533,21 +771,40 @@ const formatDateTime = (date) => {
.btn-group {
display: none;
}
<<<<<<< HEAD
=======
>>>>>>> v1.3
.medical-document {
box-shadow: none;
margin: 0;
padding: 0;
}
<<<<<<< HEAD
.el-input__inner, .el-select__input, .el-textarea__inner {
=======
.el-input__inner,
.el-select__input,
.el-textarea__inner {
>>>>>>> v1.3
border: none !important;
box-shadow: none !important;
background: transparent !important;
}
<<<<<<< HEAD
=======
>>>>>>> v1.3
.el-form-item__label {
font-weight: bold !important;
}
}
</style>
<<<<<<< HEAD
</style>
=======
</style>
>>>>>>> v1.3