0822PM

src/pages/system/page.js

@@ -6,8 +6,7 @@ import userManager from './systemSet/userManager/index' // 用户管理
 import addUser from './systemSet/userManager/add' // 添加用户
 import editUser from './systemSet/userManager/edit' // 编辑用户
 import roleManager from './systemSet/roleManager/index' // 角色管理
-import addRole from './systemSet/roleManager/add' // 添加角色
-import editRole from './systemSet/roleManager/edit' // 编辑角色
+import editRole from './systemSet/roleManager/add' // 编辑角色
 
 import caseManager from './caseManager/index' // 案场管理
 import caseInfo from './caseManager/caseInfo/index' // 案场信息
@@ -92,12 +91,7 @@ export default {
           path: 'roleManager',
           name: 'roleManager',
           component: roleManager,
-          children: [{ // 添加角色
-            path: 'addRole',
-            name: 'addRole',
-            component: addRole,
-            children: []
-          }, { // 编辑角色
+          children: [{ // 编辑角色
             path: 'editRole',
             name: 'editRole',
             component: editRole,

src/pages/system/systemSet/roleManager/add.vue

@@ -61,6 +61,7 @@ export default {
       'GetRoleByID',
       'AddRole',
       'UpdateRole',
+      'SetRoleNull',
     ]),
     submit () {
       if ((this.detail.RoleId || '') === '') {
@@ -76,6 +77,12 @@ export default {
     }
   },
   beforeMount () {
+    const { id } = this.$route.query
+    if (id && id !== '') {
+      this.GetRoleByID({ roleid: id })
+    } else {
+      this.SetRoleNull()
+    }
   }
 }
 </script>

src/pages/system/systemSet/roleManager/edit.vue

@@ -1,67 +0,0 @@
-<template>
-  <div class="subPage">
-    <form class="mainForm">
-      <ul>
-        <li class="flex-h">
-          <span>角色名称：</span>
-          <div class="flex-item">
-            <div style="width:50%">
-              <el-input
-                placeholder="请输入角色名称"
-                v-model="postData.roleName"
-                clearable>
-              </el-input>
-            </div>
-          </div>
-        </li>
-        <li class="flex-h">
-          <span>备注：</span>
-          <div class="flex-item">
-            <div>
-              <el-input
-                placeholder="请输入备注"
-                type="textarea"
-                :autosize="{ minRows: 3, maxRows: 5}"
-                v-model="postData.remark"
-                clearable>
-              </el-input>
-            </div>
-          </div>
-        </li>
-        <li style="text-align:center">
-          <el-button type="primary" size="mini" @click='submit'>保存</el-button>
-          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
-        </li>
-      </ul>
-    </form>
-  </div>
-</template>
-
-<script>
-export default {
-  name: '',
-  data () {
-    return {
-      postData: {
-        roleId: '', // 角色名
-        roleName: '', // 角色姓名
-        remark: '' // 备注
-      },
-    }
-  },
-  components: {},
-  methods: {
-    submit () {
-      console.log(this.postData)
-    },
-    cancel () {
-      this.$router.go(-1)
-    }
-  },
-  mounted () { }
-}
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style lang="scss" scoped>
-</style>

src/pages/system/systemSet/roleManager/index.vue

@@ -3,9 +3,9 @@
     <div class="system-table-search">
       <div class="flex-h">
         <div class="flex-item flex-h">
-          <el-button size="mini" type="success" @click='addRole'>新增角色</el-button>
+          <el-button size="mini" type="success" @click='editRole'>新增角色</el-button>
         </div>
-        <tableSearch value='分配权限' @exportSearchKey="searchList"></tableSearch>
+        <tableSearch value='角色名称' @exportSearchKey="searchList"></tableSearch>
       </div>
       <div class="moreFilter"></div>
     </div>
@@ -13,7 +13,10 @@
       <el-table :data="roles.list" stripe style="width: 100%">
         <el-table-column prop="RoleName" label="角色名">
         </el-table-column>
-        <el-table-column prop="CreateDate" label="创建时间" width="300">
+        <el-table-column label="创建时间" width="300">
+          <template slot-scope="scope">
+            <label>{{FormatDate(scope.row.CreateDate)}}</label>
+          </template>
         </el-table-column>
         <el-table-column fixed='right' label="操作" width="300">
           <template slot-scope="scope">
@@ -90,8 +93,7 @@ export default {
     },
     handleEdit (index, row) {
       // 编辑
-      console.log(index, row)
-      this.$router.push({ name: 'editRole' })
+      this.$router.push({ name: 'editRole', query: { id: row.RoleId } })
     },
     handleDelete (index, row) {
       // 删除
@@ -122,8 +124,7 @@ export default {
       console.log(node)
     },
     searchList (key) {
-      // 搜索列表
-      console.log(key)
+      this.GetRolesList({name: key})
     },
     addRole () {
       this.$router.push({ name: 'addRole' })

src/store/system/role.js

@@ -12,13 +12,16 @@ export default {
       state.roleList = payload || []
     },
     updateInfo (state, payload) {
-      state.roleInfo = payload || []
+      state.roleInfo = payload || {}
     },
   },
   actions: {
-    GetRolesList ({ commit }) {
+    GetRolesList ({ commit }, payload) {
       ajax(api.role.list.url, {
-        method: api.role.list.method
+        method: api.role.list.method,
+        queryData: {
+          ...payload,
+        }
       }).then(res => {
         commit('updateList', res)
       })
@@ -60,6 +63,9 @@ export default {
         }
       }).then(res => {
       })
+    },
+    SetRoleNull ({ commit }) {
+      commit('updateInfo', {})
     }
   }
 }