diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue
index 171b31b..4f9ee4b 100644
--- a/src/components/doctorCheck/CheckItemList.vue
+++ b/src/components/doctorCheck/CheckItemList.vue
@@ -18,17 +18,18 @@
           <el-autocomplete
             style="width: 480px"
             class="inline-input"
-            type="textarea"
+            type="textarea" 
             v-model="scope.row.result"
             :fetch-suggestions="querySearch"
             placeholder="请输入结果值"
             @select="handleSelect"
-            :disabled=" scope.row.isCalculationItem == 'Y' ||
+            :disabled="scope.row.isCalculationItem == 'Y' ||
               doctorCheck.RegisterCheckEdit.completeFlag == '1' ||
               doctorCheck.RegisterCheckEdit.completeFlag == '2'
             "
             :autosize="{ minRows: 1, maxRows: 100 }"
-          />
+            :data-ismultiline="scope.row.isMultiLine"
+          />          
         </template>
       </el-table-column>
       <el-table-column prop="unit" label="单位" width="80" />
@@ -41,8 +42,6 @@
   </div>
 </template>
 
-
-
 <script>
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
@@ -60,7 +59,9 @@ export default {
   created() {},
 
   //挂载完成
-  mounted() {},
+  mounted() {
+    // this.enterToTab();
+  },
 
   computed: {
     ...mapState(["window", "dict", "doctorCheck"]),
@@ -90,12 +91,15 @@ export default {
           console.log("checkItemList", res.data);
           if (res.code == 1) {
             this.doctorCheck.checkItemList = res.data;
+            
+            this.enterToTab();
           }
         })
         .catch((err) => {
           this.$message({ type: "error", message: `操作失败，原因：${err}` });
         });
     },
+
     querySearch(queryString, cb) {
       var restaurants = [...this.restaurants]; //[{ value: '阴性' },{ value: '阳性' }]
       restaurants.forEach((item) => {
@@ -121,6 +125,46 @@ export default {
     handleSelect(item) {
       console.log(item);
     },
+
+    //回车替代tab键
+    enterToTab() {
+      console.log('enterToTab');
+      this.$nextTick(() => {
+        let inputs = document.querySelectorAll(["textarea","input"]); //用数组可以读取多个标签的元素  //.inline-input
+        
+        // 为每个输入框添加键盘事件监听器
+        inputs.forEach((input,i) => {
+          console.log('input',input);
+          input.addEventListener('keydown', (event) => {
+            
+            // 如果按下的是回车键
+            // console.log('data-ismultiline',input.getAttribute('data-ismultiline'));
+
+            if (event.keyCode === 13 && input.getAttribute('data-ismultiline') == '0') {
+              // 阻止回车键的默认行为（换行）
+              event.preventDefault();
+              // 获取当前输入框的下一个兄弟元素
+              // let nextInput = input.nextElementSibling();
+              // console.log('nextInput',nextInput,this);
+              // // 如果存在下一个兄弟元素，将焦点移到下一个输入框
+              // if (nextInput) {
+              //   nextInput.focus();
+              // }
+              // console.log('inputs[i+1]',inputs[i+1]);              
+              // console.log('disabled',inputs[i+1].getAttribute('disabled'));
+              // console.log('class',inputs[i+1].getAttribute('class'));
+              for(let j=i+1; j<inputs.length;j++){
+                if(inputs[j].getAttribute('disabled') != "disabled" ){
+                  inputs[j].focus();
+                  break;
+                }
+              }              
+            }
+          });
+        });
+      });
+    }, 
+
   },
 
   //监听事件
@@ -149,3 +193,5 @@ export default {
   padding: 0;
 }
 </style>
+
+
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index e62aba2..1cb45e0 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -55,7 +55,7 @@
               </el-col>
               <el-col :span="3">
                 <el-form-item label="性别" prop="sexId" label-width="50px">
-                  <el-select v-model="form.sexId" placeholder="请选择" size="small"
+                  <el-select v-model="form.sexId" placeholder="请选择" size="small" filterable
                     :style="'width:' + Math.floor((window.pageWidth - 630) / 8) + 'px;'">
                     <el-option v-for="item in dict.sex" :key="item.id" :label="item.displayName" :value="item.id">
                     </el-option>
@@ -94,7 +94,7 @@
               </el-col>
               <el-col :span="3">
                 <el-form-item label="婚姻" prop="maritalStatusId" label-width="50px">
-                  <el-select class="enterToTab" v-model="form.maritalStatusId" placeholder="请选择" size="small"
+                  <el-select class="enterToTab" v-model="form.maritalStatusId" placeholder="请选择" size="small" filterable
                     :style="'width:' + Math.floor((window.pageWidth - 630) / 8) + 'px;'">
                     <el-option v-for="item in dict.maritalStatus" :key="item.id" :label="item.displayName"
                       :value="item.id">
@@ -783,7 +783,7 @@ export default {
 
   //挂载完成
   mounted() {
-    
+    this.enterToTab();
   },
 
   computed: {
@@ -1838,7 +1838,37 @@ export default {
       // let curRow = deepCopy(this.patientRegister.patientRegisterRd)
       // curRow.index = this.patientRegister.prList.length
       // this.patientRegister.prList.push(curRow)      
-    }
+    },
+
+    //回车替代tab键
+    enterToTab() {
+      this.$nextTick(() => {
+        let inputs = document.querySelectorAll("form input"); //用数组可以读取多个标签的元素  //.inline-input
+        //console.log('inputs',inputs);
+        // 为每个输入框添加键盘事件监听器
+        inputs.forEach((input,i) => {
+          
+          input.addEventListener('keydown', (event) => {
+            
+            // 如果按下的是回车键
+            // console.log('data-ismultiline',input.getAttribute('data-ismultiline'));
+
+            if (event.keyCode === 13) {
+              // 阻止回车键的默认行为（换行）
+              event.preventDefault();   
+              
+              // 跳至下一个输入框
+              for(let j=i+1; j<inputs.length;j++){
+                if(inputs[j].getAttribute('disabled') != "disabled" ){
+                  inputs[j].focus();
+                  break;
+                }
+              }              
+            }
+          });
+        });
+      });
+    }, 
 
   },
 
diff --git a/src/main.js b/src/main.js
index 0faf757..52096b1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -106,7 +106,7 @@ function onResize() {
 }
 onResize();
 
-// 监听keydown：获取键盘按住事件,code返回按住的键信息
+// 监听keydown：获取键盘按住事件,code返回按住的键信息 (为了省事放在全局，后续优化应考虑放至具体用到界面上)
 window.addEventListener('keydown', code => {  
   console.log('keydown',code)
   if (code.key == "Shift" && code.shiftKey) {
@@ -118,7 +118,7 @@ window.addEventListener('keydown', code => {
   
 });
 
-// 监听keyup：获取键盘松开事件,code返回按住的键信息
+// // 监听keyup：获取键盘松开事件,code返回按住的键信息 (为了省事放在全局，后续优化应考虑放至具体用到界面上)
 window.addEventListener('keyup', code => {
   console.log('keyup',code)  
   if (code.key == "Shift") {