diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue
index 3d2ef6e..cc8519f 100644
--- a/src/components/doctorCheck/CheckItemList.vue
+++ b/src/components/doctorCheck/CheckItemList.vue
@@ -1,21 +1,42 @@
 <template>
   <div>
-    <el-table :data="doctorCheck.checkItemList" style="width: 100%" :height="window.pageHeight < 600
-        ? Math.floor(((420 - 40) * 3) / 5)
-        : Math.floor(((window.pageHeight - 260 - 40) * 3) / 5)
-      " :row-style="{ height: '30px' }" border @row-click="rowClick">
+    <el-table
+      :data="doctorCheck.checkItemList"
+      style="width: 100%"
+      :height="
+        window.pageHeight < 600
+          ? Math.floor(((420 - 40) * 3) / 5)
+          : Math.floor(((window.pageHeight - 260 - 40) * 3) / 5)
+      "
+      :row-style="{ height: '30px' }"
+      border
+      @row-click="rowClick"
+    >
       <el-table-column prop="itemName" label="项目" width="180" />
       <el-table-column prop="result" label="结果" width="500">
         <template slot-scope="scope">
-          <el-autocomplete style="width: 480px" class="inline-input" type="textarea"
-            v-model="doctorCheck.checkItemList[scope.$index].result" :fetch-suggestions="querySearch" placeholder="请输入结果值"
-            @select="handleSelect" :disabled="doctorCheck.RegisterCheckEdit.completeFlag == '1' ||
+          <el-autocomplete
+            style="width: 480px"
+            class="inline-input"
+            type="textarea"
+            v-model="doctorCheck.checkItemList[scope.$index].result"
+            :fetch-suggestions="querySearch"
+            placeholder="请输入结果值"
+            @select="handleSelect"
+            :disabled="
+              doctorCheck.RegisterCheckEdit.completeFlag == '1' ||
               doctorCheck.RegisterCheckEdit.completeFlag == '2'
-              " :autosize="{ minRows: 1, maxRows: 100 }" />
+            "
+            :autosize="{ minRows: 1, maxRows: 100 }"
+          />
         </template>
       </el-table-column>
       <el-table-column prop="unit" label="单位" width="80" />
-      <el-table-column prop="referenceRangeValue" label="参考范围" width="120" />
+      <el-table-column
+        prop="referenceRangeValue"
+        label="参考范围"
+        width="120"
+      />
     </el-table>
   </div>
 </template>
@@ -35,10 +56,10 @@ export default {
     };
   },
 
-  created() { },
+  created() {},
 
   //挂载完成
-  mounted() { },
+  mounted() {},
 
   computed: {
     ...mapState(["window", "dict", "doctorCheck"]),
@@ -120,6 +141,4 @@ export default {
 .el-table th.el-table__cell.is-leaf {
   padding: 0;
 }
-
-
 </style>
diff --git a/src/views/user-list/AuditLog.vue b/src/views/user-list/AuditLog.vue
index ebf432a..bd0c2a0 100644
--- a/src/views/user-list/AuditLog.vue
+++ b/src/views/user-list/AuditLog.vue
@@ -5,7 +5,7 @@
       <el-table
         :data="tableData"
         style="width: 100%; margin-top: 20px"
-        height="700"
+        :height="tableHeight"
       >
         <el-table-column prop="userName" label="用户名" width="80">
         </el-table-column>
@@ -103,6 +103,8 @@ import { dailyrecord, querylog } from "@/request/ruquset";
 export default {
   data() {
     return {
+      tableHeight: window.innerHeight - 220, //表格动态高度
+      screenHeight: window.innerHeight, //内容区域高度
       tableData: [],
       pages: {
         skipCount: 0,
@@ -116,6 +118,22 @@ export default {
   created() {
     this.cratlist();
   },
+  watch: {
+    // 监听screenHeight从而改变table的高度
+    screenHeight(val) {
+      this.screenHeight = val;
+      this.tableHeight = this.screenHeight - 220;
+    },
+  },
+  mounted() {
+    window.onresize = () => {
+      return (() => {
+        // window.innerHeight:浏览器的可用高度
+        window.screenHeight = window.innerHeight;
+        this.screenHeight = window.screenHeight;
+      })();
+    };
+  },
   methods: {
     cratlist() {
       dailyrecord(this.pages).then((res) => {
diff --git a/src/views/user-list/UserList.vue b/src/views/user-list/UserList.vue
index f9ba1f4..ddb29a2 100644
--- a/src/views/user-list/UserList.vue
+++ b/src/views/user-list/UserList.vue
@@ -2,9 +2,9 @@
   <div>
     <el-card class="orgindcard">
       <div class="publiccss">用户管理</div>
-      <el-button type="primary" @click="newlyincreased" style="margin-top: 20px"
+      <!-- <el-button type="primary" @click="newlyincreased" style="margin-top: 20px"
         >新增</el-button
-      >
+      > -->
       <el-row style="margin-top: 10px">
         <el-form ref="form" :model="form">
           <el-col :span="4">
@@ -39,7 +39,7 @@
         </el-form>
       </el-row>
       <div style="display: flex">
-        <div style="width: 10%;margin-top:30px">
+        <div style="width: 10%; margin-top: 30px">
           <el-tree
             :data="treedata"
             :props="defaultProps"
@@ -63,6 +63,7 @@
             </el-table-column>
             <el-table-column prop="surname" label="姓名" width="">
             </el-table-column>
+
             <!-- <el-table-column prop="name" label="名称" width=""> </el-table-column> -->
             <!-- <el-table-column prop="lastModificationTime" label="开始时间">
           <template slot-scope="scope">
@@ -74,14 +75,21 @@
             {{ scope.row.lastModificationTime | dateFormat }}
           </template>
         </el-table-column> -->
-            <el-table-column label="操作" width="430">
+            <el-table-column label="操作" width="480">
               <template slot-scope="scope">
-                <el-button type="primary" @click="deleates(scope.row)"
-                  >删除</el-button
+                <el-button
+                  type="primary"
+                  @click="newlyincreased"
+                  style="margin-top: 20px"
+                  >新增</el-button
                 >
                 <el-button type="primary" @click="editmony(scope.row)"
                   >编辑</el-button
                 >
+                <el-button type="primary" @click="deleates(scope.row)"
+                  >删除</el-button
+                >
+
                 <!-- <el-button type="primary" @click="binding(scope.row)"
               >绑定组织</el-button
             > -->
@@ -145,6 +153,25 @@
                       v-model="form.phoneNumber"
                     ></el-input> </el-form-item
                 ></el-col>
+                <el-col :span="12">
+                  <el-form-item label="组织架构">
+                    <div style="margin-top: -30px">
+                      当前选中的组织<span> {{ orgIds }}</span>
+                    </div>
+                    <el-cascader
+                      v-model="orgId"
+                      :options="organizationalstructure"
+                      :show-all-levels="false"
+                      @change="cascaderchang"
+                      :props="{
+                        label: 'displayName',
+                        children: 'treeChildren',
+                        checkStrictly: true,
+                        value: 'id',
+                      }"
+                    ></el-cascader>
+                  </el-form-item>
+                </el-col>
                 <!-- <el-col :span="12">
                   <el-form-item label="邮箱" >
                     <el-input v-model="form.email"></el-input> </el-form-item
@@ -196,9 +223,9 @@
               </el-checkbox>
             </el-checkbox-group>
           </el-tab-pane>
-          <el-tab-pane label="组织架构">
-            <!-- :default-checked-keys="defaultKeys" -->
-            <!-- <el-tree
+          <!-- <el-tab-pane label="组织架构"> -->
+          <!-- :default-checked-keys="defaultKeys" -->
+          <!-- <el-tree
               :props="{
                 label: 'displayName',
                 children: 'treeChildren',
@@ -212,22 +239,23 @@
               ref="trees"
             >
             </el-tree> -->
-            <div>
-              当前选中的组织<span> {{ orgId }}</span>
+          <!-- <div>
+              当前选中的组织<span> {{ orgIds }}</span>
             </div>
             <el-cascader
               v-model="orgId"
               :options="organizationalstructure"
               :show-all-levels="false"
+              @change="cascaderchang"
               :props="{
                 label: 'displayName',
                 children: 'treeChildren',
                 checkStrictly: true,
                 value: 'id',
               }"
-            ></el-cascader>
-          </el-tab-pane>
-          <el-tab-pane label="科室设置1">
+            ></el-cascader> -->
+          <!-- </el-tab-pane> -->
+          <el-tab-pane label="科室操作权限">
             <el-tree
               :props="{
                 label: 'displayName',
@@ -524,7 +552,7 @@ export default {
         children: "treeChildren",
         label: "displayName",
       },
-      orgIds:[],
+      orgIds: "",
       orgId: [],
       confarmPassWord: "", //确认密码
       usersName: "", //用户名
@@ -652,6 +680,9 @@ export default {
   },
 
   methods: {
+    cascaderchang(v) {
+      console.log(v);
+    },
     gettreedata() {
       getapi("/api/app/organization-units/by-code-all").then((res) => {
         this.treedata = res.data;
@@ -659,8 +690,12 @@ export default {
       });
     },
     handleNodeClick(data) {
-      this.department=data.displayName
-      console.log(data);
+      this.department = data.displayName;
+      console.log(this.department);
+      getapi(`/api/identity/users/getlistinorganizationunit?OrganizationUnitId=${data.id}`).then(res=>{
+        console.log(res);
+        this.tableData=res.data
+      })
     },
     iscrentddepartment() {
       this.department = this.$refs.department.getCheckedKeys(true);
@@ -829,6 +864,9 @@ export default {
       this.title = 1;
       if (this.title == 1) {
         this.form = {};
+        this.orgId = this.department;
+        console.log(this.orgId);
+        console.log(this.department, "1111111111111");
       }
       getbook().then((res) => {
         //  res.data.items.forEach((element) => {
@@ -1045,9 +1083,8 @@ export default {
       });
       console.log(row);
       usersinits(row.id).then((res) => {
-        this.orgId = res.data[0].displayName;
-        console.log(this.orgId);
-        console.log("zzz这里", res);
+        this.orgId = res.data[res.data.length - 1].displayName;
+        this.orgIds = res.data[0].displayName;
         let list = res.data;
         this.defaultKeys = list.map((item) => {
           return item.id;