完成

src/config/api.js

@@ -63,6 +63,10 @@ const apis = {
     deleteUserRole:{
       method:'post',
       url: `${commPrefix}/deleteUserRole`
+    },
+    updatePwd: {
+      method:'post',
+      url: `${commPrefix}/updatePwd`
     }
   },
   type: {

src/layout/default/User.vue

@@ -11,6 +11,7 @@
       </span>
       <el-dropdown-menu slot="dropdown">
         <!-- <el-dropdown-item command="resetPassword">重置密码</el-dropdown-item> -->
+        <el-dropdown-item command="showUpdatePwd">修改密码</el-dropdown-item>
         <el-dropdown-item command="logout">登出</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
@@ -33,6 +34,9 @@ export default {
         case 'logout':
           this.$emit('logout')
           break
+        case 'showUpdatePwd':
+          this.$emit('showUpdatePwd')
+          break
         default:
           // todo
       }

src/layout/default/index.vue

@@ -9,7 +9,7 @@
     <el-container>
       <el-header class="head">
         <div class="h-item">&nbsp;</div>
-        <user class="h-item-noflex" :user="userAuthority" :messages="[1]" @logout="logout" @resetPassword="resetPassword"></user>
+        <user class="h-item-noflex" :user="userAuthority" :messages="[1]" @logout="logout" @resetPassword="resetPassword" @showUpdatePwd="showUpdatePwd"></user>
       </el-header>
       <el-breadcrumb class="breadcrumb" separator-class="el-icon-arrow-right">
         <el-breadcrumb-item :to="{ name: 'index' }">首页</el-breadcrumb-item>
@@ -22,6 +22,25 @@
         <xm-footer company="荟房科技" />
       </el-footer>
     </el-container>
+    <el-dialog
+            title="修改密码"
+            :visible.sync="pwdDialogVisible"
+            width="25%"
+            :before-close="handleClose">
+      <el-form :model="fromPwd" status-icon :rules="rules" ref="ruleForm" label-width="100px">
+        <el-form-item label="旧密码" prop="oldPwd">
+          <el-input v-model="fromPwd.oldPwd" />
+        </el-form-item>
+        <el-form-item label="新密码" prop="newPwd">
+          <el-input v-model="fromPwd.newPwd" />
+        </el-form-item>
+      </el-form>
+
+      <span>
+      <el-button @click="pwdDialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="updatePwd">确 定</el-button>
+    </span>
+    </el-dialog>
   </el-container>
 </template>
 
@@ -42,6 +61,19 @@ export default {
       menus: [],
       menuArray: [],
       userAuthority: [],
+      fromPwd: {
+        oldPwd: '',
+        newPwd: ''
+      },
+      pwdDialogVisible: false,
+      rules: {
+        oldPwd: [
+          { required: true, message: '请输入旧密码', trigger: 'blur' }
+        ],
+        newPwd: [
+          { required: true, message: '请输入新密码', trigger: 'blur' }
+        ]
+      },
     }
   },
   computed: {
@@ -78,6 +110,9 @@ export default {
     this.menus = pages
   },
   methods: {
+    handleClose(done) {
+      done();
+    },
     isInMenuList(menu) {
       const m = this.menuArray.filter(x => x.name === menu.name)[0]
       if (!m) {
@@ -98,6 +133,18 @@ export default {
           }
         })
       })
+    },
+    showUpdatePwd() { // 显示修改密码框
+      this.pwdDialogVisible = true
+    },
+    updatePwd() {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          this.$store.dispatch('updatePwd', this.fromPwd).then(() => {
+            this.pwdDialogVisible = false
+          })
+        }
+      })
     }
   }
 }

src/store/modules/sysuser.js

@@ -60,7 +60,7 @@ export default {
     },
     addSysUser ( _, payload) {
       const dtStr = window.JSON.stringify(payload)
-      const api = lodash.get(apis, 'sysuser.edi.vue')
+      const api = lodash.get(apis, 'sysuser.add')
       return interact(api, dtStr)
     },
     editSysUser ( _, payload) {
@@ -139,6 +139,6 @@ export default {
           reject()
         })
       })
-    }
+    },
   }
 }

src/store/system.js

@@ -75,6 +75,16 @@ export default {
         commit('updateUser', {})
         // commit('syncState', { userLoged: false })
       })
+    },
+    updatePwd(_, payload) { // 修改密码
+      return new Promise((resolve, reject) => {
+        const api = lodash.get(apis, 'sysuser.updatePwd')
+        interact(api,payload).then((data) => {
+          resolve(data)
+        }).catch(() => {
+          reject()
+        })
+      })
     }
   }
 }

src/views/sysuser/edit.vue

@@ -1,6 +1,9 @@
 <template>
   <div>
     <el-form class="user-form" :rules="rules" :model="detail" ref="ruleForm" label-width="160px">
+      <el-form-item label="登录名" prop="loginname" required>
+        <el-input v-model="detail.loginname"></el-input>
+      </el-form-item>
       <el-form-item label="用户名" prop="username" required>
         <el-input v-model="detail.username"></el-input>
       </el-form-item>
@@ -57,9 +60,22 @@ export default {
         menuArray: []
         
       },
+      pageNavi: {
+        page: 1,
+        size: 10,
+        total: 0,
+      },
+      listQuery: {
+        name: '',
+        phone: '',
+        identity: undefined,
+      },
       roleId: [],
       sysRole:[],
       rules: {
+        loginname: [
+          { required: true, message: '请输入登录名', trigger: 'blur' }
+        ],
         nickname: [
           { required: true, message: '请输入用户名', trigger: 'blur' }
         ],
@@ -77,6 +93,7 @@ export default {
   },
   methods: {
     ...mapUserActions([
+      'getSysUserList',
       'getDetail',
       'addSysUser',
       'editSysUser',
@@ -90,6 +107,17 @@ export default {
     onCancel () {
       this.$router.back()
     },
+    getList () {
+      this.getSysUserList({
+        pageNum: this.pageNavi.page || 1,
+        pageSize: this.pageNavi.size,
+        identity: this.listQuery.identity === '%' ? undefined : this.listQuery.identity,
+        ...this.listQuery,
+      }).then((data) => {
+        const { current: page, size, total } = data
+        this.pageNavi = { page, size, total }
+      })
+    },
     onSubmit () {
       this.$refs.ruleForm.validate((valid) => {
         if (!valid) {
@@ -99,19 +127,36 @@ export default {
 
         if (!this.detail.userId) {
           // 新增
-          this.addSysUser({...this.detail, isSales: 1}).then(() => {
+          this.addSysUser({...this.detail, isSales: 1}).then((res) => {
             this.$notify.success('添加信息成功')
+
+            this.formInline.userId = res.userId
+            this.getUserRoledetails()
+            this.init()
+
+            // 保存角色
+            this.formInline.menuArray = this.roleId
+            this.updateUserRolede(this.formInline)
+            this.getList()
+            this.$router.go(-1)
           })
         } else {
           // 修改
           this.editSysUser({...this.detail, isSales: 1}).then(() => {
             this.$notify.success('编辑信息成功')
+            // 保存角色
+            this.formInline.menuArray = this.roleId
+            this.updateUserRolede(this.formInline)
+            this.getList()
+            this.$router.go(-1)
           })
-          // 保存角色
-          this.formInline.menuArray = this.roleId
-          this.updateUserRolede(this.formInline)
         }
-
+      })
+    },
+    getUserRoledetails() {
+      this.userRoledetails(this.formInline).then((data)=>{
+        this.sysRole = data.sysRole
+        this.roleId = data.arrayList
       })
     },
     init () {
@@ -132,10 +177,7 @@ export default {
   },
   created () {
     this.formInline.userId = this.$route.query.id
-    this.userRoledetails(this.formInline).then((data)=>{
-        this.sysRole = data.sysRole
-        this.roleId = data.arrayList
-    })
+    this.getUserRoledetails()
     this.init()
   },
 }

src/views/sysuser/list.vue

@@ -58,7 +58,7 @@
         label="操作">
         <template slot-scope="scope">
           <el-button type="text" @click="handleEdit(scope.row)" size="small">编辑</el-button>
-           <el-button type="text" @click="addUserRole(scope.row)" size="small">添加权限</el-button>       
+<!--           <el-button type="text" @click="addUserRole(scope.row)" size="small">添加权限</el-button>       -->
         </template>
       </el-table-column>
     </el-table>