添加和编辑角色

src/api/filter.js

@@ -5,16 +5,16 @@ export function filterUser(query) {
   return request({
     url: '/v1/user/filter-user',
     method: 'get',
-    params: query
+    data: query
   })
 }
 
 // 删除角色
 export function deleteRole(id) {
   return request({
-    url: '/v1/admin/role-delete/'+id,
+    url: '/v1/admin/role-delete/' + id,
     method: 'get',
-    params: {}
+    data: {}
   })
 }
 
@@ -23,7 +23,7 @@ export function batchDeleteRole(query) {
   return request({
     url: '/v1/admin/role-delete',
     method: 'post',
-    params: query
+    data: query
   })
 }
 
@@ -32,6 +32,24 @@ export function adminRole(query) {
   return request({
     url: '/v1/admin/role',
     method: 'get',
-    params: query
+    data: query
+  })
+}
+
+// 编辑角色获取详情
+export function roleDetail(id) {
+  return request({
+    url: '/v1/admin/role-edit/'+id,
+    method: 'get',
+    data: {}
+  })
+}
+
+//添加/编辑角色
+export function addOREditRole(path,query) {
+  return request({
+    url: '/v1/'+path,
+    method: 'post',
+    data: query
   })
 }

src/lang/en.js

@@ -201,41 +201,42 @@ export default {
     createdAt: '创建时间',
     updatedAt: '更新时间',
     actionThisData: '操作该数据',
-    selectType:"筛选类型",
-    selectFunction:'筛选方式',
-    selectDate:'选择日期',
-    selectMonth:'选择月份',
-    pleaseInputContent:'请输入内容',
-    relation:'关系',
-    reset:'重置',
+    selectType: '筛选类型',
+    selectFunction: '筛选方式',
+    selectDate: '选择日期',
+    selectMonth: '选择月份',
+    pleaseInputContent: '请输入内容',
+    relation: '关系',
+    reset: '重置',
+    desc:'描述',
   },
 
-  filter:{
-    memberSelect:'会员筛选',
-    memberNumber:'会员编号',
-    name:'姓名',
-    idNumber:'证件号码',
-    phoneNumber:'手机号码',
-    memberLevel:'会员级别',
-    level:'级别',
-    confirmSelect:'确认筛选',
-    memberName:'会员姓名',
-    ID:'身份证',
-    addAt:'加入时间',
-    pleaseSelectDecLevel:'请选择报单级别',
-    pleaseSelectEmpLevel:'请选择级别',
-    eq:'等于',
-    like:'包含',
-    noeq:'不等于',
-    nolike:'不包含',
-    moreThan:'大于',
-    moreThanEq:'大于等于',
-    less:'小于',
-    lessThan:'小于等于',
-    and:'并且',
-    or:'或者',
-    selectContentNotice:'请填写完整筛选内容',
-    areaSelectNotice:'地区仅限于"等于"的筛选方式',
+  filter: {
+    memberSelect: '会员筛选',
+    memberNumber: '会员编号',
+    name: '姓名',
+    idNumber: '证件号码',
+    phoneNumber: '手机号码',
+    memberLevel: '会员级别',
+    level: '级别',
+    confirmSelect: '确认筛选',
+    memberName: '会员姓名',
+    ID: '身份证',
+    addAt: '加入时间',
+    pleaseSelectDecLevel: '请选择报单级别',
+    pleaseSelectEmpLevel: '请选择级别',
+    eq: '等于',
+    like: '包含',
+    noeq: '不等于',
+    nolike: '不包含',
+    moreThan: '大于',
+    moreThanEq: '大于等于',
+    less: '小于',
+    lessThan: '小于等于',
+    and: '并且',
+    or: '或者',
+    selectContentNotice: '请填写完整筛选内容',
+    areaSelectNotice: '地区仅限于"等于"的筛选方式'
   },
 
   menu: {
@@ -332,14 +333,15 @@ export default {
   },
 
   // 管理员管理
-  Administrator:{
+  Administrator: {
     role: '角色',
-    remark:'备注',
-    creatUser:'创建人',
-    creatAt:'创建时间',
-    updateUser:'修改人',
-    updateAt:'修改时间',
-    addRole:'添加角色',
-    selectData:'所选数据',
+    remark: '备注',
+    creatUser: '创建人',
+    creatAt: '创建时间',
+    updateUser: '修改人',
+    updateAt: '修改时间',
+    addRole: '添加角色',
+    selectData: '所选数据',
+    roleName:'角色名称',
   }
 }

src/lang/zh.js

@@ -84,7 +84,7 @@ export default {
     github: 'Github 地址'
   },
   permission: {
-    permission:'权限',
+    permission: '权限',
     addRole: '新增角色',
     editPermission: '编辑权限',
     roles: '你的权限',
@@ -173,7 +173,7 @@ export default {
   },
 
   common: {
-    screen:'筛选',
+    screen: '筛选',
     save: '保存',
     modify: '修改',
     submit: '提交',
@@ -203,41 +203,42 @@ export default {
     createdAt: '创建时间',
     updatedAt: '更新时间',
     actionThisData: '操作该数据',
-    selectType:"筛选类型",
-    selectFunction:'筛选方式',
-    selectDate:'选择日期',
-    selectMonth:'选择月份',
-    pleaseInputContent:'请输入内容',
-    relation:'关系',
-    reset:'重置',
+    selectType: '筛选类型',
+    selectFunction: '筛选方式',
+    selectDate: '选择日期',
+    selectMonth: '选择月份',
+    pleaseInputContent: '请输入内容',
+    relation: '关系',
+    reset: '重置',
+    desc:'描述',
   },
 
-  filter:{
-    memberSelect:'会员筛选',
-    memberNumber:'会员编号',
-    name:'姓名',
-    idNumber:'证件号码',
-    phoneNumber:'手机号码',
-    memberLevel:'会员级别',
-    level:'级别',
-    confirmSelect:'确认筛选',
-    memberName:'会员姓名',
-    ID:'身份证',
-    addAt:'加入时间',
-    pleaseSelectDecLevel:'请选择报单级别',
-    pleaseSelectEmpLevel:'请选择级别',
-    eq:'等于',
-    like:'包含',
-    noeq:'不等于',
-    nolike:'不包含',
-    moreThan:'大于',
-    moreThanEq:'大于等于',
-    less:'小于',
-    lessThan:'小于等于',
-    and:'并且',
-    or:'或者',
-    selectContentNotice:'请填写完整筛选内容',
-    areaSelectNotice:'地区仅限于"等于"的筛选方式',
+  filter: {
+    memberSelect: '会员筛选',
+    memberNumber: '会员编号',
+    name: '姓名',
+    idNumber: '证件号码',
+    phoneNumber: '手机号码',
+    memberLevel: '会员级别',
+    level: '级别',
+    confirmSelect: '确认筛选',
+    memberName: '会员姓名',
+    ID: '身份证',
+    addAt: '加入时间',
+    pleaseSelectDecLevel: '请选择报单级别',
+    pleaseSelectEmpLevel: '请选择级别',
+    eq: '等于',
+    like: '包含',
+    noeq: '不等于',
+    nolike: '不包含',
+    moreThan: '大于',
+    moreThanEq: '大于等于',
+    less: '小于',
+    lessThan: '小于等于',
+    and: '并且',
+    or: '或者',
+    selectContentNotice: '请填写完整筛选内容',
+    areaSelectNotice: '地区仅限于"等于"的筛选方式'
   },
 
   // 菜单
@@ -335,15 +336,16 @@ export default {
   },
 
   // 管理员管理
-  Administrator:{
+  Administrator: {
     role: '角色',
-    remark:'备注',
-    creatUser:'创建人',
-    creatAt:'创建时间',
-    updateUser:'修改人',
-    updateAt:'修改时间',
-    addRole:'添加角色',
-    selectData:'所选数据',
+    remark: '备注',
+    creatUser: '创建人',
+    creatAt: '创建时间',
+    updateUser: '修改人',
+    updateAt: '修改时间',
+    addRole: '添加角色',
+    selectData: '所选数据',
+    roleName:'角色名称',
   }
 
 }

src/router/index.js

@@ -56,6 +56,15 @@ export const constantRoutes = [
       {
         path: '/admin/role',
         component: () => import('@/views/admin/role')
+      },
+      {
+        path: '/admin/role-add',
+        component: () => import('@/views/admin/role-add')
+      },
+      {
+        path: '/admin/role-edit/:id',
+        name: 'admin_role-edit',
+        component: () => import('@/views/admin/role-add')
       }
     ]
   },

src/views/admin/role-add.vue

@@ -0,0 +1,79 @@
+<template>
+    <div v-loading="loading">
+      <div class="white-box">
+        <el-form ref="form" :model="form" label-width="250px" class="form-page">
+          <el-form-item :label="$t('Administrator.roleName')">
+            <el-input v-model="form.roleName"></el-input>
+          </el-form-item>
+          <el-form-item :label="$t('common.desc')">
+            <el-input v-model="form.remark"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" :loading="submitButtonStat" @click="onSubmit">{{ $t('common.save') }}</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+  </template>
+  
+  <script>
+  roleDetail
+  import { roleDetail,addOREditRole } from '@/api/filter'
+  export default {
+    name: 'role-add',
+    mounted () {
+      if (this.$route.name === 'admin_role-edit') {
+        roleDetail(this.$route.params.id).then(response => {
+            this.form.roleName = response.data.ROLE_NAME
+            this.form.remark = response.data.REMARK
+            this.loading = false
+        }).catch(err => {
+          console.log('err---------' + err)
+        })
+      }
+    },
+    data () {
+      return {
+        form: {
+          roleName:null,
+          remark:null,
+        },
+        loading: false,
+        submitButtonStat: false,
+      }
+    },
+    methods: {
+      onSubmit () {
+        this.submitButtonStat = true
+        let path = 'admin/role-add'
+        if (this.$route.name === 'admin_role-edit') {
+          path = 'admin/role-edit/' + this.$route.params.id
+        }
+        addOREditRole(path,this.form).then(response => {
+          this.submitButtonStat = false
+          this.$message({
+            message: response.data,
+            type: 'success'
+          })
+          this.$router.go(-1)
+        }).catch(err => {
+          console.log('err---------' + err)
+        })
+        // network.postData(path, this.form).then(response => {
+        //   this.submitButtonStat = false
+        //   this.$message({
+        //     message: response,
+        //     type: 'success'
+        //   })
+        //   this.$router.go(-1)
+        // }).catch(() => {
+        //   this.submitButtonStat = false
+        // })
+      }
+    }
+  }
+  </script>
+  
+  <style scoped>
+  
+  </style>

src/views/admin/role.vue

@@ -62,7 +62,7 @@
           </el-dropdown-menu>
         </el-dropdown>
         <el-button v-if="permission.hasPermission(`admin/role-add`)" type="primary" size="small" icon="el-icon-plus" @click="onAdd">{{ $t('Administrator.addRole') }}</el-button>
-        <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
+        <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
       </div>
     </div>
   </div>
@@ -149,7 +149,7 @@ export default {
           })
           this.getData()
         }).catch(err => {
-          console.log('err---------'+err)
+          console.log('err---------' + err)
         })
 
         // network.getData(`admin/role-delete/${id}`).then(response => {
@@ -181,7 +181,7 @@ export default {
             })
             this.getData()
           }).catch(err => {
-            console.log('err---------'+err)
+            console.log('err---------' + err)
           })
           //   network.postData(`admin/role-delete`, {
           //     selected: selectedIds
@@ -204,20 +204,20 @@ export default {
     getData(page, pageSize) {
       const filterData = this.filterModel
       const vueObj = this
-      let paramsData = Object.assign({
+      const paramsData = Object.assign({
         page: (page === null || page == undefined) ? 1 : page,
-        pageSize: (pageSize === null || pageSize == undefined) ? vueObj.pageSize : pageSize,
+        pageSize: (pageSize === null || pageSize == undefined) ? vueObj.pageSize : pageSize
       }, filterData)
       adminRole(paramsData).then(response => {
-        vueObj.tableData=response.data.list
-        vueObj.currentPage=page
-        vueObj.totalPages=parseInt(response.data.totalPages)
-        vueObj.totalCount=parseInt(response.data.totalCount)
+        vueObj.tableData = response.data.list
+        vueObj.currentPage = page
+        vueObj.totalPages = parseInt(response.data.totalPages)
+        vueObj.totalCount = parseInt(response.data.totalCount)
         vueObj.pageSize = pageSize
-        this.loading=false;
+        this.loading = false
       }).catch(err => {
-          console.log('err============='+err)
-          this.loading=false;
+        console.log('err=============' + err)
+        this.loading = false
       })
       //   network.getPageData(this, 'admin/role', page, pageSize, filterData, function (response) {
       //     vueObj.allData = response