编辑用户重置密码验证条件、删除权限增加

jeepay-ui-manager/src/views/sysuser/AddOrEdit.vue

@@ -129,12 +129,18 @@ export default {
         telphone: [{ required: true, pattern: /^[1][0-9]{10}$/, message: '请输入正确的手机号码', trigger: 'blur' }],
         userNo: [{ required: true, message: '请输入编号', trigger: 'blur' }],
         loginUsername: [],
-        newPwd: [{ required: true, min: 6, max: 12, message: '请输入6-12位新密码', trigger: 'blur' }], // 新密码
-        confirmPwd: [{ required: true, message: '请确认输入新密码', trigger: 'blur' }, {
+        newPwd: [{ required: false, min: 6, max: 12, message: '请输入6-12位新密码', trigger: 'blur' }, {
           validator: (rule, value, callBack) => {
-            console.log(value)
-            console.log(this.sysPassword.newPwd)
-            this.sysPassword.newPwd === value ? callBack() : callBack('新密码与确认密码不一致')
+            this.sysPassword.defaultPass === true ? callBack() : callBack('请输入6-12位新密码')
+          }
+        }], // 新密码
+        confirmPwd: [{ required: false, message: '请确认输入新密码', trigger: 'blur' }, {
+          validator: (rule, value, callBack) => {
+            if (!this.sysPassword.defaultPass) {
+              this.sysPassword.newPwd === value ? callBack() : callBack('新密码与确认密码不一致')
+            } else {
+              callBack()
+            }
           }
         }] // 确认新密码
       }

jeepay-ui-manager/src/views/sysuser/SysUserPage.vue

@@ -42,7 +42,7 @@
           <JeepayTableColumns>
             <a v-if="$access('ENT_UR_USER_UPD_ROLE')" @click="roleDist(record.sysUserId)" >变更角色</a>
             <a v-if="$access('ENT_UR_USER_EDIT')" @click="editFunc(record.sysUserId)">修改</a>
-            <a style="color: red" @click="delFunc(record.sysUserId)">删除</a>
+            <a v-if="$access('ENT_UR_USER_DELETE')" style="color: red" @click="delFunc(record.sysUserId)">删除</a>
           </JeepayTableColumns>
         </template>
       </JeepayTable>