提交merge1.3

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

@@ -1,7 +1,14 @@
 <template>
   <div class="medical-form">
+<<<<<<< HEAD
     <h2 style="text-align: center;">{{ userStore.hospitalName || '长春市朝阳区中医院' }} -入院记录</h2>
     
+=======
+    <h2 style="text-align: center">
+      {{ userStore.hospitalName || '长春市朝阳区中医院' }} -入院记录
+    </h2>
+
+>>>>>>> v1.3
     <!-- 滚动内容区域 -->
     <div class="form-scroll-container">
       <el-form
@@ -16,6 +23,7 @@
         <h4 class="section-title">基础信息</h4>
         <div class="adaptive-grid form-section">
           <el-form-item label="姓名" prop="patientName" class="grid-item required">
+<<<<<<< HEAD
             <el-input 
               v-model="formData.patientName" 
               placeholder="请输入姓名" 
@@ -31,21 +39,35 @@
           </el-form-item>
           <el-form-item label="性别" prop="gender" class="grid-item required">
             <el-select v-model="formData.gender" placeholder="请选择" style="width: 100%;">
+=======
+            <el-input v-model="formData.patientName" placeholder="请输入姓名" clearable />
+          </el-form-item>
+          <el-form-item label="住院号" prop="hospitalNo" class="grid-item required">
+            <el-input v-model="formData.hospitalNo" placeholder="请输入住院号" clearable />
+          </el-form-item>
+          <el-form-item label="性别" prop="gender" class="grid-item required">
+            <el-select v-model="formData.gender" placeholder="请选择" style="width: 100%">
+>>>>>>> v1.3
               <el-option label="男" value="男"></el-option>
               <el-option label="女" value="女"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="年龄" prop="age" class="grid-item required">
             <div class="input-with-unit">
+<<<<<<< HEAD
               <el-input 
                 v-model.number="formData.age" 
                 placeholder="请输入年龄" 
                 clearable
               />
+=======
+              <el-input v-model.number="formData.age" placeholder="请输入年龄" clearable />
+>>>>>>> v1.3
               <span class="unit">岁</span>
             </div>
           </el-form-item>
           <el-form-item label="民族" prop="nation" class="grid-item">
+<<<<<<< HEAD
             <el-input 
               v-model="formData.nation" 
               placeholder="请输入民族" 
@@ -61,12 +83,27 @@
           </el-form-item>
           <el-form-item label="婚姻状况" prop="marriage" class="grid-item">
             <el-select v-model="formData.marriage" placeholder="请选择" clearable style="width: 100%;">
+=======
+            <el-input v-model="formData.nation" placeholder="请输入民族" clearable />
+          </el-form-item>
+          <el-form-item label="职业" prop="occupation" class="grid-item">
+            <el-input v-model="formData.occupation" placeholder="请输入职业" clearable />
+          </el-form-item>
+          <el-form-item label="婚姻状况" prop="marriage" class="grid-item">
+            <el-select
+              v-model="formData.marriage"
+              placeholder="请选择"
+              clearable
+              style="width: 100%"
+            >
+>>>>>>> v1.3
               <el-option label="已婚" value="已婚"></el-option>
               <el-option label="未婚" value="未婚"></el-option>
               <el-option label="离异" value="离异"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="出生地" prop="birthplace" class="grid-item">
+<<<<<<< HEAD
             <el-input 
               v-model="formData.birthplace" 
               placeholder="请输入出生地" 
@@ -100,6 +137,33 @@
           </el-form-item>
           <el-form-item label="可靠程度" prop="reliability" class="grid-item">
             <el-select v-model="formData.reliability" placeholder="请选择" style="width: 100%;">
+=======
+            <el-input v-model="formData.birthplace" placeholder="请输入出生地" clearable />
+          </el-form-item>
+          <el-form-item label="入院时间" prop="admissionTime" class="grid-item required">
+            <el-date-picker
+              v-model="formData.admissionTime"
+              type="datetime"
+              placeholder="选择入院时间"
+              value-format="YYYY-MM-DD HH:mm"
+              style="width: 100%"
+            />
+          </el-form-item>
+          <el-form-item label="记录时间" prop="recordTime" class="grid-item required">
+            <el-date-picker
+              v-model="formData.recordTime"
+              type="datetime"
+              placeholder="选择记录时间"
+              value-format="YYYY-MM-DD HH:mm"
+              style="width: 100%"
+            />
+          </el-form-item>
+          <el-form-item label="病史陈述者" prop="historyReporter" class="grid-item">
+            <el-input v-model="formData.historyReporter" placeholder="请输入陈述者" clearable />
+          </el-form-item>
+          <el-form-item label="可靠程度" prop="reliability" class="grid-item">
+            <el-select v-model="formData.reliability" placeholder="请选择" style="width: 100%">
+>>>>>>> v1.3
               <el-option label="可靠" value="可靠"></el-option>
               <el-option label="基本可靠" value="基本可靠"></el-option>
               <el-option label="不可靠" value="不可靠"></el-option>
@@ -111,76 +175,137 @@
         <h4 class="section-title">病史信息</h4>
         <div class="form-section">
           <el-form-item label="主诉" prop="complaint" class="history-item required">
+<<<<<<< HEAD
             <el-input 
               v-model="formData.complaint" 
               type="textarea" 
               placeholder="请输入主诉" 
+=======
+            <el-input
+              v-model="formData.complaint"
+              type="textarea"
+              placeholder="请输入主诉"
+>>>>>>> v1.3
               autosize
               maxlength="200"
               show-word-limit
             />
           </el-form-item>
+<<<<<<< HEAD
           
           <el-form-item label="现病史" prop="presentIllness" class="history-item">
             <el-input 
               v-model="formData.presentIllness" 
               type="textarea" 
               placeholder="请详细描述现病史" 
+=======
+
+          <el-form-item label="现病史" prop="presentIllness" class="history-item">
+            <el-input
+              v-model="formData.presentIllness"
+              type="textarea"
+              placeholder="请详细描述现病史"
+>>>>>>> v1.3
               autosize
               maxlength="1000"
               show-word-limit
             />
           </el-form-item>
+<<<<<<< HEAD
           
           <el-form-item label="既往史" prop="pastHistory" class="history-item">
             <el-input 
               v-model="formData.pastHistory" 
               type="textarea" 
               placeholder="请输入既往史" 
+=======
+
+          <el-form-item label="既往史" prop="pastHistory" class="history-item">
+            <el-input
+              v-model="formData.pastHistory"
+              type="textarea"
+              placeholder="请输入既往史"
+>>>>>>> v1.3
               autosize
               maxlength="800"
               show-word-limit
             />
           </el-form-item>
+<<<<<<< HEAD
           
           <el-form-item label="个人史" prop="personalHistory" class="history-item">
             <el-input 
               v-model="formData.personalHistory" 
               type="textarea" 
               placeholder="请输入个人史" 
+=======
+
+          <el-form-item label="个人史" prop="personalHistory" class="history-item">
+            <el-input
+              v-model="formData.personalHistory"
+              type="textarea"
+              placeholder="请输入个人史"
+>>>>>>> v1.3
               autosize
               maxlength="500"
               show-word-limit
             />
           </el-form-item>
+<<<<<<< HEAD
           
           <el-form-item label="婚育史" prop="maritalHistory" class="history-item">
             <el-input 
               v-model="formData.maritalHistory" 
               type="textarea" 
               placeholder="请输入婚育史" 
+=======
+
+          <el-form-item label="婚育史" prop="maritalHistory" class="history-item">
+            <el-input
+              v-model="formData.maritalHistory"
+              type="textarea"
+              placeholder="请输入婚育史"
+>>>>>>> v1.3
               autosize
               maxlength="500"
               show-word-limit
             />
           </el-form-item>
+<<<<<<< HEAD
           
           <el-form-item label="月经史" prop="menstrualHistory" class="history-item">
             <el-input 
               v-model="formData.menstrualHistory" 
               type="textarea" 
               placeholder="请输入月经史" 
+=======
+
+          <el-form-item label="月经史" prop="menstrualHistory" class="history-item">
+            <el-input
+              v-model="formData.menstrualHistory"
+              type="textarea"
+              placeholder="请输入月经史"
+>>>>>>> v1.3
               autosize
               maxlength="500"
               show-word-limit
             />
           </el-form-item>
+<<<<<<< HEAD
           
           <el-form-item label="家族史" prop="familyHistory" class="history-item">
             <el-input 
               v-model="formData.familyHistory" 
               type="textarea" 
               placeholder="请输入家族史" 
+=======
+
+          <el-form-item label="家族史" prop="familyHistory" class="history-item">
+            <el-input
+              v-model="formData.familyHistory"
+              type="textarea"
+              placeholder="请输入家族史"
+>>>>>>> v1.3
               autosize
               maxlength="500"
               show-word-limit
@@ -192,10 +317,17 @@
         <h4 class="section-title">中医望闻问切</h4>
         <div class="form-section">
           <el-form-item label="望闻问切" prop="tcmInfo" class="history-item">
+<<<<<<< HEAD
             <el-input 
               v-model="formData.tcmInfo" 
               type="textarea" 
               placeholder="请输入中医望闻问切结果" 
+=======
+            <el-input
+              v-model="formData.tcmInfo"
+              type="textarea"
+              placeholder="请输入中医望闻问切结果"
+>>>>>>> v1.3
               autosize
               maxlength="600"
               show-word-limit
@@ -209,16 +341,25 @@
           <div class="adaptive-grid">
             <el-form-item label="体温" prop="temp" class="grid-item">
               <div class="input-with-unit">
+<<<<<<< HEAD
                 <el-input 
                   v-model.number="formData.temp" 
                   type="number" 
                   step="0.1" 
                   placeholder="如36.0" 
+=======
+                <el-input
+                  v-model.number="formData.temp"
+                  type="number"
+                  step="0.1"
+                  placeholder="如36.0"
+>>>>>>> v1.3
                   clearable
                 />
                 <span class="unit">℃</span>
               </div>
             </el-form-item>
+<<<<<<< HEAD
             
             <el-form-item label="脉搏" prop="pulse" class="grid-item">
               <div class="input-with-unit">
@@ -226,11 +367,21 @@
                   v-model.number="formData.pulse" 
                   type="number" 
                   placeholder="如76" 
+=======
+
+            <el-form-item label="脉搏" prop="pulse" class="grid-item">
+              <div class="input-with-unit">
+                <el-input
+                  v-model.number="formData.pulse"
+                  type="number"
+                  placeholder="如76"
+>>>>>>> v1.3
                   clearable
                 />
                 <span class="unit">次/分</span>
               </div>
             </el-form-item>
+<<<<<<< HEAD
             
             <el-form-item label="呼吸" prop="respiration" class="grid-item">
               <div class="input-with-unit">
@@ -238,23 +389,42 @@
                   v-model.number="formData.respiration" 
                   type="number" 
                   placeholder="如16" 
+=======
+
+            <el-form-item label="呼吸" prop="respiration" class="grid-item">
+              <div class="input-with-unit">
+                <el-input
+                  v-model.number="formData.respiration"
+                  type="number"
+                  placeholder="如16"
+>>>>>>> v1.3
                   clearable
                 />
                 <span class="unit">次/分</span>
               </div>
             </el-form-item>
+<<<<<<< HEAD
             
             <el-form-item label="血压" prop="bp" class="grid-item">
               <div class="input-with-unit">
                 <el-input 
                   v-model="formData.bp" 
                   placeholder="如188/94" 
+=======
+
+            <el-form-item label="血压" prop="bp" class="grid-item">
+              <div class="input-with-unit">
+                <el-input
+                  v-model="formData.bp"
+                  placeholder="如188/94"
+>>>>>>> v1.3
                   clearable
                   @blur="validateBloodPressure"
                 />
                 <span class="unit">mmHg</span>
               </div>
             </el-form-item>
+<<<<<<< HEAD
             
             <el-form-item label="身高" prop="height" class="grid-item">
               <div class="input-with-unit">
@@ -262,11 +432,21 @@
                   v-model.number="formData.height" 
                   type="number" 
                   placeholder="如165" 
+=======
+
+            <el-form-item label="身高" prop="height" class="grid-item">
+              <div class="input-with-unit">
+                <el-input
+                  v-model.number="formData.height"
+                  type="number"
+                  placeholder="如165"
+>>>>>>> v1.3
                   clearable
                 />
                 <span class="unit">cm</span>
               </div>
             </el-form-item>
+<<<<<<< HEAD
             
             <el-form-item label="体重" prop="weight" class="grid-item">
               <div class="input-with-unit">
@@ -274,11 +454,21 @@
                   v-model.number="formData.weight" 
                   type="number" 
                   placeholder="如79" 
+=======
+
+            <el-form-item label="体重" prop="weight" class="grid-item">
+              <div class="input-with-unit">
+                <el-input
+                  v-model.number="formData.weight"
+                  type="number"
+                  placeholder="如79"
+>>>>>>> v1.3
                   clearable
                 />
                 <span class="unit">kg</span>
               </div>
             </el-form-item>
+<<<<<<< HEAD
             
             <el-form-item label="BMI" prop="bmi" class="grid-item">
               <div class="input-with-unit">
@@ -287,60 +477,109 @@
                   placeholder="如29.02" 
                   readonly
                 />
+=======
+
+            <el-form-item label="BMI" prop="bmi" class="grid-item">
+              <div class="input-with-unit">
+                <el-input v-model="formData.bmi" placeholder="如29.02" readonly />
+>>>>>>> v1.3
                 <span class="unit">kg/m²</span>
               </div>
             </el-form-item>
           </div>
 
           <el-form-item label="一般情况" prop="general" class="history-item">
+<<<<<<< HEAD
             <el-input 
               v-model="formData.general" 
               type="textarea" 
               placeholder="请输入一般情况" 
+=======
+            <el-input
+              v-model="formData.general"
+              type="textarea"
+              placeholder="请输入一般情况"
+>>>>>>> v1.3
               autosize
               maxlength="300"
               show-word-limit
             />
           </el-form-item>
+<<<<<<< HEAD
           
           <el-form-item label="皮肤粘膜" prop="skin" class="history-item">
             <el-input 
               v-model="formData.skin" 
               type="textarea" 
               placeholder="请输入皮肤粘膜情况" 
+=======
+
+          <el-form-item label="皮肤粘膜" prop="skin" class="history-item">
+            <el-input
+              v-model="formData.skin"
+              type="textarea"
+              placeholder="请输入皮肤粘膜情况"
+>>>>>>> v1.3
               autosize
               maxlength="300"
               show-word-limit
             />
           </el-form-item>
+<<<<<<< HEAD
           
           <el-form-item label="胸部（心、肺）" prop="chest" class="history-item">
             <el-input 
               v-model="formData.chest" 
               type="textarea" 
               placeholder="请输入胸部检查结果" 
+=======
+
+          <el-form-item label="胸部（心、肺）" prop="chest" class="history-item">
+            <el-input
+              v-model="formData.chest"
+              type="textarea"
+              placeholder="请输入胸部检查结果"
+>>>>>>> v1.3
               autosize
               maxlength="500"
               show-word-limit
             />
           </el-form-item>
+<<<<<<< HEAD
           
           <el-form-item label="腹部" prop="abdomen" class="history-item">
             <el-input 
               v-model="formData.abdomen" 
               type="textarea" 
               placeholder="请输入腹部检查结果" 
+=======
+
+          <el-form-item label="腹部" prop="abdomen" class="history-item">
+            <el-input
+              v-model="formData.abdomen"
+              type="textarea"
+              placeholder="请输入腹部检查结果"
+>>>>>>> v1.3
               autosize
               maxlength="500"
               show-word-limit
             />
           </el-form-item>
+<<<<<<< HEAD
           
           <el-form-item label="四肢/神经系统" prop="limbsNervous" class="history-item">
             <el-input 
               v-model="formData.limbsNervous" 
               type="textarea" 
               placeholder="请输入四肢及神经系统检查结果" 
+=======
+
+          <el-form-item label="四肢/神经系统" prop="limbsNervous" class="history-item">
+            <el-input
+              v-model="formData.limbsNervous"
+              type="textarea"
+              placeholder="请输入四肢及神经系统检查结果"
+>>>>>>> v1.3
               autosize
               maxlength="500"
               show-word-limit
@@ -352,10 +591,17 @@
         <h4 class="section-title">辅助检查</h4>
         <div class="form-section">
           <el-form-item label="检查结果" prop="auxExam" class="history-item">
+<<<<<<< HEAD
             <el-input 
               v-model="formData.auxExam" 
               type="textarea" 
               placeholder="请输入辅助检查结果" 
+=======
+            <el-input
+              v-model="formData.auxExam"
+              type="textarea"
+              placeholder="请输入辅助检查结果"
+>>>>>>> v1.3
               autosize
               maxlength="1000"
               show-word-limit
@@ -367,21 +613,37 @@
         <h4 class="section-title">初步诊断</h4>
         <div class="form-section">
           <el-form-item label="中医诊断" prop="tcmDiagnosis" class="history-item">
+<<<<<<< HEAD
             <el-input 
               v-model="formData.tcmDiagnosis" 
               type="textarea" 
               placeholder="如：胸痹心痛（气阴两虚证）" 
+=======
+            <el-input
+              v-model="formData.tcmDiagnosis"
+              type="textarea"
+              placeholder="如：胸痹心痛（气阴两虚证）"
+>>>>>>> v1.3
               autosize
               maxlength="500"
               show-word-limit
             />
           </el-form-item>
+<<<<<<< HEAD
           
           <el-form-item label="西医诊断" prop="westernDiagnosis" class="history-item">
             <el-input 
               v-model="formData.westernDiagnosis" 
               type="textarea" 
               placeholder="如：1.冠状动脉粥样硬化性心脏病" 
+=======
+
+          <el-form-item label="西医诊断" prop="westernDiagnosis" class="history-item">
+            <el-input
+              v-model="formData.westernDiagnosis"
+              type="textarea"
+              placeholder="如：1.冠状动脉粥样硬化性心脏病"
+>>>>>>> v1.3
               autosize
               maxlength="800"
               show-word-limit
@@ -391,6 +653,7 @@
 
         <!-- 7. 签名信息（三列布局） -->
         <h4 class="section-title">签名信息</h4>
+<<<<<<< HEAD
         <div class="adaptive-grid form-section" style="grid-template-columns: repeat(3, 1fr);">
           <el-form-item label="医师签名" prop="doctorSign" class="grid-item">
             <el-input 
@@ -415,6 +678,24 @@
               placeholder="选择日期" 
               value-format="YYYY-MM-DD HH:mm"
               style="width: 100%;"
+=======
+        <div class="adaptive-grid form-section" style="grid-template-columns: repeat(3, 1fr)">
+          <el-form-item label="医师签名" prop="doctorSign" class="grid-item">
+            <el-input v-model="formData.doctorSign" placeholder="请签名" clearable />
+          </el-form-item>
+
+          <el-form-item label="上级医师签名" prop="superiorSign" class="grid-item">
+            <el-input v-model="formData.superiorSign" placeholder="请签名" clearable />
+          </el-form-item>
+
+          <el-form-item label="记录日期" prop="signDate" class="grid-item">
+            <el-date-picker
+              v-model="formData.signDate"
+              type="datetime"
+              placeholder="选择日期"
+              value-format="YYYY-MM-DD HH:mm"
+              style="width: 100%"
+>>>>>>> v1.3
             />
           </el-form-item>
         </div>
@@ -426,16 +707,42 @@
       </el-form>
     </div>
   </div>
+<<<<<<< HEAD
+=======
+  <admissionRecord v-if="isShowprintDom" ref="recordPrintRef"></admissionRecord>
+>>>>>>> v1.3
 </template>
 
 <script setup>
 import { ref, reactive, watch, onMounted } from 'vue';
+<<<<<<< HEAD
 import { ElInput, ElSelect, ElOption, ElDatePicker, ElButton, ElMessage, ElMessageBox, ElForm, ElFormItem } from 'element-plus';
 import useUserStore from '../store/modules/user';
 
 defineOptions({
   name: 'InHospitalRecord',
   components: { ElInput, ElSelect, ElOption, ElDatePicker, ElButton, ElForm, ElFormItem }
+=======
+import { previewPrint } from '../utils/printUtils';
+import admissionRecord from '../views/hospitalRecord/components/admissionRecord.vue';
+import {
+  ElInput,
+  ElSelect,
+  ElOption,
+  ElDatePicker,
+  ElButton,
+  ElMessage,
+  ElMessageBox,
+  ElForm,
+  ElFormItem,
+} from 'element-plus';
+import useUserStore from '../store/modules/user';
+const isShowprintDom = ref(false);
+const recordPrintRef = ref();
+defineOptions({
+  name: 'InHospitalRecord',
+  components: { ElInput, ElSelect, ElOption, ElDatePicker, ElButton, ElForm, ElFormItem },
+>>>>>>> v1.3
 });
 
 // Props与事件
@@ -461,6 +768,7 @@ const formData = reactive({
   gender: patient?.genderEnum_enumText || '',
   age: patient?.age || '',
   nation: '',
+<<<<<<< HEAD
   occupation: '',// 职业
   marriage: '',// 婚姻状况
   birthplace: '',// 出生地
@@ -481,6 +789,28 @@ const formData = reactive({
   // 中医信息
   tcmInfo: '',
   
+=======
+  occupation: '', // 职业
+  marriage: '', // 婚姻状况
+  birthplace: '', // 出生地
+  admissionTime: '', // 入院时间
+  recordTime: '', // 记录时间
+  historyReporter: '', // 病史陈述者
+  reliability: '可靠', // 可靠程度
+  // 病史信息
+  complaint: '', // 主诉
+  presentIllness: '', // 现病史
+  pastIllness: '', // 既往史
+  personalHistory: '', // 个人史
+  allergyHistory: '', // 过敏史
+  pastHistory: '', // 既往史
+  familyHistory: '', // 家族史
+  maritalHistory: '', // 婚姻史
+  menstrualHistory: '', // 月经史
+  // 中医信息
+  tcmInfo: '',
+
+>>>>>>> v1.3
   // 体格检查
   temp: '',
   pulse: '',
@@ -494,6 +824,7 @@ const formData = reactive({
   chest: '',
   abdomen: '',
   limbsNervous: '',
+<<<<<<< HEAD
   
   // 辅助检查
   auxExam: '',
@@ -506,10 +837,25 @@ const formData = reactive({
   doctorSign: '',
   superiorSign: '',
   signDate: ''
+=======
+
+  // 辅助检查
+  auxExam: '',
+
+  // 诊断信息
+  tcmDiagnosis: '',
+  westernDiagnosis: '',
+
+  // 签名信息
+  doctorSign: '',
+  superiorSign: '',
+  signDate: '',
+>>>>>>> v1.3
 });
 
 // 表单校验规则
 const rules = reactive({
+<<<<<<< HEAD
   name: [
     { required: true, message: '请填写姓名', trigger: ['blur', 'submit'] }
   ],
@@ -532,6 +878,24 @@ const rules = reactive({
   chiefComplaint: [
     { required: true, message: '请填写主诉', trigger: ['blur', 'submit'] }
   ]
+=======
+  name: [{ required: true, message: '请填写姓名', trigger: ['blur', 'submit'] }],
+  hospitalNo: [{ required: true, message: '请填写住院号', trigger: ['blur', 'submit'] }],
+  gender: [{ required: true, message: '请选择性别', trigger: ['change', 'submit'] }],
+  age: [
+    { required: true, message: '请填写年龄', trigger: ['blur', 'submit'] },
+    {
+      type: 'number',
+      min: 1,
+      max: 120,
+      message: '年龄需在1-120岁之间',
+      trigger: ['blur', 'submit'],
+    },
+  ],
+  admissionTime: [{ required: true, message: '请选择入院时间', trigger: ['change', 'submit'] }],
+  recordTime: [{ required: true, message: '请选择记录时间', trigger: ['change', 'submit'] }],
+  chiefComplaint: [{ required: true, message: '请填写主诉', trigger: ['blur', 'submit'] }],
+>>>>>>> v1.3
 });
 
 // 生命周期
@@ -548,11 +912,19 @@ onMounted(() => {
   }
   if (!formData.patientName) {
     formData.patientName = patient?.patientName || '';
+<<<<<<< HEAD
     }
     if (!formData.gender) {
     formData.gender = patient?.genderEnum_enumText || '';
     }
     if (!formData.age) {
+=======
+  }
+  if (!formData.gender) {
+    formData.gender = patient?.genderEnum_enumText || '';
+  }
+  if (!formData.age) {
+>>>>>>> v1.3
     formData.age = patient?.age || '';
   }
   if (!formData.hospitalNo) {
@@ -571,6 +943,7 @@ watch([() => formData.height, () => formData.weight], ([newHeight, newWeight]) =
 });
 
 // 入院时间变化处理
+<<<<<<< HEAD
 watch(() => formData.admissionTime, (val) => {
   if (val && !formData.recordTime) {
     ElMessageBox.confirm(
@@ -586,6 +959,24 @@ watch(() => formData.admissionTime, (val) => {
     }).catch(() => {});
   }
 });
+=======
+watch(
+  () => formData.admissionTime,
+  (val) => {
+    if (val && !formData.recordTime) {
+      ElMessageBox.confirm('是否将记录时间同步为入院时间？', '时间同步提示', {
+        confirmButtonText: '同步',
+        cancelButtonText: '手动设置',
+        type: 'info',
+      })
+        .then(() => {
+          formData.recordTime = val;
+        })
+        .catch(() => {});
+    }
+  }
+);
+>>>>>>> v1.3
 
 // 血压格式校验
 const validateBloodPressure = () => {
@@ -607,7 +998,11 @@ const submit = () => {
         validateBloodPressure();
         if (!formData.bp) return; // 格式错误时终止提交
       }
+<<<<<<< HEAD
       
+=======
+
+>>>>>>> v1.3
       emits('submitOk', formData);
       ElMessage.success('记录保存成功！');
     }
@@ -616,6 +1011,7 @@ const submit = () => {
 
 // 新增：重置表单方法（带确认提示）
 const handleReset = () => {
+<<<<<<< HEAD
   ElMessageBox.confirm(
     '确定要重置表单吗？所有已填写内容将被清空，且不可恢复',
     '重置确认',
@@ -645,6 +1041,35 @@ const handleReset = () => {
     // 取消重置提示
     ElMessage.info('已取消表单重置');
   });
+=======
+  ElMessageBox.confirm('确定要重置表单吗？所有已填写内容将被清空，且不可恢复', '重置确认', {
+    confirmButtonText: '确认重置',
+    cancelButtonText: '取消',
+    type: 'warning',
+    center: true,
+  })
+    .then(() => {
+      // 执行表单重置
+      formRef.value.resetFields();
+      // 保留患者基础信息和默认值（避免清空关键基础数据）
+      formData.patientName = patient?.name || '';
+      formData.hospitalNo = patient?.busNo || '';
+      formData.gender = patient?.genderEnum_enumText || '';
+      formData.age = patient?.age || '';
+      formData.reliability = '可靠';
+      // 重置时间为当前时间
+      const today = new Date();
+      formData.admissionTime = formatDateTime(today);
+      formData.recordTime = formatDateTime(today);
+      formData.signDate = formatDateTime(today);
+      // 重置成功提示
+      ElMessage.success('表单已成功重置');
+    })
+    .catch(() => {
+      // 取消重置提示
+      ElMessage.info('已取消表单重置');
+    });
+>>>>>>> v1.3
 };
 
 // 表单数据赋值
@@ -664,8 +1089,26 @@ const formatDateTime = (date) => {
   return `${year}-${month}-${day} ${hour}:${minute}`;
 };
 
+<<<<<<< HEAD
 // 暴露接口
 defineExpose({ formData, submit, setFormData, handleReset });
+=======
+// 打印方法
+const printFun = () => {
+  console.log('入院记录打印');
+  isShowprintDom.value = true;
+  nextTick(() => {
+    recordPrintRef?.value.setData(formData);
+    nextTick(() => {
+      previewPrint(recordPrintRef?.value.getDom());
+      isShowprintDom.value = false;
+    });
+  });
+};
+
+// 暴露接口
+defineExpose({ formData, submit, setFormData, handleReset, printFun });
+>>>>>>> v1.3
 </script>
 
 <style scoped>
@@ -673,8 +1116,12 @@ defineExpose({ formData, submit, setFormData, handleReset });
 .medical-form {
   max-width: 1200px;
   width: 100%;
+<<<<<<< HEAD
   height: 700px;
   margin: 15px auto;
+=======
+  height: 28000px;
+>>>>>>> v1.3
   padding: 15px;
   border: 1px solid #ddd;
   border-radius: 8px;
@@ -810,7 +1257,12 @@ defineExpose({ formData, submit, setFormData, handleReset });
   .adaptive-grid {
     grid-template-columns: 1fr; /* 小屏幕下单列显示 */
   }
+<<<<<<< HEAD
   .grid-item, .history-item {
+=======
+  .grid-item,
+  .history-item {
+>>>>>>> v1.3
     margin-bottom: 10px;
   }
   /* 小屏幕按钮居中 */
@@ -825,4 +1277,8 @@ defineExpose({ formData, submit, setFormData, handleReset });
     grid-template-columns: repeat(2, 1fr); /* 中等屏幕下两列显示 */
   }
 }
-</style>
+<<<<<<< HEAD
+</style>
+=======
+</style>
+>>>>>>> v1.3