diff --git a/src/App.vue b/src/App.vue
index a3140d7..b17d6e4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -62,9 +62,7 @@
   color: rgb(31, 148, 96);
 }
 .elcard {
-  border-radius: 15px;
-  margin-left: -12px;
-  margin-top: -15px;
+  border-radius: 15px;  
 }
 .commonbutton {
   width: 100px;
diff --git a/src/assets/css/global_dialog.css b/src/assets/css/global_dialog.css
new file mode 100644
index 0000000..6928d33
--- /dev/null
+++ b/src/assets/css/global_dialog.css
@@ -0,0 +1,36 @@
+/* 标题间距 */
+.el-dialog__header {
+  padding: 20px 10px 10px; /*原始： 20px 20px 10px;*/
+}
+
+.el-dialog__headerbtn {
+  right: 10px; /*原始： 20px ;*/
+  /*
+  position: absolute;
+  top: 20px;  
+  padding: 0;
+  background: 0 0;
+  border: none;
+  outline: 0;
+  cursor: pointer;
+  font-size: 16px;
+  */
+}
+
+.el-dialog__body {
+  padding: 10px 10px 20px; /*原始： 30px 20px;*/
+  /*
+  color: #606266;
+  font-size: 14px;
+  word-break: break-all;
+  */
+}
+
+
+.el-dialog__footer {
+  padding: 0px 10px 20px; /*原始： 10px 20px 20px*/
+  /*
+  text-align: right;
+  box-sizing: border-box;
+  */
+}
\ No newline at end of file
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 7d9db94..957a3c1 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -790,7 +790,7 @@ export default {
 
       let customerOrgId = this.patientRegister.query.customerOrgId;
       if (!customerOrgId) {
-        alert("请选择单位或个人");
+        this.$message.warning("请选择单位或个人");
         return;
       }
       //console.log('customerOrgId',customerOrgId)
@@ -811,7 +811,7 @@ export default {
 
     btnEdit() {
       if (!this.patientRegister.patientRegisterRd.id) {
-        alert("请选择要操作的记录");
+        this.$message.warning("请选择要操作的记录");
         return;
       }
       //this.patientRegister.patientRegisterTimes++;
@@ -824,7 +824,7 @@ export default {
     //拍照
     openCamera() {
       if (!this.patientRegister.patientRegisterId) {
-        alert("请选择要操作的记录");
+        this.$message.warning("请选择要操作的记录");
         return;
       }
       this.patientRegister.cameraVisble = true;
@@ -834,7 +834,7 @@ export default {
     // /api/app/patient-register/many?PatientRegisterIds=3a0c2cac-f44c-f407-9504-c1fc5e80a159&PatientRegisterIds=3a0c2cb3-d10c-ed70-db6a-b835e75ce641
     del() {
       if (this.multipleSelection.length < 1) {
-        alert("请先勾选要操作的记录");
+        this.$message.warning("请先勾选要操作的记录");
         return;
       }
       let patientRegisterIds = [];
@@ -869,7 +869,7 @@ export default {
     //单个删除方式
     delBak() {
       if (!this.patientRegister.patientRegisterId) {
-        alert("请选择要操作的记录");
+        this.$message.warning("请选择要操作的记录");
         return;
       }
 
@@ -1048,7 +1048,7 @@ export default {
     btnGroupBatch() {
       let customerOrgId = this.patientRegister.query.customerOrgId;
       if (!customerOrgId) {
-        alert("请选择单位");
+        this.$message.warning("请选择单位");
         return;
       }
       //取消勾选，换成选择的方式  start
@@ -1178,7 +1178,7 @@ export default {
     asbBatch() {
       let customerOrgId = this.patientRegister.query.customerOrgId;
       if (!customerOrgId) {
-        alert("请选择单位");
+        this.$message.warning("请选择单位");
         return;
       }
       //取消勾选，换成选择的方式  start
diff --git a/src/components/report/AsbitemOCX.vue b/src/components/report/AsbitemOCX.vue
index 926233c..795f37e 100644
--- a/src/components/report/AsbitemOCX.vue
+++ b/src/components/report/AsbitemOCX.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="display: flex;  margin-top: -30px;">
+  <div style="display: flex; ">
     <div style="width:230px;">
       <div style="display: flex;">
         <span>项目类别</span>
@@ -69,7 +69,7 @@
     <el-dialog title="体检套餐" :visible.sync="medicalPackageVisble" width="600px" height="400"
       :show-close="false" :close-on-click-modal="false" :append-to-body="true">
       <el-table :data="dict.medicalPackage" border height="350" row-key="id" size="small"
-        highlight-current-row @row-click="rowClick" @row-dblclick="rowDblclick" ref="patientList" style="margin-top: -30px;">
+        highlight-current-row @row-click="rowClick" @row-dblclick="rowDblclick" ref="patientList" >
         
         <!-- "displayName": "健康体检套餐",
         "price": 20.00,
diff --git a/src/components/report/CusOrgOCX.vue b/src/components/report/CusOrgOCX.vue
index 32a1443..54c0615 100644
--- a/src/components/report/CusOrgOCX.vue
+++ b/src/components/report/CusOrgOCX.vue
@@ -1,10 +1,10 @@
 <template>
   <div style="display: flex;">
-    <div style="width: 180px;height:520px;margin-top: -30px;overflow: scroll;border: 1px solid;">
+    <div style="width: 180px;height:520px;overflow: scroll;border: 1px solid;">
       <el-tree :data="patientRegister.customerOrgTreeAll" :props="customerOrg.treeprops" @node-click="handleNode" />
     </div>
-    <div style="display: block;width:620px;margin-top: -30px; margin-left: 5px;">
-      <el-table :data="dataCusOrgOCX" border height="450" highlight-current-row @row-dblclick="rowDblclick" size="small">
+    <div style="display: block;width:635px; margin-left: 5px;">
+      <el-table :data="dataCusOrgOCX" border height="470" highlight-current-row @row-dblclick="rowDblclick" size="small">
         <el-table-column prop="customerOrgName" label="体检单位" width="150"/>
         <el-table-column prop="customerOrgId" label="次数" width="50" align="center">
           <template slot-scope="scope">
@@ -48,7 +48,7 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="" width="30">
+        <el-table-column min-width="30" align="center">
           <template slot-scope="scope">
             <i class="el-icon-delete" @click="dataCusOrgOCX.splice(scope.$index, 1)"
               style="font-size: 20px;color: red;cursor:pointer;"></i>
@@ -389,6 +389,8 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+@import "../../assets/css/global_dialog.css";
+
 ::v-deep .el-input__inner {
   /*text-align: center;*/
   padding-left: 2px;
diff --git a/src/views/report/chargeAsbitem.vue b/src/views/report/chargeAsbitem.vue
index efd9ed5..9ad5a38 100644
--- a/src/views/report/chargeAsbitem.vue
+++ b/src/views/report/chargeAsbitem.vue
@@ -105,7 +105,7 @@
       <CusOrgOCX/>
     </el-dialog>  
     <!--通用选组合项目的控件-->
-    <el-dialog title="组合项目选择" :visible.sync="report.dialogAsbitemOCX" :close-on-click-modal="false" width="700px"
+    <el-dialog title="组合项目选择" :visible.sync="report.dialogAsbitemOCX" :close-on-click-modal="false" width="670px"
       height="600px">
       <AsbitemOCX />
     </el-dialog>
diff --git a/src/views/user-list/OrganizationUnits.vue b/src/views/user-list/OrganizationUnits.vue
index 5726e3c..520893d 100644
--- a/src/views/user-list/OrganizationUnits.vue
+++ b/src/views/user-list/OrganizationUnits.vue
@@ -1,9 +1,18 @@
 <template>
   <div>
-    <el-card style="height: 600px">
+    <el-card class="elcard">
       <!-- <el-button type="primary" @click="addorginiztiom">新增组织</el-button> -->
-      <div class="publicfontsize">科室设置</div>
-      <div class="allC">
+      <!-- <div class="publicfontsize">科室设置</div> -->
+      <div class="publiccss">科室设置</div>
+      
+      <!-- <div class="allC"> -->
+      <div
+        :style="
+          'display: flex; overflow: scroll;width:' +
+          (window.pageWidth - 85) +
+          'px; margin-top:20px;height:' + (window.pageHeight < 600 ? 410 : window.pageHeight - 190)+ 'px;'
+        "
+      >
         <!-- <i
           class="el-icon-link"
           v-if="natureoptions.length == '0' ? false : true"
@@ -74,6 +83,7 @@
           >新增组织</el-button
         > -->
       </div>
+      
       <!-- 新增组织弹框 -->
       <el-dialog
         :title="title == 2 ? '修改组织' : '新增组织'"
@@ -83,12 +93,14 @@
         :close-on-click-modal="false"
         class="el-dialog__title"
       >
+        <!--
         <div v-if="title == 2">
           当前选中的科室<span
             style="margin-left: 20px; font-size: 18px; margin-top: -20px"
             >{{ departmentnames }}</span
           >
         </div>
+        -->
         <div v-if="title == 2">
           <span>上级部门</span>
           <el-cascader
@@ -99,11 +111,12 @@
             :options="selecttable"
             :props="{
               checkStrictly: true,
+              expandTrigger: 'hover',
               children: 'treeChildren',
               label: 'displayName',
               value: 'displayName',
-            }"
-            clearable
+            }"            
+            clearable size="small"
           ></el-cascader>
           <!-- <el-tree
             :data="title == 1 ? treedata : selecttable"
@@ -149,6 +162,7 @@
   </div>
 </template>
 <script>
+import { mapState } from "vuex";
 import {
   organizationtree,
   organizationcaeatre,
@@ -156,6 +170,8 @@ import {
   modifyedit,
 } from "../../request/ruquset";
 import { postapi, putapi, getapi } from "@/api/api";
+import { tcdate, } from "../../utlis/proFunc";
+
 export default {
   data() {
     return {
@@ -191,6 +207,9 @@ export default {
   mounted() {
     this.getonorganization();
   },
+  computed: {
+    ...mapState(["window"]),
+  },
   methods: {
     checkboxchange(v) {
       if (v == true) {
@@ -211,11 +230,13 @@ export default {
       // let a=this.depref.value.togglePoppervisible()
       // console.log(a);
     },
+
     //选中的组织
-    treeclick(data) {
-      this.departmentname = data.displayName;
-      console.log(data);
-    },
+    // treeclick(data) {
+    //   this.departmentname = data.displayName;
+    //   console.log(data);
+    // },
+
     //close弹框关闭事件
     closethiebox() {
       this.departmentname = "";
@@ -409,6 +430,7 @@ export default {
       } else {
         this.departmentname = a;
       }
+
       // this.departmentname = a;
       console.log(a);
       console.log(this.departmentname);
@@ -431,11 +453,13 @@ export default {
         }
         // console.log(res,'查询');
       });
+
       getapi(
         `/api/app/organizationunit/getbycodeparent?OrganizationUnitId=${data.id}`
       ).then((res) => {
         this.selecttable = res.data;
-        console.log(res, "res");
+        tcdate(this.selecttable) 
+        console.log(res, "/api/app/organizationunit/getbycodeparent?OrganizationUnitId");
       });
       // getapi(`/api/app/organization-units?Id=${data.id}`).then((res) => {
       //   this.form = res.data;
diff --git a/src/views/user-list/UserList.vue b/src/views/user-list/UserList.vue
index 78c47c5..416d463 100644
--- a/src/views/user-list/UserList.vue
+++ b/src/views/user-list/UserList.vue
@@ -154,16 +154,19 @@
                     ></el-input> </el-form-item
                 ></el-col>
                 <el-col :span="12">
-                  <el-form-item label="组织架构">
+                  <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="{
+                        expandTrigger: 'hover',
                         label: 'displayName',
                         children: 'treeChildren',
                         checkStrictly: true,
@@ -530,6 +533,7 @@ import {
 import { mapState } from "vuex";
 import { isValid } from "@/utlis/validate";
 import { getapi, postapi } from "@/api/api";
+import { tcdate, deepCopy ,objCopy } from "../../utlis/proFunc";
 
 // let validatePassword = (rule, value, callback) => {
 //   var reg1 =
@@ -884,6 +888,7 @@ export default {
         this.newachitecture = res.data;
         this.newdepartment = res.data;
         this.organizationalstructure = res.data;
+        tcdate(this.organizationalstructure) 
         console.log(res, "1w");
       });
       console.log(this.title);
@@ -1017,7 +1022,8 @@ export default {
       // this.form.roleNames = this.roleNames;
       if (this.title == 2) {
         // row里面没有roleNames字段
-        const form = JSON.parse(JSON.stringify(row));
+        //const form = JSON.parse(JSON.stringify(row));
+        const form = deepCopy(row);
         console.log(form, "form");
         this.form = {
           ...form,
@@ -1027,6 +1033,7 @@ export default {
         //获取组织架构
         organizationtree().then((res) => {
           this.organizationalstructure = res.data;
+          tcdate(this.organizationalstructure) 
           this.setupdepartments = res.data;
           console.log(res, "sssssss");
         });