管理员功能增加

public/Index.vue

@@ -219,9 +219,12 @@ export default {
   },
   computed: {
     currentUser () {
+      console.log(this.$store.getters)
       return {
         name: this.$store.getters.nickname,
-        avatar: this.$store.getters.avatar
+        avatar: this.$store.getters.avatar,
+        isManage: this.$store.getters.isManage,
+        username: this.$store.getters.username
       }
     }
   },

src/api/permissions.js

@@ -1,10 +1,45 @@
 import request from '@/utils/request'
 
 // 用户列表
-export function getList (parameter) {
+export function getMiddlesManageUsers (parameter) {
   return request({
-    url: '/middles/user/children',
+    url: '/middles/manage/users',
     method: 'get',
     params: parameter
   })
 }
+
+// 新增管理账号
+export function addMiddlesManageUser (parameter) {
+  return request({
+    url: '/middles/manage/users',
+    method: 'post',
+    params: parameter
+  })
+}
+
+// 修改管理账号
+export function editMiddlesManageUser (middleId, parameter) {
+  return request({
+    url: `/middles/manage/users/${middleId}`,
+    method: 'put',
+    params: parameter
+  })
+}
+
+// 删除管理账号
+export function delMiddlesManageUser (middleId) {
+    return request({
+      url: `/middles/manage/users/${middleId}`,
+      method: 'DELETE'
+    })
+}
+
+// 删除管理账号
+export function setMiddlesManageUserStatus (middleId, parameter) {
+  return request({
+    url: `/middles/manage/users/${middleId}/set_status`,
+    method: 'post',
+    params: parameter
+  })
+}

src/components/GlobalHeader/AvatarDropdown.vue

@@ -14,9 +14,9 @@
             <a-icon type="lock" />
             修改密码
           </a-menu-item>
-          <a-menu-item key="changePermission" @click="goPermission">
+          <a-menu-item v-if="currentUser.isManage" key="changePermission" @click="goPermission">
             <a-icon type="setting" />
-            权限管理
+            管理员管理
           </a-menu-item>
           <a-menu-item key="logout" @click="handleLogout">
             <a-icon type="logout" />

src/components/GlobalHeader/RightContent.vue

@@ -60,6 +60,7 @@ export default {
       return {
         name: this.$store.getters.nickname,
         avatar: this.$store.getters.avatar,
+        isManage: this.$store.getters.isManage,
         username: this.$store.getters.username
       }
     }

src/config/routes/permission.js

@@ -14,7 +14,7 @@ export default [
     component: () => import('@/views/permissions/Index'),
     hidden: true,
     meta: {
-        title: '权限管理',
+        title: '管理员管理',
         icon: 'cluster'
     }
   }

src/store/getters.js

@@ -8,6 +8,7 @@ const getters = {
   user_id: state => state.user.user_id,
   username: state => state.user.username,
   nickname: state => state.user.nickname,
+  isManage: state => state.user.is_manage,
   roles: state => state.user.roles,
   userInfo: state => state.user.info,
   addRouters: state => state.permission.addRouters,

src/store/modules/user.js

@@ -10,6 +10,7 @@ const user = {
     username: '',
     nickname: '',
     avatar: '',
+    is_manage: false,
     roles: [],
     info: {}
   },
@@ -33,6 +34,9 @@ const user = {
     SET_NICKNAME: (state, name) => {
       state.nickname = name
     },
+    SET_IS_MANAGE: (state, isManage) => {
+      state.is_manage = isManage
+    },
     SET_AVATAR: (state, avatar) => {
       state.avatar = avatar
     },
@@ -85,13 +89,10 @@ const user = {
     GetMiddleUser ({ commit }) {
       return new Promise((resolve, reject) => {
         getMiddleUser().then(res => {
-          // storage.set('middleground_id', res.middleground_id)
           commit('SET_USER_ID', res.middleground_id)
-          // commit('SET_USERTYPE', res.type)
           commit('SET_USERNAME', res.username)
           commit('SET_NICKNAME', res.name)
-          // commit('SET_AVATAR', res.avatar || '')
+          commit('SET_IS_MANAGE', res.is_manage)
-          // commit('SET_INFO', res || '')
           resolve(res)
         }).catch(error => {
           reject(error)
@@ -105,6 +106,7 @@ const user = {
         commit('SET_TOKEN', '')
         commit('SET_ORG_ID', '')
         commit('is_subscribe', '')
+        commit('SET_IS_MANAGE', false)
         commit('SET_ROLES', [])
         storage.remove(ACCESS_TOKEN)
         storage.remove('is_subscribe')

src/views/exception/noRight.vue

@@ -0,0 +1,18 @@
+<template>
+  <a-result status="403" title="403" sub-title="Sorry，您当前没有权限操作这些~">
+    <template #extra>
+      <a-button type="primary" @click="toHome">返回数据看板</a-button>
+    </template>
+  </a-result>
+</template>
+
+<script>
+export default {
+  name: 'NoRight',
+  methods: {
+    toHome () {
+      this.$router.replace({ name: 'Home' })
+    }
+  }
+}
+</script>

src/views/home/Index.vue

@@ -34,7 +34,9 @@ export default {
     currentUser () {
       return {
         name: this.$store.getters.nickname,
-        avatar: this.$store.getters.avatar
+        avatar: this.$store.getters.avatar,
+        isManage: this.$store.getters.isManage,
+        username: this.$store.getters.username
       }
     }
   },

src/views/permissions/Index.vue

@@ -2,26 +2,19 @@
   <page-header-wrapper>
     <!-- 有操作权限 -->
     <!-- v-if="$store.getters.hasPromissionsShow.permission" -->
-    <a-card :bordered="false" class="card">
+    <a-card :bordered="false" class="card" v-if="isManage">
       <a-row>
         <a-col :span="24">
           <div class="table-page-search-wrapper">
             <a-form layout="inline">
               <a-row :gutter="24">
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="用户角色">
-                    <a-select placeholder="请选择" v-model="queryParam.identity_id">
-                      <a-select-option v-for="item in indentitys" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
-                    </a-select>
-                  </a-form-item>
-                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="用户姓名">
                     <a-input v-model="queryParam.name" placeholder="" />
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="用户手机">
+                  <a-form-item label="登录账号">
                     <a-input v-model="queryParam.username" placeholder="" />
                   </a-form-item>
                 </a-col>
@@ -37,29 +30,21 @@
             ref="table"
             :columns="columns"
             :data="loadData"
-            :rowKey="row => row.user.user_id"
+            :rowKey="row => row.middleground_id"
             showPagination="auto"
             bordered
             size="default"
           >
-            <div slot="name" slot-scope="text, record">
+            <div slot="status" slot-scope="text, record">
-              <div>{{ record.name }}</div>
+              <a-switch :default-checked="record.status.value ===1? true : false" checked-children="可以登录" un-checked-children="禁止登录" @change="switchChange(record,$event)" />
-              <div>{{ record.username }}</div>
             </div>
-            <div slot="type" slot-scope="text, record">{{ record.type }}</div>
+
-            <!-- <div slot="status" class="status">
-              <div class="status-item">初审中 <a> (0) </a></div><a-divider type="vertical" />
-              <div class="status-item">复审中 <a> (0) </a></div>
-              <a-divider type="vertical" />
-              <div class="status-item">待签收 <a> (0) </a></div><a-divider type="vertical" />
-              <div class="status-item">办理中 <a> (0) </a></div>
-            </div> -->
             <div slot="actions" slot-scope="text, record">
               <a @click="EditPromissions(record)">修改</a>
               <a-divider type="vertical" />
               <a-popconfirm
                 placement="left"
-                title="是否确认删除该角色?"
+                title="是否确认删除该用户?"
                 ok-text="OK"
                 cancel-text="NO"
                 @confirm="delPromissions(record)"
@@ -72,39 +57,44 @@
       </a-row>
     </a-card>
     <!-- 没有操作权限限制 -->
-    <!-- <NoPromissions /> -->
+    <NoRight v-else />
   </page-header-wrapper>
 </template>
 
 <script>
 import { STable, UserInfo } from '@/components'
 import DeriveButton from '@/components/OrderDetailInfo/DeriveButton'
-import { getList } from '@/api/permissions'
+import { getMiddlesManageUsers, delMiddlesManageUser, setMiddlesManageUserStatus } from '@/api/permissions'
 import AddPromissions from './modules/AddPromissions'
 import EditPromissions from './modules/EditPromissions'
-import AssignmentChange from './modules/AssignmentChange'
+import NoRight from '@/views/exception/noRight'
-// import NoPromissions from '@/views/exception/noRight'
 
 const columns = [
   {
     title: '用户ID',
-    dataIndex: 'staff_id',
+    dataIndex: 'middleground_id',
     align: 'center',
     width: 120
   },
   {
     title: '用户姓名',
     key: 'name',
-    scopedSlots: { customRender: 'name' },
+    dataIndex: 'name',
     align: 'center',
     width: 200
   },
   {
-    title: '用户角色',
+    title: '登录账号',
-    scopedSlots: { customRender: 'type' },
+    dataIndex: 'username',
     align: 'center',
     width: 160
   },
+  {
+    title: '用户状态',
+    scopedSlots: { customRender: 'status' },
+    align: 'center',
+    width: 120
+  },
   {
     title: '创建时间',
     dataIndex: 'created_at',
@@ -127,54 +117,25 @@ export default {
     DeriveButton,
     AddPromissions,
     EditPromissions,
-    AssignmentChange
+    NoRight
-    // NoPromissions
     },
     data () {
     this.columns = columns
     return {
-        indentitys: [
-            { id: 1, name: '普通用户' },
-            { id: 2, name: 'VIP' },
-            { id: 4, name: '创客' },
-            { id: 6, name: '代理商' }
-        ], // 业务类型
         queryParam: {
-            identity_id: undefined,
             name: undefined,
             username: undefined
         },
-        permission: false, // 展示展示分配权限
+        isManage: this.$store.getters.isManage, // 展示展示分配权限
         loadData: parameter => {
             const requestParameters = Object.assign({}, parameter, this.queryParam)
-            return getList(requestParameters)
+            return getMiddlesManageUsers(requestParameters)
         }
     }
 },
     methods: {
-    // 确认删除权限
+
-    delPromissions (item) {
+    // 新增用户
-    //   delDepartsUser(item.staff_id).then(res => {
-            this.$refs.table.loadData()
-            this.$notification.success({
-            message: '成功',
-            description: '删除成功'
-            })
-            this.staffDeparts()
-        // }).catch(err => {
-        //   this.$notification.error(err)
-        // })
-    },
-    // 重置搜索列表
-    resetSearch () {
-        this.queryParam = {
-            username: undefined,
-            name: undefined,
-            identity_id: undefined
-        }
-        this.$refs.table.refresh(true) // 重置接口且刷先到第一页
-    },
-    // 新增权限
     addPromissions () {
         this.$dialog(
         AddPromissions,
@@ -182,7 +143,6 @@ export default {
             on: {
                 ok: () => {
                     this.$refs.table.refresh(true)
-                    this.staffDeparts()
                 }
             }
         },
@@ -196,7 +156,7 @@ export default {
         }
         )
     },
-    // 编辑权限
+    // 编辑用户
     EditPromissions (item) {
         this.$dialog(
         EditPromissions,
@@ -218,35 +178,42 @@ export default {
         }
         )
     },
-    // 指派订单
+     // 删除
-    Assignment (item) {
+    delPromissions (item) {
-        const order = {
+      delMiddlesManageUser(item.middleground_id).then(res => {
-        item: item,
+            this.$refs.table.loadData()
-        orderId: this.id,
+            this.$notification.success({
-        type: this.promissions
+              message: '成功',
-        }
+              description: '删除成功'
-        this.$dialog(
+            })
-        AssignmentChange,
+        }).catch(err => {
-        {
+          this.$notification.error(err)
-            order,
+        })
-            on: {
+    },
-            ok: () => {
+    // 重置搜索列表
-                this.$refs.table.loadData()
+    resetSearch () {
-              // this.getInfo()
+      this.queryParam = {
-            }
+          username: undefined,
-            }
+          name: undefined
-        },
+      }
-        {
+      this.$refs.table.refresh(true) // 重置接口且刷先到第一页
-            title: '指派订单',
+    },
-            width: 500,
+    // 更改状态
-            maskClosable: true,
+    switchChange (record, e) {
-            closable: true,
+      const data = {
-            okText: '确认指派',
+        status: (e ? 1 : 0)
-            cancelText: '取消'
+      }
-        }
+      setMiddlesManageUserStatus(record.middleground_id, data).then(res => {
-        )
+        this.$notification.success({
-    }
+          message: '成功',
+          description: res
+        })
+        this.$refs.table.loadData()
+      }).catch(err => {
+          this.$notification.error(err)
+        })
     }
+  }
 }
 </script>
 

src/views/permissions/modules/AddPromissions.vue

@@ -44,7 +44,7 @@
 </template>
 
 <script>
-// import { addPreDepartUser, addDepartsUser } from '@/api/permissions'
+import { addMiddlesManageUser } from '@/api/permissions'
 import moment from 'moment'
 export default {
   name: 'OperationAdd',
@@ -53,48 +53,31 @@ export default {
       labelCol: { span: 6 },
       wrapperCol: { span: 14 }
     },
-    loading: false,
+    loading: false
-    permission: [],
-    users: []
   }),
   beforeCreate () {
     this.form = this.$form.createForm(this)
   },
-  created () {
-    this.getBase('')
-  },
   methods: {
     moment,
-    getBase (key) {
-      // addPreDepartUser({ key: key }).then(res => {
-      //   if (key === '') {
-      //     this.permission = res.permission
-      //   } else {
-      //     this.users = res.users
-      //   }
-      // })
-    },
-    handleRoleChange (value) {
-      this.getBase(value + '')
-    },
     onOk () {
       return new Promise(resolve => {
         this.form.validateFields((errors, values) => {
           values.password = values.password || '111111'
           if (!errors) {
-            // addDepartsUser(values).then((res) => {
+            addMiddlesManageUser(values).then((res) => {
-            //   this.$notification.success({
+              this.$notification.success({
-            //     message: '成功',
+                message: '成功',
-            //     description: '添加成功'
+                description: '添加成功'
-            //   })
+              })
-            //   resolve(true)
+              resolve(true)
-            // }).catch((err) => {
+            }).catch((err) => {
-            //   this.$notification.error({
+              this.$notification.error({
-            //     message: '失败',
+                message: '失败',
-            //     description: err.message
+                description: err.message
-            //   })
+              })
-            //   resolve(false)
+              resolve(false)
-            // })
+            })
           }
         })
       })

src/views/permissions/modules/AssignmentChange.vue

@@ -1,107 +0,0 @@
-<template>
-  <a-form ref="form" v-bind="formItemLayout" :form="form">
-    <a-form-item label="指派人员">
-      <a-select
-        v-decorator="[
-          'role',
-          {
-            rules: [
-              { required: true, message: '请选择指派人员！', type: 'string' },
-            ]
-          }
-        ]"
-        placeholder="请选择指派人员！">
-        <a-select-option
-          :value="item.key"
-          v-for="item in order.type[1].children"
-          :key="item.key">
-          <a-icon
-            type="user"
-            :style="{ fontSize: '14px', color: '#1890ff', padding: '6px 16px 6px 0' }" />{{ item.title }}</a-select-option>
-      </a-select>
-    </a-form-item>
-    <a-form-item label="备注信息">
-      <a-textarea
-        :rows="4"
-        v-decorator="[
-          'description',
-          {
-            rules: [
-              { required: true, message: '请输入备注信息!', type: 'string' },
-            ]
-          }
-        ]"
-        placeholder="请输入备注信息!" />
-    </a-form-item>
-  </a-form>
-</template>
-
-<script>
-// import { doLogs } from '@/api/order'
-import moment from 'moment'
-export default {
-  name: 'AssignmentAdd',
-  props: {
-    order: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    }
-  },
-  data: () => ({
-    formItemLayout: {
-      labelCol: { span: 6 },
-      wrapperCol: { span: 14 }
-    },
-    loading: false,
-    expressList: []
-  }),
-  beforeCreate () {
-    this.form = this.$form.createForm(this)
-  },
-  created () {
-    // getExpressCommonList(this.order.order_no).then(res => {
-    //   this.expressList = res
-    // })
-  },
-  methods: {
-    moment,
-    onChange (date, dateString) {
-    },
-    onOk () {
-      return new Promise(resolve => {
-        this.form.validateFields((errors, values) => {
-          values.password = values.password || '111111'
-
-          if (!errors) {
-            // doLogs(this.order.orderId, params).then((res) => {
-            //   this.$notification.success({
-            //     message: '成功',
-            //     description: '添加记录成功'
-            //   })
-              resolve(true)
-            // }).catch((err) => {
-            //   this.$notification.error({
-            //     message: '失败',
-            //     description: err.message
-            //   })
-            //   resolve(false)
-            // })
-          }
-        })
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-.flexrow {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  box-sizing: border-box;
-}
-</style>

src/views/permissions/modules/EditPromissions.vue

@@ -1,6 +1,20 @@
 <!-- 驳回原因客户姓名输入 -->
 <template>
   <a-form ref="form" v-bind="formItemLayout" :form="form">
+    <a-form-item label="登录账号">
+      <a-input
+        :maxLength="11"
+        :disabled="true"
+        v-decorator="[
+          'username',
+          {
+            rules: [
+              { required: true, message: '请输入添加登录账号!', type: 'string' },
+            ]
+          }
+        ]"
+        placeholder="请输入添加登录账号!" />
+    </a-form-item>
     <a-form-item label="用户姓名">
       <a-input
         :rows="4"
@@ -14,19 +28,6 @@
         ]"
         placeholder="请输入添加姓名!" />
     </a-form-item>
-    <a-form-item label="手机号码">
-      <a-input
-        :maxLength="11"
-        v-decorator="[
-          'username',
-          {
-            rules: [
-              { required: true, message: '请输入添加手机号码!', type: 'string' },
-            ]
-          }
-        ]"
-        placeholder="请输入添加手机号码!" />
-    </a-form-item>
     <a-form-item label="初始密码">
       <a-input
         :maxLength="6"
@@ -44,7 +45,7 @@
 </template>
 
 <script>
-// import { addPreDepartUser, editDepartsUser, getDefaultUserInfo } from '@/api/permissions'
+import { editMiddlesManageUser } from '@/api/permissions'
 import moment from 'moment'
 export default {
   name: 'EditPromissions',
@@ -53,13 +54,7 @@ export default {
       labelCol: { span: 6 },
       wrapperCol: { span: 14 }
     },
-    loading: false,
+    loading: false
-    permissions: [],
-    users: [],
-    defaultRoleKey: '', // 默认role 的 key
-    defaultRoleName: '', // 默认显示下拉姓名
-    defaultParentsKey: '', // 默认Parents 的 key
-    defaultParentsName: '' // 默认显示下拉姓名
   }),
   props: {
     item: {
@@ -69,77 +64,41 @@ export default {
       }
     }
   },
+  mounted () {
+    this.$nextTick(() => {
+      this.form.setFieldsValue({
+        name: this.item.name,
+        username: this.item.username
+      })
+    })
+  },
   beforeCreate () {
     this.form = this.$form.createForm(this)
   },
-  mounted () {
-    this.getBase('')
-    // getDefaultUserInfo(this.item.staff_id).then(res => {
-    //   this.$nextTick(() => {
-    //     this.form.setFieldsValue({
-    //       name: res.name,
-    //       username: res.username
-    //       // role: res.type.key
-    //       // address: res.address
-    //     })
-    //     this.defaultRoleKey = res.type.key
-    //     this.defaultRoleName = res.type.text
-    //     this.defaultParentsKey = res.parent_id
-    //   })
-    //   this.getBase(res.type.key)
-    // }).catch(err => {
-    //   console.log(err)
-    // })
-  },
   methods: {
     moment,
-    getBase (key) {
-      // addPreDepartUser({ key: key }).then(res => {
-      //   if (key === '') {
-      //     this.permissions = res.permission
-      //   } else {
-      //     this.users = res.users
-      //     const index = res.users.findIndex(item => item.staff_id === this.defaultParentsKey)
-      //     if (index >= 0) {
-      //       this.defaultParentsName = res.users[index].name + '(' + res.users[index].type + ')' + res.users[index].username
-      //     }
-      //   }
-      // })
-    },
-    handleRoleChange (value) {
-      this.getBase(value + '')
-      this.defaultParentsKey = ''
-      this.defaultParentsName = ''
-      this.defaultRoleKey = ''
-      this.defaultRoleName = ''
-      this.form.setFieldsValue({
-        parent_id: ''
-      })
-    },
     onOk () {
       return new Promise(resolve => {
         this.form.validateFields((errors, values) => {
-          // const data = {
+          const data = {
-          //   name: values.name,
+            name: values.name,
-          //   password: values.password || '111111',
+            password: values.password || '111111',
-          //   username: values.username,
+            username: values.username
-          //   role: this.defaultRoleKey || values.role,
+          }
-          //   parent_id: this.defaultParentsKey || values.parent_id
-          // }
           if (!errors) {
-            // editDepartsUser(this.item.staff_id, data).then((res) => {
+            editMiddlesManageUser(this.item.middleground_id, data).then((res) => {
-            //   this.$notification.success({
+              this.$notification.success({
-            //     message: '成功',
+                message: '成功',
-            //     description: '修改成功'
+                description: '修改成功'
-            //   })
+              })
-            //   resolve(true)
+              resolve(true)
-            // }).catch((err) => {
+            }).catch((err) => {
-            //   this.$notification.error({
+              this.$notification.error({
-            //     message: '失败',
+                message: '失败',
-            //     description: err.message
+                description: err.message
-            //   })
+              })
-            //   resolve(false)
+              resolve(false)
-            // })
+            })
           }
         })
       })