acs用户管理更新

acs/nladmin-ui/src/views/login.vue

@@ -120,14 +120,12 @@ export default {
           code: this.loginForm.code,
           uuid: this.loginForm.uuid
         }
-        if (user.password !== this.cookiePass) {
-          user.password = encrypt(user.password)
-        }
+        user.password = encrypt(user.password)
         if (valid) {
           this.loading = true
           if (user.rememberMe) {
             Cookies.set('username', user.username, { expires: Config.passCookieExpires })
-            Cookies.set('password', user.password, { expires: Config.passCookieExpires })
+            Cookies.set('password', this.loginForm.password, { expires: Config.passCookieExpires })
             Cookies.set('rememberMe', user.rememberMe, { expires: Config.passCookieExpires })
           } else {
             Cookies.remove('username')

acs/nladmin-ui/src/views/system/user/index.vue

@@ -80,7 +80,7 @@
             <el-form-item label="邮箱" prop="email">
               <el-input v-model="form.email" style="width: 200px;" />
             </el-form-item>
-            <el-form-item label="部门" prop="dept.id">
+            <el-form-item label="部门" prop="dept.id" :rules="[{ required: true, message: '请选择部门', trigger: 'change' }]">
               <treeselect
                 v-model="form.dept.id"
                 :options="depts"
@@ -89,7 +89,10 @@
                 placeholder="选择部门"
               />
             </el-form-item>
-
+            <br v-if="!crud.status.add">
+            <el-form-item label="密码" prop="password" v-if="crud.status.add">
+              <el-input v-model="form.password" style="width: 200px;" show-password auto-complete="new-password"/>
+            </el-form-item>
             <el-form-item label="性别">
               <el-radio-group v-model="form.gender" style="width: 178px">
                 <el-radio label="男">男</el-radio>
@@ -168,16 +171,25 @@
           <el-table-column
             v-permission="['admin','user:edit','user:del']"
             label="操作"
-            width="115"
+            width="200"
             align="center"
             fixed="right"
           >
             <template slot-scope="scope">
               <udOperation
+                style="display: inline"
                 :data="scope.row"
                 :permission="permission"
                 :disabled-dle="scope.row.id === user.id"
               />
+              <el-button
+                type="text"
+                slot="left"
+                icon="el-icon-refresh-left"
+                v-permission="permission.edit"
+                @click="resetPassword(scope.row)">
+                重置密码
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -212,7 +224,8 @@ const defaultForm = {
   enabled: 'true',
   roles: [],
   dept: { id: null },
-  phone: null
+  phone: null,
+  password: null
 }
 export default {
   name: 'User',
@@ -256,7 +269,7 @@ export default {
     ])
   },
   created() {
-    this.crud.msg.add = '新增成功，默认密码：123456'
+    this.crud.msg.add = '新增成功'
   },
   mounted: function() {
     const that = this
@@ -292,6 +305,7 @@ export default {
     },
     // 新增前将多选的值设置为空
     [CRUD.HOOK.beforeToAdd]() {
+      this.form.password = '123456'
       this.roleDatas = []
     },
     // 初始化编辑时候的角色与岗位
@@ -435,6 +449,28 @@ export default {
     },
     checkboxT(row, rowIndex) {
       return row.id !== this.user.id
+    },
+    resetPassword(row) {
+      row.password = null
+      this.$prompt('', '重置密码', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputPlaceholder: '请输入新的密码',
+        inputPattern: /^[A-Z|a-z|0-9|(._~!@#$^&*)]{6,20}$/,
+        inputErrorMessage: '密码格式不正确,只能是6-20位密码',
+        closeOnClickModal: false
+      }).then(({ value }) => {
+        row.password = value
+        crudUser.edit(row).then(res => {
+          this.crud.toQuery()
+          this.crud.notify('密码重置成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消输入'
+        })
+      })
     }
   }
 }