Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/api/role/role.js

@@ -95,3 +95,12 @@ export function AddUserRole(params){
   })
 }
 
+
+
+export function getRoleStaff() {
+  return request({
+    url: '/api/role/staff',
+    method: 'get',
+  })
+}
+

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/Layout.vue

@@ -1,17 +1,13 @@
 <template>
   <div class="app-wrapper" :class="classObj">
-    <div
-      v-if="device === 'mobile' && sidebar.opened"
-      class="drawer-bg"
-      @click="handleClickOutside"
-    ></div>
+    <div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside"></div>
     <navbar></navbar>
 
     <div class="Header-container">
       <sidebar class="sidebar-container" @callBackIndex="handleIndex"></sidebar>
       <!-- <sidebar class="newSide" @callBackIndex="handleIndex"></sidebar> -->
       <div class="main-container">
-        <tags-view :index="index"></tags-view>
+        <tags-view :index="index" :num="num"></tags-view>
         <app-main></app-main>
       </div>
     </div>
@@ -49,16 +45,18 @@ export default {
   },
   data() {
     return {
-      index: 0
+      index: 0,
+      num: 1
     };
   },
   methods: {
     handleClickOutside() {
       this.$store.dispatch("closeSideBar", { withoutAnimation: false });
     },
-    handleIndex(data) {
+    handleIndex(data, num) {
       // console.log({ prop: data });
       this.index = data;
+      this.num = num;
     }
   }
 };

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

@@ -41,7 +41,7 @@
             v-if="child.meta.isChild != true"
             :key="child.name"
           >
-            <el-menu-item :index="resolvePath(child.path)">
+            <el-menu-item @click="onClick(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">
                 {{
@@ -51,8 +51,8 @@
             </el-menu-item>
           </router-link>
 
-          <router-link v-else :to="child.children[0].path" :key="child.name">
-            <el-menu-item :index="resolvePath(child.path)">
+          <router-link v-else :to="child.path" :key="child.name">
+            <el-menu-item @click="onClick(item,child.parentNum)" :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">
                 {{
@@ -157,10 +157,14 @@ export default {
       return path.resolve(this.basePath, ...paths);
     },
     generateTitle,
-    onClick(index) {
+    onClick(index, num) {
       this.permission_routers.map((item, i) => {
         if (this.isObjectValueEqual(item, index)) {
-          this.$emit("a", i);
+          if (num) {
+            this.$emit("a", i, num);
+          } else {
+            this.$emit("a", i, 999);
+          }
         }
       });
     },

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/logo1.png" alt />
     </div>
     <el-menu
       mode="vertical"
@@ -105,11 +105,10 @@ export default {
     resolvePath(...paths) {
       return path.resolve(this.basePath, ...paths);
     },
-    b(index) {
-      // console.log(index);
+    b(index, num) {
       // this.index = index;
       // this.activeClass = index;
-      this.$emit("callBackIndex", index);
+      this.$emit("callBackIndex", index, num);
     }
   },
   created() {
@@ -157,7 +156,7 @@ export default {
 .logo {
   width: 100px;
   height: 32px;
-  margin: 20px auto 0;
+  margin: 20px auto;
   img {
     width: 100%;
     height: 100%;

src/views/layout/components/TagsView.vue

@@ -27,27 +27,63 @@
       <li @click="closeAllTags">{{ $t("tagsView.closeAll") }}</li>
     </ul>-->
     <div class="tags-view-wrapper">
-      <div class="tagsBox">
-        <div
-          class="tagsOne"
-          v-if="permission_routers[newIndex].meta"
-          v-for="(item, i) in permission_routers[newIndex].children"
-          :key="i"
-        >
-          <router-link :to="item.path" v-if="!item.hidden && !item.is_menu">
-            <p
-              class="newTags"
-              :class="activeClass == i ? 'active' : ''"
-              @click="onClick(i)"
-            >{{ generateTitle(item.meta.title) }}</p>
-          </router-link>
+      <div style="height:100%">
+        <div style="height:100%" v-if="newIndex == 9">
+          <div class="tagsBox" v-if="routerList.length > 0 && newNum != 999">
+            <div
+              class="tagsOne"
+              v-if="routerList[newIndex].meta"
+              v-for="(item, i) in routerList[newIndex].children"
+              :key="i"
+            >
+              <router-link :to="item.path" v-if="item.num ? item.num == newNum : false">
+                <p
+                  class="newTags"
+                  :class="activeClass == i ? 'active' : ''"
+                  @click="onClick(i)"
+                >{{ generateTitle(item.meta.title) }}</p>
+              </router-link>
+            </div>
+          </div>
+          <div class="tagsBox" v-if="newNum == 999">
+            <div
+              class="tagsOne"
+              v-if="permission_routers[newIndex].meta"
+              v-for="(item, i) in permission_routers[newIndex].children"
+              :key="i"
+            >
+              <router-link :to="item.path" v-if="item.num ? item.num == newNum : false">
+                <p
+                  class="newTags"
+                  :class="activeClass == i ? 'active' : ''"
+                  @click="onClick(i)"
+                >{{ generateTitle(item.meta.title) }}</p>
+              </router-link>
+            </div>
+          </div>
         </div>
-        <div v-else class="tagsOne">
-          <p class="newTags" :class="activeClass == i ? 'active' : ''" @click="onClick(i)">
-            {{
-            generateTitle(permission_routers[newIndex].children[0].meta.title)
-            }}
-          </p>
+        <div class="tagsBox" v-if="newIndex != 9">
+          <div
+            class="tagsOne"
+            v-if="permission_routers[newIndex].meta"
+            v-for="(item, i) in permission_routers[newIndex].children"
+            :key="i"
+          >
+            <router-link :to="item.path" v-if="!item.hidden && !item.is_menu">
+              <p
+                class="newTags"
+                :class="activeClass == i ? 'active' : ''"
+                @click="onClick(i)"
+              >{{ generateTitle(item.meta.title) }}</p>
+            </router-link>
+          </div>
+          <div v-else class="tagsOne">
+            <p class="newTags" :class="activeClass == i ? 'active' : ''" @click="onClick(i)">
+              {{
+              generateTitle(permission_routers[newIndex].children[0].meta.title)
+              }}
+            </p>
+          </div>
         </div>
       </div>
     </div>
@@ -61,7 +97,10 @@ import { generateTitle } from "@/utils/i18n";
 import { mapGetters } from "vuex";
 
 export default {
-  props: ["index"],
+  props: {
+    index: Number,
+    num: Number
+  },
   components: { ScrollPane },
   data() {
     return {
@@ -70,7 +109,8 @@ export default {
       left: 0,
       selectedTag: {},
       newIndex: 0,
-      activeClass: ""
+      activeClass: 0,
+      newNum: 1
     };
   },
   computed: {
@@ -92,12 +132,30 @@ export default {
     //   }
     // },
     index(newVal) {
+      if (this.newIndex != newVal) {
+        this.activeClass = 0;
+      }
       this.newIndex = this.index;
+    },
+    num(newVal) {
+      this.newNum = newVal;
+      if (newVal == 999) {
+        this.routerList = [];
+      } else {
+        this.routerList = this.permission_routers;
+      }
+      if (newVal == 1) {
+        this.activeClass = 2;
+      }
+      if (newVal == 2) {
+        this.activeClass = 6;
+      }
     }
   },
+  created() {
+    this.routerList = this.permission_routers;
+  },
   mounted() {
-    console.log(111111122111118379487239847, this.permission_routers);
-    console.log(this.permission_routers);
     // this.addViewTags();
   },
   methods: {

src/xt_pages/home/index.vue

@@ -112,7 +112,6 @@
             :total="total"
           ></el-pagination>
         </div>
-
       </div>
     </section>
   </div>
@@ -193,8 +192,8 @@ export default {
   methods: {
     dateCompare(date) {
       var date1 = Date.parse(new Date()) / 1000;
-      console.log(date);
-      console.log(date1);
+      // console.log(date);
+      // console.log(date1);
       if (date > date1) {
         return 1;
       } else {

src/xt_pages/role/components/AddRole.vue

@@ -0,0 +1,252 @@
+<template>
+  <el-dialog
+    title="新增用户"
+    width="660px"
+    :visible.sync="visible"
+    :before-close="_close"
+  >
+    <el-form :model="form" :rules="rules" ref="form" label-width="90px">
+      <el-form-item label="角色名称 : " prop="name">
+        <el-input v-model="form.name" placeholder="" maxlength="30"></el-input>
+      </el-form-item>
+      <el-form-item label="角色描述 : " >
+        <el-input type="textarea" v-model="form.intro" placeholder="" resize="none" rows="4"></el-input>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="hide">取 消</el-button>
+      <el-button type="primary" @click="submitAction()">保 存</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import { addRole, modifyRole } from '@/api/role/role'
+
+  export default {
+    name: 'AddRole',
+    data() {
+      return {
+        form: {
+          id: 0,
+          name: '',
+          intro: ''
+        },
+        visible: false,
+        rules: {
+          name: [
+            { required: true, message: '请输入角色名称', trigger: 'blur' },
+            { max: 10, message: '10个字以内', trigger: 'blur' }
+          ],
+          // intro: [{ required: true, message: '请输入角色说明', trigger: 'blur' }]
+        },
+
+        //
+        checked: '1',
+        checkAll: false,
+        checkedCities: [],
+        cities: ['上海', '北京', '广州', '深圳'],
+        isIndeterminate: true,
+        ruleForm: {
+          name: '',
+          phone: '',
+          position: ''
+        },
+        newrules: {
+          name: [
+            { required: true, message: '请输入角色名称', trigger: 'blur' },
+            { max: 10, message: '10个字以内', trigger: 'blur' }
+          ],
+          phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }]
+        }
+      }
+    },
+    methods: {
+      _close: function(done) {
+        this.clear()
+        done()
+      },
+      clear: function() {
+        this.form.id = 0
+        this.form.name = ''
+        this.form.intro = ''
+      },
+      show() {
+        this.clear()
+        this.visible = true
+      },
+      hide() {
+        this.clear()
+        this.visible = false
+      },
+      modify(id, name, intro) {
+        this.form.id = id
+        this.form.name = name
+        this.form.intro = intro
+        this.visible = true
+      },
+      submitAction() {
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            // 验证通过
+            if (this.form.id === 0) {
+              // 新增 role
+              addRole(this.form.name, this.form.intro)
+                .then(rs => {
+                  var resp = rs.data
+                  if (resp.state === 1) {
+                    var new_id = resp.data.id
+                    var new_name = resp.data.name
+                    var new_intro = resp.data.intro
+                    var new_status = resp.data.status
+                    var staff_number = 0
+                    this.$emit(
+                      'did-add-role',
+                      new_id,
+                      new_name,
+                      new_intro,
+                      new_status,
+                      staff_number
+                    )
+
+                    this.hide()
+                  } else {
+                    this.$message.error(resp.msg)
+                  }
+                })
+                .catch(err => {
+                  this.$message.error(err)
+                })
+            } else {
+              // 修改 role
+              modifyRole(this.form.id, this.form.name, this.form.intro)
+                .then(rs => {
+                  var resp = rs.data
+                  if (resp.state === 1) {
+                    this.$emit(
+                      'did-edit-role',
+                      this.form.id,
+                      this.form.name,
+                      this.form.intro
+                    )
+                    this.hide()
+                  } else {
+                    this.$message.error(resp.msg)
+                  }
+                })
+                .catch(err => {
+                  this.$message.error(err)
+                })
+            }
+          } else {
+            // 验证失败
+            return false
+          }
+        })
+      },
+      handleCheckAllChange(val) {
+        this.checkedCities = val ? this.cities : []
+        this.isIndeterminate = false
+      },
+      handleCheckedCitiesChange(value) {
+        let checkedCount = value.length
+        this.checkAll = checkedCount === this.cities.length
+        this.isIndeterminate =
+          checkedCount > 0 && checkedCount < this.cities.length
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .roleContent {
+    margin-top: 20px;
+    display: flex;
+    justify-content: space-between;
+
+  .roleContentLeft {
+
+  .chooseBox {
+    width: 280px;
+    height: 320px;
+    overflow-y: auto;
+    border: 1px solid rgba(235, 238, 240, 1);
+    margin-top: 26px;
+    padding: 20px;
+
+  .checkone {
+    display: flex;
+    align-items: center;
+    height: 50px;
+  }
+
+  .el-checkbox__label {
+    display: flex;
+    align-items: center;
+
+  img {
+    width: 30px;
+    height: 30px;
+    margin-right: 10px;
+  }
+
+  }
+  }
+  }
+  .roleContentRight {
+
+  .chooseBox {
+    width: 280px;
+    height: 320px;
+    overflow-y: auto;
+    border: 1px solid rgba(235, 238, 240, 1);
+    margin-top: 26px;
+    padding: 20px;
+
+  .hasChoosedOne {
+    display: flex;
+    align-items: center;
+    height: 50px;
+
+  img {
+    width: 30px;
+    height: 30px;
+    margin-right: 10px;
+  }
+
+  }
+  }
+  }
+  }
+  .newStaff {
+    margin-top: 26px;
+
+  .newItem {
+    display: flex;
+    align-items: center;
+  }
+
+  }
+</style>
+
+<style lang="scss">
+  .roleContent {
+
+  .roleContentLeft {
+
+  .chooseBox {
+
+  .el-checkbox {
+    display: flex;
+    align-items: center;
+  }
+
+  .el-checkbox__label {
+    display: flex;
+    align-items: center;
+  }
+
+  }
+  }
+  }
+</style>

src/xt_pages/role/components/AdminRoleInfoForm.vue

@@ -0,0 +1,257 @@
+<template>
+  <el-dialog :title="formTitle" :visible.sync="dialogFormVisible">
+    <el-form :model="form" ref="form" :rules="rules" label-width="60px">
+      <el-form-item label="账号 : " prop="mobile">
+        <el-input v-model="form.mobile" placeholder="用户手机号" maxlength="11"
+                  :disabled="form.id !==  0"></el-input>
+      </el-form-item>
+
+      <el-form-item label="姓名 : " prop="name">
+        <el-input v-model="form.name" placeholder="用户姓名"></el-input>
+      </el-form-item>
+
+      <el-form-item label="职称 : ">
+        <el-select v-model="form.user_type" placeholder="用户类型">
+          <el-option
+            v-for="item in user_types"
+            :label="item.name"
+            :value="item.index"
+            :key="item.index"
+          ></el-option>
+        </el-select>
+
+        <el-select v-model="form.user_title" placeholder="用户职称">
+          <el-option
+            v-for="item in user_titles"
+            :label="item.name"
+            :value="item.index"
+            :key="item.index"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="职位 : ">
+        <el-input v-model="form.user_title_name" placeholder="输入职位"></el-input>
+      </el-form-item>
+
+      <el-form-item label="介绍 : ">
+        <Tinymce :height="400" menubar ref="editor" v-model="form.intro" :show_upload_img="false"/>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="dialogFormVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submitAction">保 存</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import Tinymce from '@/components/Tinymce'
+  import { addAdmin, getAddAdminInitData, getModifyAdminInitData, modifyAdmin } from '@/api/role/admin'
+
+  export default {
+    name: 'AdminRoleInfoForm',
+    components: {
+      Tinymce
+    },
+    data() {
+      var checkMobile = (rule, value, callback) => {
+        if (!value || value.length == 0) {
+          return callback(new Error('手机号不能为空'))
+        }
+        if (/^1\d{10}$/.test(value) == false) {
+          return callback(new Error('手机号格式错误'))
+        } else {
+          callback()
+        }
+      }
+      var checkName = (rule, value, callback) => {
+        if (!value || value.length == 0) {
+          return callback(new Error('姓名不能为空'))
+        } else {
+          callback()
+        }
+      }
+      return {
+        admin_id: 0,
+        dialogFormVisible: false,
+
+        user_types: [
+          { index: 2, name: '医生' },
+          { index: 3, name: '护士' }
+        ],
+        user_titles: [
+          { index: 1, name: '医士' },
+          { index: 2, name: '医师' },
+          { index: 3, name: '住院医师' },
+          { index: 4, name: '主治医师' },
+          { index: 5, name: '副主任医师' },
+          { index: 6, name: '主任医师' },
+          { index: 7, name: '护士' },
+          { index: 8, name: '护师' },
+          { index: 9, name: '主管护师' },
+          { index: 10, name: '副主任护师' },
+          { index: 11, name: '主任护师' },
+          { index: 12, name: '运营专员' },
+          { index: 13, name: '运营主管' }
+        ],
+        roles: [], // [{id, name, intro, status}]
+        loading: true,
+        qntoken: '',
+        formTitle: '',
+        isSubSuperAdmin: false,
+        org: null,
+        form: {
+          role_ids: [],
+          user_title_name: '',
+          id: 0,
+          mobile: '',
+          name: '',
+          user_type: '',
+          user_title: '',
+          role: '', // 其实应该是 int 类型
+          intro: ''
+        },
+        rules: {
+          mobile: [{ required: true, validator: checkMobile, trigger: 'blur' }],
+          name: [{ required: true, validator: checkName, trigger: 'blur' }]
+
+        }
+      }
+    },
+    methods: {
+      open: function(adminId,role_id) {
+        this.admin_id = adminId
+        this.roles.push(role_id)
+        if (this.admin_id < 0) {
+          this.$message.error('参数错误')
+          this.loading = false
+          return
+        }
+        let local_user_id = this.$store.getters.xt_user.user.id
+        local_user_id = 597
+        this.form.id = this.admin_id
+        this.formTitle = '编辑用户'
+        getModifyAdminInitData(this.form.id)
+          .then(rs => {
+            this.loading = false
+            var resp = rs.data
+            if (resp.state === 1) {
+              this.roles = []
+              this.roles.push(...resp.data.roles)
+              this.qntoken = resp.data.qntoken
+              var admin = resp.data.admin
+              this.form.name = admin.user_name
+              this.form.mobile = admin.admin.mobile
+              this.form.user_type = admin.user_type
+              this.form.user_title = admin.user_title
+              this.form.role = admin.role_ids
+              this.form.role_ids = []
+              for (let i = 0; i < this.form.role.split(",").length; i++) {
+                if (this.form.role.split(',')[i].length > 0) {
+                  this.form.role_ids.push(parseInt(this.form.role.split(',')[i]))
+                }
+              }
+
+              this.form.intro = admin.intro
+              this.form.user_title_name = admin.user_title_name
+
+              //如果当前用户是超级管理员而且编辑自己的信息
+              if (!this.isSubSuperAdmin && local_user_id == this.form.id) {
+                for (let i = 0; i < this.roles.length; i++) {
+                  if (this.roles[i].is_system == 1 && this.roles[i].role_name != '子管理员') {
+                    this.roles.splice(i, 1)
+                    i--
+                  }
+                }
+              }
+
+            } else {
+              this.$message.error('该用户不存在')
+            }
+          })
+          .catch(err => {
+            this.loading = false
+            this.$message.error('该用户不存在')
+          })
+
+        this.dialogFormVisible = true
+      },
+      submitAction: function() {
+        if (this.admin_id < 0) {
+          return
+        }
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            this.loading = true
+            if (this.form.id === 0) {
+              this.form.role = this.form.role_ids.join(',')
+              addAdmin(
+                this.form.mobile,
+                this.form.name,
+                this.form.user_type,
+                this.form.user_title,
+                this.form.role,
+                this.form.intro,
+                this.form.user_title_name
+              )
+                .then(rs => {
+                  this.loading = false
+                  var resp = rs.data
+                  if (resp.state === 1) {
+                    this.$store.dispatch('DidChangeAdmins')
+                    var _this = this
+                    setTimeout(() => {
+                      _this.$store.dispatch('RecoverAdminsChangeState')
+                    }, 500)
+
+                    this.$emit('did-edit-admin')
+
+                  } else {
+                    this.$message.error(resp.msg)
+                  }
+                })
+                .catch(err => {
+                  this.loading = false
+                  this.$message.error(err)
+                })
+            } else {
+              this.form.role = this.form.role_ids.join(',')
+
+              modifyAdmin(
+                this.form.id,
+                this.form.name,
+                this.form.user_type,
+                this.form.user_title,
+                this.form.role,
+                this.form.intro,
+                this.form.user_title_name
+              )
+                .then(rs => {
+                  this.loading = false
+                  var resp = rs.data
+                  if (resp.state === 1) {
+                   console.log("11111111")
+                    this.$emit('did-edit-admin')
+
+                  } else {
+                    this.$message.error(resp.msg)
+                  }
+                })
+                .catch(err => {
+                  this.loading = false
+                  this.$message.error(err)
+                })
+            }
+          } else {
+            return false
+          }
+        })
+      },
+      close:function() {
+        this.dialogFormVisible= false
+
+      }
+    }
+  }
+</script>

src/xt_pages/role/components/PermissionSettings.vue

@@ -12,18 +12,23 @@
         <div class="roleMainLeft">
           <p class="roletitle">选择权限</p>
           <div class="roleMainLeftBox">
-            <el-tree
-              :props="defaultProps"
-              :data="data"
-              :default-checked-keys="data"
-              node-key="id"
-              ref="tree"
-              default-expand-all
-              show-checkbox
-            >
-              <!-- <span class="custom-tree-node" slot-scope="{ node, data }">
+            <!--<el-tree-->
+              <!--:props="defaultProps"-->
+              <!--:data="data"-->
+              <!--:default-checked-keys="data"-->
+              <!--node-key="id"-->
+              <!--ref="tree"-->
+              <!--default-expand-all-->
+              <!--show-checkbox-->
+            <!--&gt;-->
+              <!--&lt;!&ndash; <span class="custom-tree-node" slot-scope="{ node, data }">-->
+                                <!--<span>{{ data.name }}</span>-->
+              <!--</span>&ndash;&gt;-->
+            <!--</el-tree>-->
+            <el-tree :props="treeProps" :data="purviews" :default-checked-keys="default_checkeds" node-key="id" ref="tree" default-expand-all show-checkbox>
+                            <span class="custom-tree-node" slot-scope="{ node, data }">
                                 <span>{{ data.name }}</span>
-              </span>-->
+                            </span>
             </el-tree>
           </div>
         </div>
@@ -38,10 +43,20 @@
 
 
 <script>
-export default {
+  import {getEditPurviewInitData, editPurview} from '@/api/role/role'
+
+  export default {
   data() {
     return {
       visible: false,
+      role_id: 0,
+      purviews: [], // [{id, pid, name, childs}]
+      treeProps: {
+        label: "name",
+        children: "childs"
+      },
+      // role_purview_ids: '',
+      default_checkeds: [],
       data: [
         {
           id: 1,
@@ -85,10 +100,50 @@ export default {
     };
   },
   methods: {
-    show() {
+    show(role_id) {
       this.visible = true;
+
+      var id = parseInt(role_id)
+      if (id <= 0) {
+        this.$message.error("参数错误")
+        return
+      }
+      this.role_id = role_id
+      getEditPurviewInitData(this.role_id).then(rs => {
+        var resp = rs.data
+        if (resp.state === 1) {
+          this.purviews.push(...resp.data.purviews)
+          // 初始化默认选中项
+          var role_purview_ids = resp.data.role_purview_ids
+          var checkeds = []
+          if (role_purview_ids.length > 0) {
+            var ids = role_purview_ids.split(",")
+            this.purviews.forEach(purview => {
+              if (purview.childs != null && purview.childs.length > 0) {
+                purview.childs.forEach(child => {
+                  if (ids.indexOf(child.id+"") != -1) {
+                    checkeds.push(child.id)
+                  }
+                });
+              } else {
+                if (ids.indexOf(purview.id+"") != -1) {
+                  checkeds.push(purview.id)
+                }
+              }
+            });
+          }
+          this.default_checkeds = checkeds
+        } else {
+          this.$message.error(resp.msg)
+        }
+      }).catch(err => {
+        this.$message.error(err)
+      })
     }
-  }
+  },created(){
+
+
+  },
 };
 </script>
 

src/xt_pages/role/components/UserManagement.vue

@@ -0,0 +1,233 @@
+<template>
+  <div>
+  <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="admin_user"
+      >
+        <el-table-column prop="name" label="员工姓名" width="120">
+          <template slot-scope="scope">
+            {{scope.row.user_name}}
+          </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">
+             <span>{{
+              scope.row.last_login_time == 0
+                ? ""
+                : _parseTime(scope.row.last_login_time, "{y}-{m}-{d} {h}:{i}")
+            }}</span>
+          </template>
+
+        </el-table-column>
+        <el-table-column label="操作" >
+          <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"
+                         v-if="org.creator != scope.row.user_id && (scope.row.user_id != local_user_id) && !scope.row.is_sub_super_admin"
+                         @click="openForm(scope.row.user_id, role_id)" ></el-button>
+            </el-tooltip>
+
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="移除"
+              placement="top"
+            >
+              <el-button
+                type="danger"
+                size="small"
+                icon="el-icon-delete"
+                v-if="scope.row.status == 1 && org.creator != scope.row.user_id && (scope.row.user_id != local_user_id) && !scope.row.is_sub_super_admin"
+                @click="disableAdminAction(scope.row)"
+              ></el-button>
+            </el-tooltip>
+
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="恢复"
+              placement="top"
+            >
+              <el-button
+                size="small"
+                type="info"
+                icon="el-icon-refresh"
+                v-if="scope.row.status == 0 && org.creator != scope.row.user_id  && (scope.row.user_id != local_user_id ) && !scope.row.is_sub_super_admin"
+                @click="recoverAdminAction(scope.row)"
+              ></el-button>
+            </el-tooltip>
+
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </el-dialog>
+  <!--<admin-info-form ref="admininfoform"></admin-info-form>-->
+    <admin-role-info-form ref="admininfoform"  @did-edit-admin="didModifyAdmin"></admin-role-info-form>
+  </div>
+</template>
+
+
+<script>
+  import { getRoleStaff } from '@/api/role/role'
+  import { parseTime } from "@/utils";
+  import { setAdminStatus } from "@/api/role/admin";
+  // import AdminInfoForm from './AdminInfoForm'
+  import AdminRoleInfoForm from './AdminRoleInfoForm'
+
+  export default {
+    components: { AdminRoleInfoForm },
+    data() {
+      return {
+        visible: false,
+        role_id: 0,
+        admin_user: [],
+        local_user_id: 0,
+        org:null,
+
+
+      }
+    },
+    methods: {
+      didModifyAdmin(){
+        this.GetAllStaff()
+        this.$refs["admininfoform"].close();
+
+      },
+      openForm(adminId,role_id) {
+        this.$refs["admininfoform"].open(adminId,role_id);
+      },
+      disableAdminAction: function(row) {
+        this.$msgbox({
+          title: "提示",
+          message: "是否确定要移除该用户",
+          showCancelButton: true,
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+          beforeClose: (action, instance, done) => {
+            if (action === "confirm") {
+              instance.confirmButtonLoading = true;
+              instance.confirmButtonText = "删除中...";
+
+              setAdminStatus(row.user_id, false)
+                .then(rs => {
+                  done();
+                  instance.confirmButtonLoading = false;
+
+                  const resp = rs.data;
+                  if (resp.state === 1) {
+                    row.status = 0;
+                  } else {
+                    this.$message.error(resp.msg);
+                  }
+                })
+                .catch(err => {
+                  done();
+                  instance.confirmButtonLoading = false;
+                  this.$message.error(err);
+                });
+            } else {
+              done();
+            }
+          }
+        });
+      },
+      recoverAdminAction: function(row) {
+        const loading = this.$loading({
+          lock: true,
+          text: "正在恢复管理员...",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)"
+        });
+
+        setAdminStatus(row.user_id, true)
+          .then(rs => {
+            loading.close();
+
+            const resp = rs.data;
+            if (resp.state === 1) {
+              row.status = 1;
+            } else {
+              this.$message.error(resp.msg);
+            }
+          })
+          .catch(err => {
+            loading.close();
+            this.$message.error(err);
+          });
+      },
+      _parseTime(time, format) {
+        return parseTime(time, format);
+      },
+      GetAllStaff: function() {
+        getRoleStaff().then(response => {
+          if (response.data.state === 1) {
+            this.admin_user = response.data.data.admins
+            this.org = response.data.data.org
+
+            for (let i = 0; i < this.admin_user.length; i++) {
+              if (this.admin_user[i].role_ids.length > 0) {
+                let isExist = -1
+                let ids = this.admin_user[i].role_ids.split(',')
+                isExist = ids.indexOf(this.role_id.toString())
+                if (isExist < 0) {
+                  this.admin_user.splice(i, 1)
+                  i = i - 1
+                }
+              }
+            }
+          } else {
+            this.$toast({
+              message: response.data.msg
+            })
+          }
+        })
+      },
+
+      show(role_id) {
+        this.visible = true
+        this.role_id = role_id
+        this.admin_user = []
+        this.local_user_id = this.$store.getters.xt_user.user.id
+        this.local_user_id = 597
+        this.GetAllStaff()
+      }
+    }
+  }
+</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

@@ -96,6 +96,7 @@
       ></add-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>
@@ -107,7 +108,7 @@
         <div class="roleOne" v-for="item in this.roles">
           <div class="setting">
             <i class="el-icon-setting"></i>
-            <span style="margin-right:20px" @click="onClick">权限配置</span>
+            <span style="margin-right:20px" @click="onClick(item.id)">权限配置</span>
           </div>
           <div class="avatar">
             <img v-if="item.name == '子管理员'" src="../../assets/img/pc1.png" alt=""/>
@@ -132,7 +133,7 @@
           </div>
           <div class="btnBox">
             <el-button @click="addStaff(item.id)">新增用户</el-button>
-            <el-button>用户管理</el-button>
+            <el-button @click="onClickManagement(item.id)">用户管理</el-button>
           </div>
         </div>
 
@@ -145,6 +146,7 @@
 import EditRole from "./components/EditRole.vue";
 import PermissionSettings from "./components/PermissionSettings.vue";
 import { getRoles, setRoleStatus,getRolesList } from "@/api/role/role";
+import UserManagement from "./components/UserManagement.vue";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import AddRole from './components/AddRole'
 
@@ -153,7 +155,8 @@ export default {
     AddRole,
     EditRole,
     BreadCrumb,
-    PermissionSettings
+    PermissionSettings,
+    UserManagement
   },
   data: function() {
     return {
@@ -278,8 +281,11 @@ export default {
     },
     ///
 
-    onClick() {
-      this.$refs.permission_settings.show();
+    onClick(role_id) {
+      this.$refs.permission_settings.show(role_id);
+    },
+    onClickManagement(role_id) {
+      this.$refs.user_management.show(role_id);
     }
   }
 };