提交merge1.3

openhis-ui-vue3/src/template/inHosptialCommunicate.vue

@@ -22,35 +22,12 @@
           <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">
-              <el-input v-model.number="formData.age" type="number" placeholder="请输入年龄" />
-              <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>
-          
-=======
 
           <el-form-item label="年龄" prop="age" class="grid-item required">
             <div class="input-with-unit">
@@ -67,7 +44,6 @@
             <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"
@@ -86,19 +62,11 @@
           <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>
@@ -108,11 +76,6 @@
       <!-- 病情与诊断 -->
       <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"
@@ -123,11 +86,6 @@
             show-word-limit
           />
         </el-form-item>
-<<<<<<< HEAD
-        
-=======
-
->>>>>>> v1.3
         <div class="diagnosis-container">
           <el-form-item label="中医诊断" prop="tcmDiagnosis" class="diagnosis-item">
             <el-input
@@ -139,11 +97,6 @@
               show-word-limit
             />
           </el-form-item>
-<<<<<<< HEAD
-          
-=======
-
->>>>>>> v1.3
           <el-form-item label="西医诊断" prop="westernDiagnosis" class="diagnosis-item">
             <el-input
               v-model="formData.westernDiagnosis"
@@ -160,11 +113,6 @@
       <!-- 治疗与检查计划 -->
       <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"
@@ -175,17 +123,12 @@
             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"
@@ -215,25 +158,14 @@
       <!-- 签署区域（优化后：三列自适应+细节样式） -->
       <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
@@ -243,44 +175,27 @@
             />
           </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>
@@ -298,9 +213,6 @@
 
 <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,
@@ -312,15 +224,10 @@ import {
   ElDatePicker,
   ElButton,
 } from 'element-plus';
->>>>>>> v1.3
 
 // 医院名称
 const hospitalName = '长春市朝阳区中医院';
 defineOptions({
-<<<<<<< HEAD
-  name: 'InHospitalCommunicate'
-});
-=======
   name: 'InHospitalCommunicate',
 });
 // Props与事件
@@ -353,7 +260,6 @@ onMounted(() => {
 });
 const patient = props.patientInfo;
 console.log('patient1111=======>', JSON.stringify(patient));
->>>>>>> v1.3
 // 表单引用
 const formRef = ref(null);
 
@@ -367,34 +273,14 @@ const formData = reactive({
   department: '',
   bedNo: '',
   admissionDate: '',
-<<<<<<< HEAD
-  
-=======
-
->>>>>>> v1.3
   // 医疗团队
   treatingDoctor: '',
   attendingDoctor: '',
   departmentHead: '',
-<<<<<<< HEAD
-  
-=======
-
->>>>>>> v1.3
   // 病情诊断
   condition: '',
   tcmDiagnosis: '',
   westernDiagnosis: '',
-<<<<<<< HEAD
-  
-  // 治疗检查
-  treatmentPlan: '',
-  examinationItems: '',
-  
-  // 风险告知
-  riskNotification: '',
-  
-=======
 
   // 治疗检查
   treatmentPlan: '',
@@ -403,78 +289,16 @@ const formData = reactive({
   // 风险告知
   riskNotification: '',
 
->>>>>>> v1.3
   // 签署信息
   patientSignature: '',
   relationship: '',
   signatureDate: '',
   doctorSignature: '',
-<<<<<<< HEAD
-  communicationDate: ''
-=======
   communicationDate: '',
->>>>>>> v1.3
 });
 
 // 表单验证规则
 const rules = reactive({
-<<<<<<< HEAD
-  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'] }
-  ]
-=======
   hospitalNo: [{ required: true, message: '请填写住院号', trigger: ['blur', 'submit'] }],
   patientName: [{ required: true, message: '请填写患者姓名', trigger: ['blur', 'submit'] }],
   gender: [{ required: true, message: '请选择性别', trigger: ['change', 'submit'] }],
@@ -500,7 +324,6 @@ const rules = reactive({
   signatureDate: [{ required: true, message: '请选择签字日期', trigger: ['change', 'submit'] }],
   doctorSignature: [{ required: true, message: '请填写医师签字', trigger: ['blur', 'submit'] }],
   communicationDate: [{ required: true, message: '请选择沟通日期', trigger: ['change', 'submit'] }],
->>>>>>> v1.3
 });
 
 // 生命周期
@@ -512,27 +335,19 @@ 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) {
@@ -540,7 +355,6 @@ const setFormData = (data) => {
   }
 };
 
->>>>>>> v1.3
 // 打印功能
 const handlePrint = () => {
   formRef.value.validate((valid) => {
@@ -554,23 +368,11 @@ const handlePrint = () => {
 
 // 重置表单
 const handleReset = () => {
-<<<<<<< HEAD
-  ElMessageBox.confirm(
-    '确定要重置表单吗？所有已填写内容将被清空',
-    '确认重置',
-    {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning'
-    }
-  ).then(() => {
-=======
   ElMessageBox.confirm('确定要重置表单吗？所有已填写内容将被清空', '确认重置', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
->>>>>>> v1.3
     formRef.value.resetFields();
     const today = new Date();
     formData.admissionDate = formatDate(today);
@@ -596,11 +398,8 @@ 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>
@@ -732,21 +531,6 @@ defineExpose({ submit, setFormData });
   .medical-document {
     padding: 15px;
   }
-<<<<<<< HEAD
-  
-  .diagnosis-container {
-    grid-template-columns: 1fr;
-  }
-  
-  .adaptive-grid {
-    grid-template-columns: 1fr;
-  }
-  
-  .doc-title {
-    font-size: 18px;
-  }
-  
-=======
 
   .diagnosis-container {
     grid-template-columns: 1fr;
@@ -760,7 +544,6 @@ defineExpose({ submit, setFormData });
     font-size: 18px;
   }
 
->>>>>>> v1.3
   .section-title {
     font-size: 16px;
   }
@@ -771,40 +554,21 @@ defineExpose({ submit, setFormData });
   .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;
   }
 }
-<<<<<<< HEAD
 </style>
-=======
-</style>
->>>>>>> v1.3