Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

 Conflicts:
	src/components/layoutContainer/index.vue

src/assets/styles/element-ui.scss

@@ -90,7 +90,7 @@
 }
 
 .tree-container{
-  height: calc(100vh - 185px);
+  height: calc(100vh - 218px);
   overflow: auto;
 }
 

src/components/elDialog/dialog.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog :close="close" v-bind="$attrs" v-on="$listeners" :close-on-click-modal="false">
+    <el-dialog v-bind="$attrs" v-on="$listeners" :close-on-click-modal="false" class="centerDialog">
       <slot></slot>
       <slot name="footer" class="dialog-footer"></slot>
     </el-dialog>
@@ -23,8 +23,14 @@ export default {
   },
 };
 </script>
-<style lang="scss">
+<style lang="scss" >
 .dialog-footer {
   text-align: right;
 }
 </style>
+<style lang="scss" scoped>
+  .centerDialog{
+    position: absolute;
+    top: 20%;
+  } 
+</style>

src/components/layoutContainer/index.vue

@@ -63,13 +63,15 @@ export default {
 </script>
 <style lang="scss" scoped>
 .big_box {
-  width: 100%;
+//   width: 100%;
+
   display: flex;
   .leftBar {
     min-width: 300px;
+    // overflow: scroll;
   }
   .rightBar {
-    width: 85%;
+    width: 80%;
   }
   .dragonet {
     width: 10px;

src/components/orgTree/index.vue

@@ -29,7 +29,17 @@
         @node-click="handleNodeClick"
         v-bind="$attrs"
       >
-    </el-tree>
+        <span class="custom-tree-node" slot-scope="{ node, data }">
+          <el-tooltip
+            class="item"
+            effect="light"
+            :content="node.label"
+            placement="top-start"
+          >
+            <span>{{ node.label }}</span>
+          </el-tooltip>
+        </span>
+      </el-tree>
     </div>
   </div>
 </template>
@@ -131,7 +141,7 @@ export default {
 
 <style lang="scss" scoped>
 .el-tree-ex {
-  overflow: auto;
+  // overflow: auto;
   ::v-deep .is-current > .el-tree-node__content {
     background-color: #d1e0f1 !important;
   }

src/views/system/dept/index.vue

@@ -233,7 +233,7 @@
             >
               <treeselect
                 v-model="form.parentId"
-                :options="deptOptions"
+                :options="deptOptions2"
                 :normalizer="normalizer"
                 placeholder="选择上级机构"
               />
@@ -379,6 +379,7 @@ export default {
       total: 0,
       // 机构树选项
       deptOptions: [],
+      deptOptions2: [],
       pId: 0,
       // 弹出层标题
       title: "",
@@ -520,8 +521,8 @@ export default {
     cancel() {
       this.open = false;
       this.reset();
-      this.getList();
-      this.getDeptTree();
+      // this.getList();
+      // this.getDeptTree();
     },
     // 表单重置
     reset() {
@@ -575,7 +576,7 @@ export default {
       });
       if (this.pId != -1) {
         listDeptExcludeChild(row.id).then((response) => {
-          this.deptOptions = this.handleTree(response.data, "id");
+          this.deptOptions2 = this.handleTree(response.data, "id");
         });
       }
     },
@@ -583,11 +584,12 @@ export default {
     changeSubmitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          console.log(this.form,"this.form")
           updateDept(this.form).then((response) => {
             this.$modal.msgSuccess("修改成功");
             this.open = false;
             this.getList();
-            this.getDeptTree();
+            // this.getDeptTree();
           });
         }
       });

src/views/system/user/index.vue

@@ -825,6 +825,7 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != undefined) {
+            console.log(this.form,"this.form")
             updateUser(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;