Merge branch 'master' of https://gitlab.ezijing.com/webapp/customer-admin

src/modules/system/customergroup/index.js

@@ -14,9 +14,9 @@ const routes = [
       },
       {
         name: 'detail',
-        path: 'customergroup/detail',
+        path: 'detail',
         component: () => import('./views/Detail.vue'),
-        meta: { title: '客户组详情' }
+        meta: { title: '客户组管理 / 客户组详情' }
       }
     ]
   }

src/modules/system/customergroup/views/Detail.vue

 <template>
   <div>
-    <el-tabs v-model="tabsActive">
-      <el-tab-pane label="客户" name="customer"> <Customer :id="id" /> </el-tab-pane>
-      <el-tab-pane label="员工" name="employees" lazy><Employees :id="id" /> </el-tab-pane>
-    </el-tabs>
+    <el-card>
+      <h4 class="title" style="margin-bottom: 20px">{{ title || '' }}</h4>
+      <el-tabs v-model="tabsActive">
+        <el-tab-pane label="客户" name="customer"> <Customer :id="id" /> </el-tab-pane>
+        <el-tab-pane label="员工" name="employees" lazy><Employees :id="id" /> </el-tab-pane>
+      </el-tabs>
+    </el-card>
   </div>
 </template>
 
@@ -19,6 +22,9 @@ export default {
   computed: {
     id() {
       return this.$route.query.id
+    },
+    title() {
+      return this.$route.query.name
     }
   },
   components: {

src/modules/system/customergroup/views/List.vue

@@ -88,7 +88,8 @@ export default {
       this.$router.push({
         name: 'detail',
         query: {
-          id: row.id
+          id: row.id,
+          name: row.name
         }
       })
     },