diff --git a/src/components/patientRegister/PatientRegisterRecoverList.vue b/src/components/patientRegister/PatientRegisterRecoverList.vue
index f15a182..e7d3147 100644
--- a/src/components/patientRegister/PatientRegisterRecoverList.vue
+++ b/src/components/patientRegister/PatientRegisterRecoverList.vue
@@ -1,7 +1,9 @@
 <template>
-  <div>
-    <div style="display: flex">
-      <el-table :data="dataList" border width="100%" height="700" row-key="id" size="small"
+  <div style="display: flex">
+    <div :style="'width:' + (window.pageWidth - 200 - 120 - 70) + 'px;'">
+      <el-table :data="dataList" border width="100%" 
+        :height="window.pageHeight < 600 ? 350:window.pageHeight-250" 
+        row-key="id" size="small"
         highlight-current-row ref="dataList"
         @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="40"/>
@@ -113,16 +115,15 @@
         </el-table-column>
 
       </el-table>
-
-      <div style="margin-left: 10px">
-        <div class="listBtn">
-          <el-button type="success" class="btnClass" @click="recover">回收表单</el-button>
-        </div>
-        <div class="listBtn">
-          <el-button type="primary" class="btnClass" @click="scanRecover">扫码回收</el-button>
-        </div>        
+    </div>
+    <div style="margin-left: 10px;width:110px;">
+      <div class="listBtn">
+        <el-button type="success" class="btnClass" @click="recover">回收表单</el-button>
       </div>
-    </div> 
+      <div class="listBtn">
+        <el-button type="primary" class="btnClass" @click="scanRecover">扫码回收</el-button>
+      </div>        
+    </div>
     <el-dialog title="扫/输入条码签到" :visible.sync="dialogVisible">
       <el-form :model="form">
         <el-form-item label="条码" label-width="100px">
@@ -166,7 +167,7 @@ export default {
   //挂载完成
   mounted() { },
   computed: {
-    ...mapState(["dict", "patientRegister", "customerOrg"]),
+    ...mapState(["window","dict", "patientRegister", "customerOrg"]),
   },
   methods: {
     ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
diff --git a/src/components/patientRegister/PatientRegisterRefuseList.vue b/src/components/patientRegister/PatientRegisterRefuseList.vue
index eb4e8e7..b91591c 100644
--- a/src/components/patientRegister/PatientRegisterRefuseList.vue
+++ b/src/components/patientRegister/PatientRegisterRefuseList.vue
@@ -1,159 +1,160 @@
 <template>
-  <div>
-    <div style="display: flex">
-      <div style="width:46%;">
-        <el-table :data="dataList" border height="700" row-key="id" size="small" highlight-current-row ref="dataList"
-          @row-click="rowClick">
-          <el-table-column type="index" width="50" label="序号" />
-          <el-table-column prop="completeFlag" label="体检进度">
-            <template slot-scope="scope">
-              <div>{{ ldddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="isLock" label="锁住" width="50">
-            <template slot-scope="scope">
-              <div>{{ scope.row.isLock == "Y" ? "是" : "否" }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="customerOrgParentName" label="单位" width="180">
-            <template slot-scope="scope">
-              <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="customerOrgName" label="部门" width="180">
-            <template slot-scope="scope">
-              <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="patientName" label="姓名" />
-          <el-table-column prop="sexId" label="性别">
-            <template slot-scope="scope">
-              <div>{{ ldddw(dict.sex, "id", scope.row.sexId, "displayName") }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="age" label="年龄" />
-          <el-table-column prop="patientRegisterNo" label="条码号" width="150" />
-          <el-table-column prop="patientNo" label="档案号" />
-          <el-table-column prop="medicalTimes" label="体检次数"></el-table-column>
-          <el-table-column label="分组/套餐" width="150">
-            <template slot-scope="scope">
-              <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
-                {{ ldddw(dict.medicalPackage, "id", scope.row.medicalPackageId, "displayName") }}
-              </div>
-              <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId !== dict.personOrgId">
-                {{ ldddw(dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName") }}
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="nationId" label="民族">
-            <template slot-scope="scope">
-              <div>
-                {{ ldddw(dict.nation, "id", scope.row.nationId, "displayName") }}
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="idNo" label="身份证" width="150" />
-          <el-table-column prop="birthDate" label="出生日期" width="100">
-            <template slot-scope="scope">
-              <div v-if="scope.row.birthDate">
-                {{ lmoment(scope.row.birthDate, "yyyy-MM-DD") }}
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="email" label="邮箱" width="100" />
-          <el-table-column prop="mobileTelephone" label="手机" width="100" />
-          <el-table-column prop="telephone" label="电话" width="100" />
-          <el-table-column prop="address" label="地址" width="300" />
-          <el-table-column prop="medicalCardNo" label="体检卡号" />
-          <el-table-column prop="jobCardNo" label="工卡号" />
-          <el-table-column prop="maritalStatusId" label="婚姻状况">
-            <template slot-scope="scope">
-              <div>
-                {{ ldddw(dict.maritalStatus, "id", scope.row.maritalStatusId, "displayName") }}
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="medicalTypeId" label="体检类别">
-            <template slot-scope="scope">
-              <div v-if="scope.row.medicalTypeId !== dict.personOrgId">
-                {{ ldddw(dict.medicalType, "id", scope.row.medicalTypeId, "displayName") }}
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="personnelTypeId" label="人员类别">
-            <template slot-scope="scope">
-              <div v-if="scope.row.personnelTypeId !== dict.personOrgId">
-                {{ ldddw(dict.personnelType, "id", scope.row.personnelTypeId, "displayName") }}
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="jobPost" label="职务" />
-          <el-table-column prop="jobTitle" label="职称" />
-          <el-table-column prop="salesman" label="介绍人" />
-          <el-table-column prop="isVip" label="是否VIP">
-            <template slot-scope="scope">
-              <div>{{ scope.row.isVip == "Y" ? "是" : "否" }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="creatorName" label="登记人" />
-          <el-table-column prop="creationTime" label="登记日期" width="100">
-            <template slot-scope="scope">
-              <div>{{ lmoment(scope.row.creationTime, "yyyy-MM-DD") }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="isUpload" label="是否上传">
-            <template slot-scope="scope">
-              <div>{{ scope.row.isUpload == "Y" ? "是" : "否" }}</div>
-            </template>
-          </el-table-column>
-
-        </el-table>
-      </div>
-      <div style="width:47%;margin-left: 5px;">
-        <div style="display: flex; flex-wrap: wrap; width: 100%;">
-          <div class="query">
-            <span>条码号</span>
-            <el-input placeholder="条码号" v-model="quick.patientRegisterNo" size="small" style="width: 140px" clearable
-              @input="onQueryByPatientRegisterNo" />
-          </div>
-          <div class="query">
-            <span>档案号</span>
-            <el-input placeholder="档案号" v-model="quick.patientNo" size="small" style="width: 130px" clearable
-              @input="onQueryByPatientNo" />
-          </div>
-          <div class="query">
-            <span>姓名</span>
-            <el-input placeholder="姓名" v-model="quick.patientName" size="small" style="width: 100px" disabled />
-          </div>
+  <div style="display: flex">
+    <div :style="'width:' + Math.floor((window.pageWidth - 120 - 86)/2) + 'px;'">
+      <el-table :data="dataList" border 
+        :height="window.pageHeight < 600 ? 350:window.pageHeight-250"
+        row-key="id" size="small" highlight-current-row ref="dataList"
+        @row-click="rowClick">
+        <el-table-column type="index" width="50" label="序号" />
+        <el-table-column prop="completeFlag" label="体检进度">
+          <template slot-scope="scope">
+            <div>{{ ldddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="isLock" label="锁住" width="50">
+          <template slot-scope="scope">
+            <div>{{ scope.row.isLock == "Y" ? "是" : "否" }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="customerOrgParentName" label="单位" width="180">
+          <template slot-scope="scope">
+            <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="customerOrgName" label="部门" width="180">
+          <template slot-scope="scope">
+            <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="patientName" label="姓名" />
+        <el-table-column prop="sexId" label="性别">
+          <template slot-scope="scope">
+            <div>{{ ldddw(dict.sex, "id", scope.row.sexId, "displayName") }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="age" label="年龄" />
+        <el-table-column prop="patientRegisterNo" label="条码号" width="150" />
+        <el-table-column prop="patientNo" label="档案号" />
+        <el-table-column prop="medicalTimes" label="体检次数"></el-table-column>
+        <el-table-column label="分组/套餐" width="150">
+          <template slot-scope="scope">
+            <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
+              {{ ldddw(dict.medicalPackage, "id", scope.row.medicalPackageId, "displayName") }}
+            </div>
+            <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId !== dict.personOrgId">
+              {{ ldddw(dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="nationId" label="民族">
+          <template slot-scope="scope">
+            <div>
+              {{ ldddw(dict.nation, "id", scope.row.nationId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="idNo" label="身份证" width="150" />
+        <el-table-column prop="birthDate" label="出生日期" width="100">
+          <template slot-scope="scope">
+            <div v-if="scope.row.birthDate">
+              {{ lmoment(scope.row.birthDate, "yyyy-MM-DD") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="email" label="邮箱" width="100" />
+        <el-table-column prop="mobileTelephone" label="手机" width="100" />
+        <el-table-column prop="telephone" label="电话" width="100" />
+        <el-table-column prop="address" label="地址" width="300" />
+        <el-table-column prop="medicalCardNo" label="体检卡号" />
+        <el-table-column prop="jobCardNo" label="工卡号" />
+        <el-table-column prop="maritalStatusId" label="婚姻状况">
+          <template slot-scope="scope">
+            <div>
+              {{ ldddw(dict.maritalStatus, "id", scope.row.maritalStatusId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="medicalTypeId" label="体检类别">
+          <template slot-scope="scope">
+            <div v-if="scope.row.medicalTypeId !== dict.personOrgId">
+              {{ ldddw(dict.medicalType, "id", scope.row.medicalTypeId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="personnelTypeId" label="人员类别">
+          <template slot-scope="scope">
+            <div v-if="scope.row.personnelTypeId !== dict.personOrgId">
+              {{ ldddw(dict.personnelType, "id", scope.row.personnelTypeId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="jobPost" label="职务" />
+        <el-table-column prop="jobTitle" label="职称" />
+        <el-table-column prop="salesman" label="介绍人" />
+        <el-table-column prop="isVip" label="是否VIP">
+          <template slot-scope="scope">
+            <div>{{ scope.row.isVip == "Y" ? "是" : "否" }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="creatorName" label="登记人" />
+        <el-table-column prop="creationTime" label="登记日期" width="100">
+          <template slot-scope="scope">
+            <div>{{ lmoment(scope.row.creationTime, "yyyy-MM-DD") }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="isUpload" label="是否上传">
+          <template slot-scope="scope">
+            <div>{{ scope.row.isUpload == "Y" ? "是" : "否" }}</div>
+          </template>
+        </el-table-column>
+
+      </el-table>
+    </div>
+    <div :style="'margin-left: 5px;width:' + Math.floor((window.pageWidth - 120 - 86)/2) + 'px;'">
+      <div style="display: flex; flex-wrap: wrap;height:40px; width: 100%;">
+        <div class="query">
+          <span>条码号</span>
+          <el-input placeholder="条码号" v-model="quick.patientRegisterNo" size="small" style="width: 140px" clearable
+            @input="onQueryByPatientRegisterNo" />
         </div>
-        <el-table :data="doctorCheck.RegisterCheckList" style="width: 100%" height="660" border highlight-current-row
-          size="small" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="40" />
-          <el-table-column prop="asbitemName" label="组合项目" width="180" />
-          <el-table-column label="弃检" width="80">
-            <template slot-scope="scope">
-              <el-checkbox :value="scope.row.completeFlag == '2'"></el-checkbox>
-            </template>
-          </el-table-column>
-          <el-table-column prop="lastModifierName" label="操作员" width="100" />
-          <el-table-column prop="lastModificationTime" label="操作时间" width="180" >
-            <template slot-scope="scope">
-              <div>{{ lmoment(scope.row.lastModificationTime, "yyyy-MM-DD HH:mm:ss") }}</div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div style="margin-left: 10px;width:100px;">
-        <div class="listBtn">
-          <el-button type="success" class="btnClass" @click="resuse('2')">登记弃检</el-button>
+        <div class="query">
+          <span>档案号</span>
+          <el-input placeholder="档案号" v-model="quick.patientNo" size="small" style="width: 100px" clearable
+            @input="onQueryByPatientNo" />
         </div>
-        <div class="listBtn">
-          <el-button type="primary" class="btnClass" @click="resuse('0')">取消弃检</el-button>
+        <div class="query">
+          <span>姓名</span>
+          <el-input placeholder="姓名" v-model="quick.patientName" size="small" style="width: 100px" disabled />
         </div>
       </div>
+      <el-table :data="doctorCheck.RegisterCheckList"  
+        :height="window.pageHeight < 600 ? 310:window.pageHeight-290"
+        border highlight-current-row
+        size="small" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="40" />
+        <el-table-column prop="asbitemName" label="组合项目" width="180" />
+        <el-table-column label="弃检" width="80">
+          <template slot-scope="scope">
+            <el-checkbox :value="scope.row.completeFlag == '2'"></el-checkbox>
+          </template>
+        </el-table-column>
+        <el-table-column prop="lastModifierName" label="操作员" width="100" />
+        <el-table-column prop="lastModificationTime" label="操作时间" width="180" >
+          <template slot-scope="scope">
+            <div>{{ lmoment(scope.row.lastModificationTime, "yyyy-MM-DD HH:mm:ss") }}</div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div style="margin-left: 10px;width:110px;">
+      <div class="listBtn">
+        <el-button type="success" class="btnClass" @click="resuse('2')">登记弃检</el-button>
+      </div>
+      <div class="listBtn">
+        <el-button type="primary" class="btnClass" @click="resuse('0')">取消弃检</el-button>
+      </div>
     </div>
-
   </div>
 </template>
 <script>
@@ -189,7 +190,7 @@ export default {
   //挂载完成
   mounted() { },
   computed: {
-    ...mapState(["dict", "patientRegister", "customerOrg", "doctorCheck"]),
+    ...mapState(["window","dict", "patientRegister", "customerOrg", "doctorCheck"]),
   },
   methods: {
     ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
diff --git a/src/components/patientRegister/patientRegisterQuery.vue b/src/components/patientRegister/patientRegisterQuery.vue
index 7e39d2b..28fa355 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; height:100px;width:' + (window.pageWidth - 200 - 120 - 70) + 'px;'">
+    <div :style="'display: flex; flex-wrap: wrap; height:100px;width:' + (window.pageWidth - (orgEnable=='Y' ? 0: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
@@ -37,7 +37,7 @@
       </div>
       <div class="query">
         <el-cascader v-model="patientRegister.query.customerOrgId" :options="patientRegister.customerOrgTreeAll" 
-          :props="{checkStrictly: true,expandTrigger: 'hover',...customerOrg.treeprops,}" 
+          :props="{checkStrictly: true,expandTrigger: 'hover',...customerOrg.treeprops,}" placeholder="请选择单位"
           :show-all-levels="false" clearable :disabled="orgEnable == 'Y' ? false : true" size="small">
         </el-cascader>
         <el-checkbox v-model="patientRegister.query.customerOrgFlag">单位作为查询条件</el-checkbox>
diff --git a/src/views/customerOrg/patientRegisterRecover.vue b/src/views/customerOrg/patientRegisterRecover.vue
index d2332d9..a0689ea 100644
--- a/src/views/customerOrg/patientRegisterRecover.vue
+++ b/src/views/customerOrg/patientRegisterRecover.vue
@@ -1,23 +1,21 @@
 <template>
-  <div class="box">
-    <div style="width: 100%">
-      <el-card>
-        <div style="display: flex">
-          <!-- 单位树组件 -->
-          <div style="width: 15%; border: 1px solid">
-            <CustomerOrgTreeAll />
-          </div>
-          <div style="margin-left: 10px; width: 85%">
-            <!-- 查询条件  -->
-            <PatientRegisterQuery />
-
-            <!-- 人员列表信息  -->
-            <PatientRegisterRecoverList />
-
-          </div>
+  <div>
+    <el-card>
+      <div style="display: flex">
+        <!-- 单位树组件 -->
+        <div :style="CustomerOrgTreeStyle">
+          <CustomerOrgTreeAll />
         </div>
-      </el-card>
-    </div>
+        <div :style="CustomerOrgRightStyle">
+          <!-- 查询条件  -->
+          <PatientRegisterQuery />
+
+          <!-- 人员列表信息  -->
+          <PatientRegisterRecoverList />
+
+        </div>
+      </div>
+    </el-card>
   </div>
 </template>
 <script>
@@ -38,10 +36,14 @@ export default {
   data() {
     return {
       tabChoosed: "1",
+      CustomerOrgTreeStyle:'',
+      CustomerOrgRightStyle:'',
     };
   },
 
-  created() {},
+  created() {
+    this.resize();
+  },
 
   //挂载完成
   mounted() {
@@ -49,11 +51,24 @@ export default {
   },
 
   computed: {
-    ...mapState(["dict", "patientRegister", "customerOrg"]),
+    ...mapState(["window","dict", "patientRegister", "customerOrg"]),
   },
 
   methods: {
     ...mapActions(["getCustomerOrgGroup"]),
+
+    resize() {
+      //console.log(this.window.pageHeight,this.window.pageWidth)
+      let headerHeight = Number(150);
+
+      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;";
+  
+      if (this.window.pageHeight < 600) {
+        this.CustomerOrgTreeStyle = "overflow: scroll;border: 1px solid;width:200px; height:" + (600 - headerHeight) + "px;"; 
+      }
+    },
+
     //数据初始化
     dictInit() {
       //性别（仅档案用）
@@ -183,6 +198,17 @@ export default {
         this.getCustomerOrgGroup(newVal);
       }
     },
+
+    "window.pageHeight"(newVal, oldVal) {
+      if (newVal != oldVal) {
+        this.resize();
+      }
+    },
+    "window.pageWidth"(newVal, oldVal) {
+      if (newVal != oldVal) {
+        this.resize();
+      }
+    },
   },
 };
 </script>
diff --git a/src/views/customerOrg/patientRegisterRefuse.vue b/src/views/customerOrg/patientRegisterRefuse.vue
index aaa82c9..0165879 100644
--- a/src/views/customerOrg/patientRegisterRefuse.vue
+++ b/src/views/customerOrg/patientRegisterRefuse.vue
@@ -1,19 +1,15 @@
 <template>
-  <div class="box">
-    <div style="width: 100%">
-      <el-card>
-        <div style="display: flex">          
-          <div style="margin-left: 10px; width: 100%">
-            <!-- 查询条件  -->
-            <PatientRegisterQuery orgEnable="Y"/>
-
-            <!-- 人员列表信息  -->
-            <PatientRegisterRefuseList />
-
-          </div>
-        </div>
-      </el-card>
-    </div>
+  <div>
+    <el-card>          
+      <div style=" width: 100%">
+        <!-- 查询条件  -->
+        <PatientRegisterQuery orgEnable="Y"/>
+
+        <!-- 人员列表信息  -->
+        <PatientRegisterRefuseList />
+
+      </div>      
+    </el-card>
   </div>
 </template>
 <script>
@@ -185,7 +181,5 @@ export default {
 };
 </script>
 <style scoped>
-.box {
-  display: flex;
-}
+
 </style>