From 365f45d68f9d8a273a049247408beff658409b70 Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Wed, 25 May 2022 11:00:08 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E8=A7=92=E8=89=B2=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js                   |  1 +
 jero-web/src/common/lang/zh-cn.js                   |  1 +
 jero-web/src/views/system/UserList.vue              | 13 +++++++++++--
 .../src/views/system/modules/RoleAssignment.vue     |  4 ++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index aed6f2ffe..cdbb79f99 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -708,6 +708,7 @@ module.exports = {
   uploadTime: 'Upload time',
   enclosure: 'Enclosure',
   // 认证
+  resetPassword: 'reset Password',
   departmentAllocation: 'department Allocation',
   ListTitle: 'List Title',
   CopyProjectCollectionparameters: 'Copy Project Collection parameters',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index ea9be36ef..91836919a 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -718,6 +718,7 @@ module.exports = {
   uploadTime: '上传时间',
   enclosure: '附件',
   // 认证
+  resetPassword: '重置密码',
   departmentAllocation: '部门配置',
   ListTitle: '清单标题',
   CopyProjectCollectionparameters: '复制项目收集参数',
diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue
index f7c068fcb..4da00cd28 100644
--- a/jero-web/src/views/system/UserList.vue
+++ b/jero-web/src/views/system/UserList.vue
@@ -110,7 +110,8 @@
           </div>
         </template>
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)" >{{$t('edit')}}</a>
+          <a @click="handleEdit(record)" style='margin-right: 10px' v-has="'sys:user:edit'">{{$t('edit')}}</a>
+          <a @click="resetPassword(record)" >{{$t('resetPassword')}}</a>
         </span>
 
       </a-table>
@@ -125,7 +126,7 @@
     <user-recycle-bin-modal :visible.sync="recycleBinVisible" @ok="modalFormOk"/>
     <!-- 角色配置 -->
     <a-modal v-model="rolevisible" :title="$t('RoleAssignment')" width='650px' :footer="null">
-      <role-assignment v-if='rolevisible' :selectedRowKeysArray='selectedRowKeys'></role-assignment>
+      <role-assignment v-if='rolevisible' :selectedRowKeysArray='selectedRowKeys' @rolevisible='rolevisibleMethods'></role-assignment>
     </a-modal>
     <!-- 部门配置 -->
     <a-modal v-model="departmentvisible" :title="$t('RoleAssignment')" width='650px' :footer="null">
@@ -257,6 +258,10 @@
       }
     },
     methods: {
+      // 重置密码
+      resetPassword(val) {
+        console.log(val,'valll')
+      },
       onSelectChange(val,value) {
         this.selectedRowKeys = val
         this.selectedRowKeysvalue = value
@@ -277,6 +282,10 @@
           this.rolevisible = true
         }
       },
+      rolevisibleMethods(val) {
+        this.rolevisible = val
+        this.selectedRowKeys = []
+      },
       getAvatarView: function(avatar) {
         return getFileAccessHttpUrl(avatar)
       },
diff --git a/jero-web/src/views/system/modules/RoleAssignment.vue b/jero-web/src/views/system/modules/RoleAssignment.vue
index c4e24e2b6..8889d781d 100644
--- a/jero-web/src/views/system/modules/RoleAssignment.vue
+++ b/jero-web/src/views/system/modules/RoleAssignment.vue
@@ -92,14 +92,14 @@ export default {
       })
     },
     handleCancel() {
-      this.$emit('areaVisibleTaskCutOffTimeflag', false)
+      this.$emit('rolevisible', false)
     },
     //保存
     handleSubmit() {
       let param = {ids: this.selectedRowKeysArray.join(','), selectedroles: `${this.selectedRole.join(',')}` }
       postAction('/sys/user/setRole', param).then((res) => {
         if (res.success) {
-          this.$emit('areaVisibleTaskCutOffTimeflag', false)
+          this.$emit('rolevisible', false)
           this.$message.success(res.message)
         } else {
           this.$message.warning(res.message)