调整组织架构

src/HManagement/department/index.vue

@@ -1,25 +1,30 @@
 <template>
   <div class="flex">
     <!-- 营销区域列表 -->
-    <areaTree ref="arealist" style="width:250px;flex:0 1 auto" @onClick="onClick">
+    <areaTree ref="arealist" style="width:350px;flex:0 1 auto" @onClick="onClick">
       <template v-slot:operation="data">
         <!-- 新增区域 -->
+        <div style="width:108px;text-align: left">
         <addArea v-if="tool.checkAuth($route.name,'addDep')" class="inline-16" :data="data.data" @onSuccess="onSuccess"></addArea>
-        <el-dropdown>
-          <span class="el-dropdown-link"><i class="el-icon-more"></i>
-          </span>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item>
-              <editArea v-if="tool.checkAuth($route.name,'editDep')" class="inline-16" :data="data.data" @onSuccess="onSuccess"></editArea>
-            </el-dropdown-item>
-            <el-dropdown-item>
-              <delArea  v-if="tool.checkAuth($route.name,'delDep')" class="inline-16" :data="data.data" @onSuccess="onSuccess"></delArea>
-            </el-dropdown-item>
-            <el-dropdown-item >
-              <startArea v-if="tool.checkAuth($route.name,'editDep')" class="inline-16" :data="data.data" @onSuccess="onSuccess"></startArea>
-            </el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
+        <editArea v-if="tool.checkAuth($route.name,'editDep')" class="inline-16" :data="data.data" @onSuccess="onSuccess"></editArea>
+        <startArea v-if="tool.checkAuth($route.name,'editDep') " class="inline-16" :data="data.data" @onSuccess="onSuccess"></startArea>
+        <delArea  v-if="tool.checkAuth($route.name,'delDep') " class="inline-16" :data="data.data" @onSuccess="onSuccess"></delArea>
+        </div>
+<!--        <el-dropdown>-->
+<!--          <span class="el-dropdown-link"><i class="el-icon-more"></i>-->
+<!--          </span>-->
+<!--          <el-dropdown-menu slot="dropdown">-->
+<!--            <el-dropdown-item>-->
+<!--              <editArea v-if="tool.checkAuth($route.name,'editDep')" class="inline-16" :data="data.data" @onSuccess="onSuccess"></editArea>-->
+<!--            </el-dropdown-item>-->
+<!--            <el-dropdown-item>-->
+<!--              <delArea  v-if="tool.checkAuth($route.name,'delDep')" class="inline-16" :data="data.data" @onSuccess="onSuccess"></delArea>-->
+<!--            </el-dropdown-item>-->
+<!--            <el-dropdown-item >-->
+<!--              <startArea v-if="tool.checkAuth($route.name,'editDep')" class="inline-16" :data="data.data" @onSuccess="onSuccess"></startArea>-->
+<!--            </el-dropdown-item>-->
+<!--          </el-dropdown-menu>-->
+<!--        </el-dropdown>-->
       </template>
     </areaTree>
     <div class="hm-info-panel">

src/HManagement/department/modules/add_dep.vue

@@ -1,6 +1,9 @@
 <template>
   <div>
-    <i style="font-weight:bold" class="el-icon-plus" @click="() => append()"></i>
+    <el-tooltip class="item" effect="dark" content="添加" placement="top-start">
+      <i style="font-weight:bold" class="el-icon-plus" @click="() => append()"></i>
+    </el-tooltip>
+
     <el-dialog title="新建部门" append-to-body width="864px" :visible.sync="dialogDepVisible" @close="onClose">
       <el-row :gutter="20">
         <el-form :model="form" :rules="rules" ref="form" size="small" label-width="100px" label-position="right">

src/HManagement/department/modules/del_dep.vue

@@ -2,7 +2,10 @@
   <div>
     <!-- <i style="font-weight:bold" class="el-icon-delete" @click="() => append()"></i> -->
     <!-- <el-button size="small" type="text" icon="el-icon-delete" @click="() => append()">删 除</el-button> -->
-    <p  @click="() => append()"><i style="font-weight:bold" class="el-icon-delete">&nbsp;删 除</i></p>
+    <el-tooltip class="item" effect="dark" content="删除" placement="top-start">
+      <p  @click="() => append()"><i style="font-weight:bold" class="el-icon-delete" v-if="data.parentid !== 0">&nbsp;</i></p>
+    </el-tooltip>
+
   </div>
 </template>
 
@@ -37,6 +40,9 @@ export default {
         });          
       });
     }
+  },
+  mounted() {
+
   }
 }
 

src/HManagement/department/modules/dep_list.vue

@@ -10,7 +10,9 @@
       :expand-on-click-node="false"
       @node-click="handleClick">
       <span class="custom-tree-node" slot-scope="{ node, data }">
-        <span>{{ node.label }}</span>
+        <el-tooltip class="item" effect="dark" :content="node.label" placement="top-start">
+           <span>{{ node.label ? node.label.length > 25 ? node.label.substring(0,24) + '...':node.label:node.label }}</span>
+        </el-tooltip>
         <span>
           <slot name="operation" :data="data"></slot>
         </span>

src/HManagement/department/modules/edit_dep.vue

@@ -2,7 +2,11 @@
   <div>
     <!-- <i style="font-weight:bold" class="el-icon-edit" @click="() => append()"></i> -->
     <!-- <el-button size="small"  type="text" icon="el-icon-edit" @click="() => append()">编 辑</el-button> -->
-    <p  @click="() => append()"><i style="font-weight:bold" class="el-icon-edit">&nbsp;编 辑</i></p>
+<!--    <p  @click="() => append()"><i style="font-weight:bold" class="el-icon-edit">&nbsp;编 辑</i></p>-->
+    <el-tooltip class="item" effect="dark" content="编辑" placement="top-start">
+      <p  @click="() => append()"><i style="font-weight:bold" class="el-icon-edit">&nbsp</i></p>
+    </el-tooltip>
+
     <el-dialog title="编辑部门" append-to-body width="864px" :visible.sync="dialogDepVisible">
       <el-row :gutter="20">
         <el-form :model="form" :rules="rules" ref="form" size="small" label-width="100px" label-position="right">

src/HManagement/department/modules/start_dep.vue

@@ -2,7 +2,11 @@
   <div>
     <!-- <i style="font-weight:bold" class="el-icon-delete" @click="() => append()"></i> -->
     <!-- <el-button v-if="data" size="small"  type="text" :icon="data.isused === 1?'el-icon-circle-close':'el-icon-circle-check'" @click="() => append()">{{data.isused === 1?'停 用':'启 用'}}</el-button> -->
-    <p  @click="() => append()"><i style="font-weight:bold" :class="data.isused === 1?'el-icon-circle-close':'el-icon-circle-check'">&nbsp;{{data.isused === 1?'停 用':'启 用'}}</i></p>
+<!--    <p  @click="() => append()"><i style="font-weight:bold" :class="data.isused === 1?'el-icon-circle-close':'el-icon-circle-check'">&nbsp;{{data.isused === 1?'停 用':'启 用'}}</i></p>-->
+    <el-tooltip class="item" effect="dark" :content="data.isused === 1?'停 用':'启 用'" placement="top-start">
+      <p  @click="() => append()"><i style="font-weight:bold" :class="data.isused === 1?'el-icon-circle-close':'el-icon-circle-check'" v-if="data.parentid !== 0">&nbsp;</i></p>
+    </el-tooltip>
+
   </div>
 </template>
 

src/HManagement/marketing2/salerScope/area/list.vue

@@ -13,7 +13,9 @@
       :expand-on-click-node="false"
       @node-click="handleClick">
       <span class="custom-tree-node" slot-scope="{ node, data }">
-        <span>{{ node.label }}</span>
+        <el-tooltip class="item" effect="dark" :content="node.label" placement="top-start">
+           <span>{{ node.label ? node.label.length > 15 ? node.label.substring(0,14) + '...':node.label:node.label }}</span>
+        </el-tooltip>
         <span>
           <slot name="operation" :data="data"></slot>
         </span>

src/HManagement/marketing2/salerScope/area/modules/del_area.vue

@@ -1,7 +1,10 @@
 <template>
   <div>
     <!-- <i style="font-weight:bold" class="el-icon-delete" @click="() => append()"></i> -->
-    <p  @click="() => append()"><i style="font-weight:bold" class="el-icon-delete">&nbsp;删 除</i></p>
+    <el-tooltip class="item" effect="dark" content="删除" placement="top-start">
+      <p  @click="() => append()"><i style="font-weight:bold" class="el-icon-delete" >&nbsp;</i></p>
+    </el-tooltip>
+
   </div>
 </template>
 

src/HManagement/marketing2/salerScope/area/modules/edit_area.vue

@@ -1,7 +1,10 @@
 <template>
   <div>
     <!-- <el-button size="small" icon="el-icon-edit" @click="() => append()"></el-button> -->
-    <p @click="() => append()"><i style="font-weight:bold" class="el-icon-edit"></i>编 辑</p>
+    <el-tooltip class="item" effect="dark" content="编辑" placement="top-start">
+      <p @click="() => append()"><i style="font-weight:bold" class="el-icon-edit"></i></p>
+    </el-tooltip>
+
     <el-dialog title="编辑区域" append-to-body width="864px" :visible.sync="dialogDepVisible" @close="onClose">
       <el-row :gutter="20">
         <el-form :model="form" :rules="rules" ref="form" size="small" label-width="100px" label-position="right">

src/HManagement/marketing2/salerScope/area/modules/start_area.vue

@@ -1,13 +1,16 @@
 <template>
   <div>
-    <p @click="() => append()"><i style="font-weight:bold" :class="data.isused === 1?'el-icon-circle-close':'el-icon-circle-check'" ></i>{{data.isused === 1?'停 用':'启 用'}}</p>
+    <el-tooltip class="item" effect="dark" :content="data.isused === 1?'停 用':'启 用'" placement="top-start">
+      <p @click="() => append()"><i style="font-weight:bold" :class="data.isused === 1?'el-icon-circle-close':'el-icon-circle-check'" ></i></p>
+    </el-tooltip>
+
     <!-- <el-button v-if="data" size="small" :icon="data.isused === 1?'el-icon-circle-close':'el-icon-circle-check'" @click="() => append()">{{data.isused === 1?'停 用':'启 用'}}</el-button> -->
   </div>
 </template>
 
 <script>
 export default {
-  props:['data'],
+  props:['data','dataRow'],
   data () {
     return {
       form:{

src/HManagement/marketing2/salerScope/index.vue

@@ -1,12 +1,18 @@
 <template>
   <div class="flex">
     <!-- 营销区域列表 -->
-    <areaTree ref="arealist" style="width:250px;flex:0 1 auto" @onClick="onClick">
+    <areaTree ref="arealist" style="width:350px;flex:0 1 auto" @onClick="onClick">
       <addAreaParent slot="addArea" v-if="tool.checkAuth($route.name,'addArea')" @onSuccess="onSuccess"></addAreaParent>
       <template v-slot:operation="data">
         <!-- 新增区域 -->
-        <addArea v-if="tool.checkAuth($route.name,'addArea')" class="inline-16" :data="data.data" @onSuccess="onSuccess"></addArea>
-        <el-dropdown>
+        <div style="width:108px;text-align: left">
+          <addArea v-if="tool.checkAuth($route.name,'addArea')" class="inline-16" :data="data.data" @onSuccess="onSuccess"></addArea>
+          <editArea v-if="tool.checkAuth($route.name,'updateArea')" class="inline-16" :data="data.data" @editSuccess="editSuccess"></editArea>
+          <startArea v-if="tool.checkAuth($route.name,'startArea')" class="inline-16" :data="areaInfo" :dataRow="data.data" @onStartArea="onStartArea"></startArea>
+          <delArea  v-if="tool.checkAuth($route.name,'deleteArea')" class="inline-16" :data="data.data" @onSuccess="onSuccess"></delArea>
+        </div>
+
+<!--        <el-dropdown>
           <span class="el-dropdown-link"><i class="el-icon-more"></i>
           </span>
           <el-dropdown-menu slot="dropdown">
@@ -20,7 +26,7 @@
               <startArea v-if="tool.checkAuth($route.name,'startArea')" class="inline-16" :data="areaInfo" @onStartArea="onStartArea"></startArea>
             </el-dropdown-item>
           </el-dropdown-menu>
-        </el-dropdown>
+        </el-dropdown>-->
       </template>
     </areaTree>
     <div class="hm-info-panel">