Merge branch 'master' of http://114.67.93.201/xulili/ybf

ybf_admin/src/pages/in/contact/mail.vue

 <template>
   <div class="mail">
     <div class="left">
-      <!-- <div class="left-c"> -->
+      <div>
         <div class="title">组织架构</div>
         <div class="bottom">
           <div class="ty">
@@ -9,24 +9,12 @@
               <span>全部</span>
               <span class="number">(103)</span>
             </div>
-            <!-- <div>
-            <span><d2-icon-svg name="edit" class="icon"/></span>
-            <span style="margin-left:8px;"
-              ><d2-icon-svg name="delete" class="icon"
-            /></span>
-          </div> -->
           </div>
           <div class="ty" style="margin:15px 0;">
             <div>
               <span>未分组</span>
               <span class="number">(8)</span>
             </div>
-            <!-- <div>
-            <span><d2-icon-svg name="edit" class="icon"/></span>
-            <span style="margin-left:8px;"
-              ><d2-icon-svg name="delete" class="icon"
-            /></span>
-          </div> -->
           </div>
           <div class="tree">
             <el-tree
@@ -53,12 +41,13 @@
             </el-tree>
           </div>
         </div>
-        <div class="run">
+      </div>
+
+      <!-- <div class="run"> -->
       <div class="end">
         <span class="add-l" @click="addCounter">添加柜组</span>
         <span class="add-r" @click="addStore">添加门店/专柜</span>
       </div>
-        </div>
       <!-- </div> -->
     </div>
     <div class="right">
@@ -72,10 +61,7 @@
             @click="synchronismMember"
             >同步成员</el-button
           >
-            <el-button
-              class="button buttondark"
-              size="small"
-              @click="handleMove"
+          <el-button class="button buttondark" size="small" @click="handleMove"
             >移动</el-button
           >
         </div>
@@ -225,6 +211,48 @@ export default {
           }
         ]
       },
+      {
+        id: 9,
+        label: "一级 3",
+        children: [
+          {
+            id: 10,
+            label: "二级 3-1"
+          },
+          {
+            id: 11,
+            label: "二级 3-2"
+          }
+        ]
+      },
+      {
+        id: 9,
+        label: "一级 3",
+        children: [
+          {
+            id: 10,
+            label: "二级 3-1"
+          },
+          {
+            id: 11,
+            label: "二级 3-2"
+          }
+        ]
+      },
+      /* {
+        id: 9,
+        label: "一级 3",
+        children: [
+          {
+            id: 10,
+            label: "二级 3-1"
+          },
+          {
+            id: 11,
+            label: "二级 3-2"
+          }
+        ]
+      },*/
       {
         id: 9,
         label: "一级 3",
@@ -395,6 +423,10 @@ export default {
 </script>
 
 <style scoped>
+.tree {
+  /* height: 100%;
+  overflow: auto; */
+}
 .mail {
   display: flex;
   width: 100%;
@@ -411,7 +443,6 @@ export default {
 }
 
 .end {
-  position: absolute;
   display: flex;
   align-items: center;
   border: 1px solid rgba(78, 89, 199, 1);
@@ -449,7 +480,8 @@ export default {
 }
 .bottom {
   padding: 12px;
-  margin-bottom: 194px;
+  margin-bottom: 20px;
+  /* margin-bottom: 194px; */
 }
 .title {
   height: 48px;
@@ -469,13 +501,14 @@ export default {
   position: relative;
   width: 20%;
   overflow: auto;
+  flex-direction: column;
+  justify-content: space-between;
 }
 .right {
   position: relative;
   padding: 10px;
   margin-left: 10px;
   width: 79%;
-  /*width: 80%;*/
 }
 .left,
 .right {
@@ -483,11 +516,11 @@ export default {
   flex-direction: column;
   background-color: #fff;
   height: 100%;
-  
   box-sizing: border-box;
 }
 
-.right-c, .left-c {
+.right-c,
+.left-c {
   width: 100%;
 }
 .number {