diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index cc8aed1..7de1c79 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -1,8 +1,8 @@
 <template>
   <div style="display: flex">
     <div :style="'width:' + (window.pageWidth - 200 - 120 - 70) + 'px;'">
-      <el-table :data="dataList" border height="430" row-key="id" size="small"
-        class="el-table__body-wrapper tbody" highlight-current-row @row-click="rowick" ref="dataList"
+      <el-table :data="dataList" border :height="patientRegister.prListHeight" 
+        highlight-current-row @row-click="rowick" ref="dataList" size="small"
         @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="40">
 
@@ -135,7 +135,14 @@
         "creatorId": null,
         "id": "3a0c196d-a6d0-37fe-5c32-4806bdc4530f"
         -->
-      </el-table>      
+      </el-table>
+      <!-- 给合项目  基本信息  -->
+      <el-tabs v-model="tabChoosed">
+        <!-- 给合项目 -->
+        <el-tab-pane label="已选组合项目" name="1">
+          <PatientRegisterAsbItem />
+        </el-tab-pane>
+      </el-tabs>      
     </div>
     <div style="margin-left: 10px;width:110px;">
       <div class="listBtn">
@@ -184,11 +191,13 @@ import { dddw, objCopy, arrayReduce } from "@/utlis/proFunc";
 
 import PatientRegisterEdit from "../../components/patientRegister/PatientRegisterEdit.vue";
 import Camera from "../../components/patientRegister/Camera.vue";
+import PatientRegisterAsbItem from "../../components/patientRegister/patientRegisterAsbItem.vue";
 
 export default {
   components: {
     PatientRegisterEdit,
     Camera,
+    PatientRegisterAsbItem,
   },
   data() {
     return {
@@ -196,6 +205,7 @@ export default {
       multipleSelection: [], //选中的数据列表
       dialogVisible: false,
       dialogCamera: false,
+      tabChoosed: "1",
     };
   },
 
@@ -411,7 +421,7 @@ export default {
 }
 
 .listBtn {
-  margin-top: 10px;
+  margin-top: 5px;
   text-align: center;
 }
 .btnClass{
diff --git a/src/components/patientRegister/patientRegisterAsbItem.vue b/src/components/patientRegister/patientRegisterAsbItem.vue
index 05dae19..d9facb4 100644
--- a/src/components/patientRegister/patientRegisterAsbItem.vue
+++ b/src/components/patientRegister/patientRegisterAsbItem.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <div style="display: flex">
-      <el-table :data="patientRegister.patientRegisterAbs" border height="200px" row-key="id" size="small"
-        class="el-table__body-wrapper tbody" highlight-current-row 
+      <el-table :data="patientRegister.patientRegisterAbs" border :height="patientRegister.prAsbItemHeight" 
+        size="small" highlight-current-row 
         :summary-method="getSummaries" show-summary
         ref="patientRegister.patientRegisterAbs">
         <el-table-column type="index" label="序号" width="50" />
diff --git a/src/components/patientRegister/patientRegisterQuery.vue b/src/components/patientRegister/patientRegisterQuery.vue
index 7651361..7e39d2b 100644
--- a/src/components/patientRegister/patientRegisterQuery.vue
+++ b/src/components/patientRegister/patientRegisterQuery.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="display: flex">
-    <div :style="'display: flex; flex-wrap: wrap; width:' + (window.pageWidth - 200 - 120 - 70) + 'px;'">
+    <div :style="'display: flex; flex-wrap: wrap; height:100px;width:' + (window.pageWidth - 200 - 120 - 70) + 'px;'">
       <div class="query">
         <span class="demonstration">登记日期：</span>
         <el-date-picker v-model="patientRegister.query.dateRange" type="daterange" align="right" unlink-panels
diff --git a/src/store/index.js b/src/store/index.js
index d5250f8..f8e567a 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -105,7 +105,8 @@ export default new Vuex.Store({
       }, //查询条件
       customerOrgGroup: [], //分组（针对单位）
       patientRegisterAbs: [], //人员已选组合项目
-
+      prListHeight:200,     //人员列表高度
+      prAsbItemHeight:100,  //组合项目高度
     },
 
     //体检医生诊台
diff --git a/src/views/customerOrg/patientRegister.vue b/src/views/customerOrg/patientRegister.vue
index 90d7fd6..2da74cc 100644
--- a/src/views/customerOrg/patientRegister.vue
+++ b/src/views/customerOrg/patientRegister.vue
@@ -12,14 +12,7 @@
 
           <!-- 人员列表信息  -->
           <PatientRegisterList />
-
-          <!-- 给合项目  基本信息  -->
-          <el-tabs v-model="tabChoosed">
-            <!-- 给合项目 -->
-            <el-tab-pane label="组合项目" name="1">
-              <PatientRegisterAsbItem />
-            </el-tab-pane>
-          </el-tabs>
+          
         </div>
       </div>
     </el-card>
@@ -33,18 +26,16 @@ import { tcdate } from "../../utlis/proFunc";
 import CustomerOrgTreeAll from "../../components/patientRegister/customerOrgTreeAll.vue";
 import PatientRegisterQuery from "../../components/patientRegister/patientRegisterQuery.vue";
 import PatientRegisterList from "../../components/patientRegister/PatientRegisterList.vue";
-import PatientRegisterAsbItem from "../../components/patientRegister/patientRegisterAsbItem.vue";
+
 
 export default {
   components: {
     CustomerOrgTreeAll,
     PatientRegisterQuery,
-    PatientRegisterList,
-    PatientRegisterAsbItem,
+    PatientRegisterList,    
   },
   data() {
-    return {
-      tabChoosed: "1",
+    return {      
       CustomerOrgTreeStyle:"",
       CustomerOrgRightStyle:"margin-left: 10px;",
     };
@@ -177,8 +168,9 @@ export default {
     },
 
     resize() {
+      console.log(this.window.pageHeight,this.window.pageWidth)
       let headerHeight = Number(150);
-      let orgDetailHeight = Number(200);
+      let orgDetailHeight = Number(100);
       let editHeight = Number(200);
       this.CustomerOrgTreeStyle = "overflow: scroll;border: 1px solid;width:200px; height:" + (this.window.pageHeight - headerHeight) + "px;";
       this.CustomerOrgRightStyle = "margin-left: 10px;width:" + (this.window.pageWidth - 200 - 60) + "px; height:" + (this.window.pageHeight - headerHeight) + "px;";
@@ -186,23 +178,16 @@ export default {
       this.customerOrg.orgEditStyle = 'display: flex;';
       this.customerOrg.orgDetailStyle = 'display: flex;';
       if (this.window.pageHeight < 600) {
-        this.customerOrg.orgDetailHeight = orgDetailHeight;
-        this.CustomerOrgTreeStyle = "overflow: scroll;border: 1px solid;width:200px; height:" + (orgDetailHeight*2 + Number(50)) + "px;";
-        this.customerOrg.orgEditStyle += "overflow-y: scroll;height:" + orgDetailHeight + "px;";
-        this.customerOrg.orgDetailStyle += "overflow-y: scroll;height:" + orgDetailHeight + "px;";
-      } else {
-        this.customerOrg.orgDetailHeight = orgDetailHeight + Math.floor((this.window.pageHeight - 600) * 1 / 3);
-        editHeight = this.window.pageHeight - headerHeight - this.customerOrg.orgDetailHeight - 50;
-        if (editHeight > 400) {
-          this.customerOrg.orgEditStyle += "height:" + editHeight + "px;";
-          this.customerOrg.orgDetailStyle += "height:" + this.customerOrg.orgDetailHeight + "px;";
-        } else {
-          this.customerOrg.orgEditStyle += "overflow-y: scroll;height:" + editHeight + "px;";
-          this.customerOrg.orgDetailStyle += "overflow-y: scroll;height:" + this.customerOrg.orgDetailHeight + "px;";
-        }
+        this.patientRegister.prListHeight = editHeight;
+        this.patientRegister.prAsbItemHeight = orgDetailHeight;
+
+        this.CustomerOrgTreeStyle = "overflow: scroll;border: 1px solid;width:200px; height:" + (600 - headerHeight) + "px;";
         
+      } else {
+        this.patientRegister.prListHeight = Math.floor((this.window.pageHeight - 300) * 2 / 3);
+        this.patientRegister.prAsbItemHeight = Math.floor((this.window.pageHeight - 300) * 1 / 3); 
+        console.log(this.patientRegister.prListHeight,this.patientRegister.prAsbItemHeight)
       }
-
     }
   },