Merge branch 'master' of http://ver.wh613.com:3000/shentun/peisweb

src/views/Home.vue

@@ -10,7 +10,7 @@
           <div style="margin-left: 5%">
             <el-dropdown @command="handleCommand">
               <span class="el-dropdown-link">
-                <span style="margin-top: 10px">
+                <span style="margin-top: 10px;color:#000">
                   <img
                     class="iconimg"
                     src="@/assets/images/usericon.png"
@@ -18,7 +18,7 @@
                     style="width: 20px; line-height: 150px; padding-top: 5px"
                   />
                 </span>
-                用户权限管理</span
+                用用户权限管理</span
               >
               <!-- <span>     <img src="@/assets/images/users.png" alt="" style="width:20px;height:20px"></span> -->
               <el-dropdown-menu slot="dropdown">
@@ -191,7 +191,7 @@
             </el-dropdown>
           </div>
           <!-- 体检登记 -->
-          <div class="examinationregistration" style="margin-left: 10px">
+          <div class="examinationregistration" style="margin-left: 20px">
             <el-dropdown @command="handleCommand">
               <span class="el-dropdown-link">
                 <img
@@ -709,22 +709,24 @@ export default {
 };
 </script>
 <style scoped>
-.el-dropdown{
+.el-dropdown {
   color: rgb(140, 135, 134);
 }
 .currentuser {
   width: 30px;
   height: 30px;
+
   position: absolute;
-  right:11%;
+  right: 11%;
   top: 10px;
-  background-color: #2BCA84;
+  color: #000;
+  background-color: #2bca84;
 }
 .registrationimgimges {
   width: 20px;
   height: 20px;
   position: absolute;
-  left: 0;
+  left: -15px;
   top: 15px;
 }
 .commonsettingimg {
@@ -755,7 +757,7 @@ export default {
 }
 .principalheader {
   background-color: #fff;
- opacity: 1;
+  opacity: 1;
   /* opacity: 0.8;
   opacity: 0.8; */
   color: #ccc;

src/views/user-list/OrganizationUnits.vue

@@ -229,7 +229,7 @@ export default {
               parentId: this.form.parentId,
             }).then((res) => {
               if (res.code == 0) {
-                this.$message.success("新增成功");
+                this.$message.success("新增成功11");
                 this.dialogVisible = false;
                 this.form.displayName = "";
                 this.getonorganization();
@@ -293,7 +293,7 @@ export default {
       //     this.$message.success("新增成功");
       //   });
       // });
-      console.log(data);
+
       getapi("/api/app/organization-units/by-code-all").then((res) => {
         this.treedata = res.data;
         console.log(res);
@@ -301,7 +301,11 @@ export default {
       this.selecttable = [];
       this.dialogVisible = true;
       this.title = 1;
-      this.form.parentId = "";
+      if (this.title == 1) {
+        this.form.parentId = data.parentId;
+        console.log(this.form.parentId);
+      }
+      // this.form.parentId = "";
       console.log(this.form);
       this.form.displayName = "";
     },