修改

src/router/modules/stock.js

@@ -13,77 +13,149 @@ export default {
   },
   children: [
     {
-      path: "/stock/",
+      path: "/warehouseReceipt/",
       component: Layout,
-      redirect: "noredirect",
+      redirect: "/stock/in",
       name: "warehouseReceipt",
+      parentNum: 1,
       meta: {
         isChild: true,
         title: "warehouseReceipt"
-      },
-      children: [
-        {
-          path: "/stock/in",
-          component: () => import("@/xt_pages/stock/stockInOrder"),
-          name: "stockInOrder",
-          meta: { title: "stockInOrder", noCache: true }
-        },
-        {
-          path: "/stock/return",
-          component: () => import("@/xt_pages/stock/salesReturnOrder"),
-          name: "salesReturnOrder",
-          meta: { title: "salesReturnOrder", noCache: true }
-        },
-        {
-          path: "/stock/out",
-          component: () => import("@/xt_pages/stock/stockOutOrder"),
-          name: "stockOutOrder",
-          meta: { title: "stockOutOrder", noCache: true }
-        },
-        {
-          path: "/stock/cancel",
-          component: () => import("@/xt_pages/stock/cancelStockOrder"),
-          name: "cancelStockOrder",
-          meta: { title: "cancelStockOrder", noCache: true }
-        }
-      ]
-    },
-    {
-      path: "stock/",
+      }
+    },
+    {
+      path: "/warehouseReceiptOther/",
       component: Layout,
-      redirect: "noredirect",
+      redirect: "/stock/in/other",
       name: "warehouseReceiptOther",
+      parentNum: 2,
       meta: {
         isChild: true,
         title: "warehouseReceiptOther"
-      },
-      children: [
-        {
-          path: "/stock/in/other",
-          component: () => import("@/xt_pages/stock/otherStockInOrder"),
-          name: "otherStockInOrder",
-          meta: { title: "otherStockInOrder", noCache: true }
-        },
-        {
-          path: "/stock/return/other",
-          component: () => import("@/xt_pages/stock/otherSalesReturnOrder"),
-          name: "otherSalesReturnOrder",
-          meta: { title: "otherSalesReturnOrder", noCache: true }
-        },
-        {
-          path: "/stock/out/other",
-          component: () => import("@/xt_pages/stock/otherStockOutOrder"),
-          name: "otherStockOutOrder",
-          meta: { title: "otherStockOutOrder", noCache: true }
-        },
-        {
-          path: "/stock/cancel/other",
-          component: () => import("@/xt_pages/stock/otherCancelStockOrder"),
-          name: "otherCancelStockOrder",
-          meta: { title: "otherCancelStockOrder", noCache: true }
-        }
-      ]
+      }
+    },
+    {
+      path: "/stock/in",
+      component: () => import("@/xt_pages/stock/stockInOrder"),
+      name: "stockInOrder",
+      hidden: true,
+      is_menu: false,
+      num: 1,
+      meta: { title: "stockInOrder", noCache: true }
+    },
+    {
+      path: "/stock/return",
+      component: () => import("@/xt_pages/stock/salesReturnOrder"),
+      name: "salesReturnOrder",
+      hidden: true,
+      is_menu: false,
+      num: 1,
+      meta: { title: "salesReturnOrder", noCache: true }
+    },
+    {
+      path: "/stock/out",
+      component: () => import("@/xt_pages/stock/stockOutOrder"),
+      name: "stockOutOrder",
+      hidden: true,
+      is_menu: false,
+      num: 1,
+      meta: { title: "stockOutOrder", noCache: true }
+    },
+    {
+      path: "/stock/cancel",
+      component: () => import("@/xt_pages/stock/cancelStockOrder"),
+      name: "cancelStockOrder",
+      hidden: true,
+      is_menu: false,
+      num: 1,
+      meta: { title: "cancelStockOrder", noCache: true }
+    },
+    {
+      path: "/stock/in/other",
+      component: () => import("@/xt_pages/stock/otherStockInOrder"),
+      name: "otherStockInOrder",
+      hidden: true,
+      is_menu: false,
+      num: 2,
+      meta: { title: "otherStockInOrder", noCache: true }
     },
+    {
+      path: "/stock/return/other",
+      component: () => import("@/xt_pages/stock/otherSalesReturnOrder"),
+      name: "otherSalesReturnOrder",
+      hidden: true,
+      is_menu: false,
+      num: 2,
+      meta: { title: "otherSalesReturnOrder", noCache: true }
+    },
+    {
+      path: "/stock/out/other",
+      component: () => import("@/xt_pages/stock/otherStockOutOrder"),
+      name: "otherStockOutOrder",
+      hidden: true,
+      is_menu: false,
+      num: 2,
+      meta: { title: "otherStockOutOrder", noCache: true }
+    },
+    {
+      path: "/stock/cancel/other",
+      component: () => import("@/xt_pages/stock/otherCancelStockOrder"),
+      name: "otherCancelStockOrder",
+      hidden: true,
+      is_menu: false,
+      num: 2,
+      meta: { title: "otherCancelStockOrder", noCache: true }
+    },
+    // {
+    //   path: "/stock/",
+    //   component: Layout,
+    //   redirect: "noredirect",
+    //   name: "warehouseReceipt",
+    //   meta: {
+    //     isChild: true,
+    //     title: "warehouseReceipt"
+    //   },
+    //   children: [
+
+    //   ]
+    // },
+
+    // {
+    //   path: "stock/",
+    //   component: Layout,
+    //   redirect: "noredirect",
+    //   name: "warehouseReceiptOther",
+    //   meta: {
+    //     isChild: true,
+    //     title: "warehouseReceiptOther"
+    //   },
+    //   children: [
+    //     {
+    //       path: "/stock/in/other",
+    //       component: () => import("@/xt_pages/stock/otherStockInOrder"),
+    //       name: "otherStockInOrder",
+    //       meta: { title: "otherStockInOrder", noCache: true }
+    //     },
+    //     {
+    //       path: "/stock/return/other",
+    //       component: () => import("@/xt_pages/stock/otherSalesReturnOrder"),
+    //       name: "otherSalesReturnOrder",
+    //       meta: { title: "otherSalesReturnOrder", noCache: true }
+    //     },
+    //     {
+    //       path: "/stock/out/other",
+    //       component: () => import("@/xt_pages/stock/otherStockOutOrder"),
+    //       name: "otherStockOutOrder",
+    //       meta: { title: "otherStockOutOrder", noCache: true }
+    //     },
+    //     {
+    //       path: "/stock/cancel/other",
+    //       component: () => import("@/xt_pages/stock/otherCancelStockOrder"),
+    //       name: "otherCancelStockOrder",
+    //       meta: { title: "otherCancelStockOrder", noCache: true }
+    //     }
+    //   ]
+    // },
     {
       path: "/stock/query",
       component: () => import("@/xt_pages/stock/stockQuery"),

src/views/layout/components/Sidebar/SidebarItem.vue

@@ -51,7 +51,7 @@
             </el-menu-item>
           </router-link>
 
-          <router-link v-else :to="child.children[0].path" :key="child.name">
+          <router-link v-else :to="child.path" :key="child.name">
             <el-menu-item :index="resolvePath(child.path)">
               <svg-icon v-if="child.meta && child.meta.icon" :icon-class="child.meta.icon"></svg-icon>
               <span v-if="child.meta && child.meta.title" slot="title">

src/views/layout/components/Sidebar/index.vue

@@ -18,7 +18,7 @@
       active-text-color="#409EFF"
     >-->
     <div class="logo">
-      <img src="/static/img/logo.8dbb9fd.png" alt />
+      <img src="../../../../assets/logo/logo.png" alt />
     </div>
     <el-menu
       mode="vertical"

src/views/layout/components/TagsView.vue

@@ -92,12 +92,13 @@ export default {
     //   }
     // },
     index(newVal) {
+      if (this.newIndex != newVal) {
+        this.activeClass = 0;
+      }
       this.newIndex = this.index;
     }
   },
   mounted() {
-    console.log(111111122111118379487239847, this.permission_routers);
-    console.log(this.permission_routers);
     // this.addViewTags();
   },
   methods: {

src/xt_pages/role/components/UserManagement.vue

@@ -0,0 +1,84 @@
+<template>
+  <el-dialog class="userDialog" title="用户管理" width="660px" :visible.sync="visible">
+    <div class="userManagement">
+      <el-table
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+        style="width:100%;"
+        ref="table"
+        border
+        :data="data"
+      >
+        <el-table-column type="selection" label="禁用" width="55"></el-table-column>
+        <el-table-column prop="name" label="员工姓名" width="120">
+          <template slot-scope="scope"></template>
+        </el-table-column>
+        <el-table-column prop="date" label="登录账号" width="120">
+          <template slot-scope="scope"></template>
+        </el-table-column>
+        <el-table-column prop="date" label="最后登录时间" width="180">
+          <template slot-scope="scope"></template>
+        </el-table-column>
+        <el-table-column label="操作" width="130">
+          <template slot-scope="scope" style="text-align: center">
+            <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+              <el-button type="primary" icon="el-icon-edit-outline" size="small"></el-button>
+            </el-tooltip>
+            <!-- </router-link> -->
+            <el-tooltip class="item" effect="dark" content="移除" placement="top">
+              <el-button type="danger" size="small" icon="el-icon-delete"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </el-dialog>
+</template>
+
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      data: [
+        {
+          date: "2016-05-03",
+          name: "王小虎",
+          address: "上海市普陀区金沙江路 1518 弄"
+        },
+        {
+          date: "2016-05-03",
+          name: "王小虎",
+          address: "上海市普陀区金沙江路 1518 弄"
+        }
+      ]
+    };
+  },
+  methods: {
+    show() {
+      this.visible = true;
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.userManagement {
+  .cell {
+    text-align: center;
+  }
+}
+</style>
+
+
+<style lang="scss">
+.userManagement {
+  .cell {
+    text-align: center;
+  }
+}
+</style>

src/xt_pages/role/role.vue

@@ -8,8 +8,7 @@
         icon="el-icon-circle-plus"
         style="float:right;"
         @click="addRoleAction"
-        >新增</el-button
-      >
+      >新增</el-button>
     </div>
     <div class="app-container">
       <!-- <el-table
@@ -85,18 +84,13 @@
         </el-col>
       </el-row>-->
 
-      <edit-role
-        ref="edit_role"
-        @did-add-role="didAddRole"
-        @did-edit-role="didModifyRole"
-      ></edit-role>
+      <edit-role ref="edit_role" @did-add-role="didAddRole" @did-edit-role="didModifyRole"></edit-role>
       <permission-settings ref="permission_settings"></permission-settings>
+      <user-management ref="user_management"></user-management>
 
       <div class="roleTitle">
         <i class="el-icon-warning warn"></i>
-        <p>
-          根据员工的职能选择角色，然后新增账号，可以自定义角色，进行权限配置
-        </p>
+        <p>根据员工的职能选择角色，然后新增账号，可以自定义角色，进行权限配置</p>
       </div>
       <div class="roleBox">
         <div class="roleOne">
@@ -108,16 +102,14 @@
             <img src="../../assets/img/pc1.png" alt />
             <p class="avatarname">子管理员</p>
           </div>
-          <div class="roleTip">
-            子管理员角色具备平台全部功能的使用权限,请谨慎配置...
-          </div>
+          <div class="roleTip">子管理员角色具备平台全部功能的使用权限,请谨慎配置...</div>
           <div class="roleTxt">
             该角色目前已配置
             <span style="color:#4A8AF3">0</span> 个员工
           </div>
           <div class="btnBox">
             <el-button>新增用户</el-button>
-            <el-button>用户管理</el-button>
+            <el-button @click="onClick1">用户管理</el-button>
           </div>
         </div>
         <div class="roleOne">
@@ -129,9 +121,7 @@
             <img src="../../assets/img/pc2.png" alt />
             <p class="avatarname">医生</p>
           </div>
-          <div class="roleTip">
-            医生角色能够进行建立患者档案，制定和调整患者透析治疗方案，定期评价病人的透析质量等...
-          </div>
+          <div class="roleTip">医生角色能够进行建立患者档案，制定和调整患者透析治疗方案，定期评价病人的透析质量等...</div>
           <div class="roleTxt">
             该角色目前已配置
             <span style="color:#4A8AF3">0</span> 个员工
@@ -150,9 +140,7 @@
             <img src="../../assets/img/pc3.png" alt />
             <p class="avatarname">护士</p>
           </div>
-          <div class="roleTip">
-            护士角色能够进行病人透析管理，以及医院的感染控制与消毒记录等...
-          </div>
+          <div class="roleTip">护士角色能够进行病人透析管理，以及医院的感染控制与消毒记录等...</div>
           <div class="roleTxt">
             该角色目前已配置
             <span style="color:#4A8AF3">0</span> 个员工
@@ -171,9 +159,7 @@
             <img src="../../assets/img/pc7.png" alt />
             <p class="avatarname">技师</p>
           </div>
-          <div class="roleTip">
-            技师角色能够进行设备的管理，日常维护维修记录等...
-          </div>
+          <div class="roleTip">技师角色能够进行设备的管理，日常维护维修记录等...</div>
           <div class="roleTxt">
             该角色目前已配置
             <span style="color:#4A8AF3">0</span> 个员工
@@ -192,9 +178,7 @@
             <img src="../../assets/img/pc6.png" alt />
             <p class="avatarname">运营</p>
           </div>
-          <div class="roleTip">
-            运营角色能够在SCRM中管理微网站、使用营销工具、做会员管理和分销商品经营的操作...
-          </div>
+          <div class="roleTip">运营角色能够在SCRM中管理微网站、使用营销工具、做会员管理和分销商品经营的操作...</div>
           <div class="roleTxt">
             该角色目前已配置
             <span style="color:#4A8AF3">0</span> 个员工
@@ -213,9 +197,7 @@
             <img src="../../assets/img/pc4.png" alt />
             <p class="avatarname">库存</p>
           </div>
-          <div class="roleTip">
-            库存角色负责透析耗材的日常管理，对耗材的入库、出库、退库的登记操作...
-          </div>
+          <div class="roleTip">库存角色负责透析耗材的日常管理，对耗材的入库、出库、退库的登记操作...</div>
           <div class="roleTxt">
             该角色目前已配置
             <span style="color:#4A8AF3">0</span> 个员工
@@ -234,9 +216,7 @@
             <img src="../../assets/img/pc5.png" alt />
             <p class="avatarname">院长</p>
           </div>
-          <div class="roleTip">
-            院长角色了解血透患者血液透析质量和相关的大数据，以及掌握透析中心整体运营情况
-          </div>
+          <div class="roleTip">院长角色了解血透患者血液透析质量和相关的大数据，以及掌握透析中心整体运营情况</div>
           <div class="roleTxt">
             该角色目前已配置
             <span style="color:#4A8AF3">0</span> 个员工
@@ -254,6 +234,7 @@
 <script>
 import EditRole from "./components/EditRole.vue";
 import PermissionSettings from "./components/PermissionSettings.vue";
+import UserManagement from "./components/UserManagement.vue";
 import { getRoles, setRoleStatus } from "@/api/role/role";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
@@ -261,7 +242,8 @@ export default {
   components: {
     EditRole,
     BreadCrumb,
-    PermissionSettings
+    PermissionSettings,
+    UserManagement
   },
   data: function() {
     return {
@@ -384,6 +366,9 @@ export default {
 
     onClick() {
       this.$refs.permission_settings.show();
+    },
+    onClick1() {
+      this.$refs.user_management.show();
     }
   }
 };