Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
计全科技
jeepay-ui
提交
32ea147e
jeepay-ui
项目概览
计全科技
/
jeepay-ui
通知
11
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
jeepay-ui
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
32ea147e
编写于
6月 16, 2021
作者:
qq_40137331
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1. 商户系统 新增操作员,取消超级管理员选项, 抽屉更改为两列展示
上级
5d0b0bcd
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
95 addition
and
66 deletion
+95
-66
jeepay-ui-manager/src/views/sysuser/AddOrEdit.vue
jeepay-ui-manager/src/views/sysuser/AddOrEdit.vue
+8
-5
jeepay-ui-merchant/src/views/sysuser/AddOrEdit.vue
jeepay-ui-merchant/src/views/sysuser/AddOrEdit.vue
+87
-61
未找到文件。
jeepay-ui-manager/src/views/sysuser/AddOrEdit.vue
浏览文件 @
32ea147e
...
@@ -205,12 +205,14 @@ export default {
...
@@ -205,12 +205,14 @@ export default {
that
.
$message
.
success
(
'
修改成功
'
)
that
.
$message
.
success
(
'
修改成功
'
)
that
.
isShow
=
false
that
.
isShow
=
false
that
.
callbackFunc
()
// 刷新列表
that
.
callbackFunc
()
// 刷新列表
that
.
resetIsShow
=
false
// 取消展示
this
.
resetIsShow
=
false
// 取消重置密码板块展示
that
.
sysPassword
.
resetPass
=
false
this
.
sysPassword
.
resetPass
=
false
// 是否使用默认密码不展示
this
.
sysPassword
.
defaultPass
=
true
// 是否使用默认密码默认为true
}).
catch
(
res
=>
{
}).
catch
(
res
=>
{
that
.
confirmLoading
=
false
that
.
confirmLoading
=
false
that
.
resetIsShow
=
false
// 取消展示
this
.
resetIsShow
=
false
// 取消重置密码板块展示
that
.
sysPassword
.
resetPass
=
false
this
.
sysPassword
.
resetPass
=
false
// 是否使用默认密码不展示
this
.
sysPassword
.
defaultPass
=
true
// 是否使用默认密码默认为true
})
})
}
}
}
}
...
@@ -220,7 +222,8 @@ export default {
...
@@ -220,7 +222,8 @@ export default {
onClose
()
{
onClose
()
{
this
.
isShow
=
false
this
.
isShow
=
false
this
.
resetIsShow
=
false
// 取消重置密码板块展示
this
.
resetIsShow
=
false
// 取消重置密码板块展示
this
.
sysPassword
.
resetPass
=
false
this
.
sysPassword
.
resetPass
=
false
// 是否使用默认密码不展示
this
.
sysPassword
.
defaultPass
=
true
// 是否使用默认密码默认为true
},
},
// 使用默认密码重置是否为true
// 使用默认密码重置是否为true
isResetPass
()
{
isResetPass
()
{
...
...
jeepay-ui-merchant/src/views/sysuser/AddOrEdit.vue
浏览文件 @
32ea147e
...
@@ -13,77 +13,94 @@
...
@@ -13,77 +13,94 @@
<a-form-model
<a-form-model
ref=
"infoFormModel"
ref=
"infoFormModel"
:model=
"saveObject"
:model=
"saveObject"
:label-col=
"
{span: 8}"
:rules=
"rules"
:wrapper-col="{span: 12}"
style=
"padding-bottom:50px"
:rules="rules">
layout=
"vertical"
>
<a-row
justify=
"space-between"
type=
"flex"
>
<a-col
:span=
"10"
>
<a-form-model-item
label=
"用户登录名:"
prop=
"loginUsername"
>
<a-form-model-item
label=
"用户登录名:"
prop=
"loginUsername"
>
<a-input
v-model=
"saveObject.loginUsername"
:disabled=
"!isAdd"
/>
<a-input
v-model=
"saveObject.loginUsername"
:disabled=
"!isAdd"
/>
</a-form-model-item>
</a-form-model-item>
</a-col>
<a-col
:span=
"10"
>
<a-form-model-item
label=
"用户姓名:"
prop=
"realname"
>
<a-form-model-item
label=
"用户姓名:"
prop=
"realname"
>
<a-input
v-model=
"saveObject.realname"
/>
<a-input
v-model=
"saveObject.realname"
/>
</a-form-model-item>
</a-form-model-item>
</a-col>
<a-col
:span=
"10"
>
<a-form-model-item
label=
"手机号:"
prop=
"telphone"
>
<a-form-model-item
label=
"手机号:"
prop=
"telphone"
>
<a-input
v-model=
"saveObject.telphone"
/>
<a-input
v-model=
"saveObject.telphone"
/>
</a-form-model-item>
</a-form-model-item>
</a-col>
<a-col
:span=
"10"
>
<a-form-model-item
label=
"编号:"
prop=
"userNo"
>
<a-form-model-item
label=
"编号:"
prop=
"userNo"
>
<a-input
v-model=
"saveObject.userNo"
/>
<a-input
v-model=
"saveObject.userNo"
/>
</a-form-model-item>
</a-form-model-item>
</a-col>
<a-col
:span=
"10"
>
<a-form-model-item
label=
"请选择性别:"
prop=
"sex"
>
<a-form-model-item
label=
"请选择性别:"
prop=
"sex"
>
<a-radio-group
v-model=
"saveObject.sex"
>
<a-radio-group
v-model=
"saveObject.sex"
>
<a-radio
:value=
"1"
>
男
</a-radio>
<a-radio
:value=
"1"
>
男
</a-radio>
<a-radio
:value=
"2"
>
女
</a-radio>
<a-radio
:value=
"2"
>
女
</a-radio>
</a-radio-group>
</a-radio-group>
</a-form-model-item>
</a-form-model-item>
</a-col>
<a-form-model-item
label=
"是否为超级管理员:"
prop=
"isAdmin"
>
<a-col
:span=
"10"
>
<a-radio-group
v-model=
"saveObject.isAdmin"
>
<a-radio
:value=
"1"
>
是
</a-radio>
<a-radio
:value=
"0"
>
否
</a-radio>
</a-radio-group>
</a-form-model-item>
<a-form-model-item
label=
"状态:"
prop=
"state"
>
<a-form-model-item
label=
"状态:"
prop=
"state"
>
<a-radio-group
v-model=
"saveObject.state"
>
<a-radio-group
v-model=
"saveObject.state"
>
<a-radio
:value=
"1"
>
启用
</a-radio>
<a-radio
:value=
"1"
>
启用
</a-radio>
<a-radio
:value=
"0"
>
停用
</a-radio>
<a-radio
:value=
"0"
>
停用
</a-radio>
</a-radio-group>
</a-radio-group>
</a-form-model-item>
</a-form-model-item>
</a-col>
</a-row>
<a-divider
orientation=
"left"
v-if=
"resetIsShow"
>
<a-divider
orientation=
"left"
v-if=
"resetIsShow"
>
<a-tag
color=
"#FF4B33"
>
<a-tag
color=
"#FF4B33"
>
账户安全
账户安全
</a-tag>
</a-tag>
</a-divider>
</a-divider>
<a-form-model-item
label=
"重置密码:"
v-if=
"resetIsShow"
>
<a-checkbox
v-model=
"sysPassword.resetPass"
></a-checkbox>
</a-form-model-item>
<div
v-if=
"sysPassword.resetPass"
style=
"padding-bottom:50px"
>
<div
style=
"display:flex;flex-direction:row;"
>
<a-form-model-item
label=
"恢复默认密码:"
>
<a-row
justify=
"space-between"
type=
"flex"
style=
"width:100%"
>
<a-checkbox
v-model=
"sysPassword.defaultPass"
@
click=
"isResetPass"
></a-checkbox>
<a-col
:span=
"10"
>
<a-form-model-item
label=
""
v-if=
"resetIsShow"
>
重置密码:
<a-checkbox
v-model=
"sysPassword.resetPass"
></a-checkbox>
</a-form-model-item>
</a-col>
<a-col
:span=
"10"
>
<a-form-model-item
label=
""
v-if=
"sysPassword.resetPass"
>
恢复默认密码:
<a-checkbox
v-model=
"sysPassword.defaultPass"
@
click=
"isResetPass"
></a-checkbox>
</a-form-model-item>
</a-form-model-item>
<div>
</a-col>
<!--
<div
v-else
>
-->
</a-row>
</div>
<div
v-if=
"sysPassword.resetPass"
>
<div
v-show=
"!this.sysPassword.defaultPass"
>
<div
v-show=
"!this.sysPassword.defaultPass"
>
<a-row
justify=
"space-between"
type=
"flex"
>
<a-col
:span=
"10"
>
<a-form-model-item
label=
"新密码:"
prop=
"newPwd"
>
<a-form-model-item
label=
"新密码:"
prop=
"newPwd"
>
<a-input-password
<a-input-password
autocomplete=
"new-password"
autocomplete=
"new-password"
v-model=
"sysPassword.newPwd"
v-model=
"sysPassword.newPwd"
:disabled=
"sysPassword.defaultPass"
/>
:disabled=
"sysPassword.defaultPass"
/>
</a-form-model-item>
</a-form-model-item>
</a-col>
<a-col
:span=
"10"
>
<a-form-model-item
label=
"确认新密码:"
prop=
"confirmPwd"
>
<a-form-model-item
label=
"确认新密码:"
prop=
"confirmPwd"
>
<a-input-password
<a-input-password
autocomplete=
"new-password"
autocomplete=
"new-password"
v-model=
"sysPassword.confirmPwd"
v-model=
"sysPassword.confirmPwd"
:disabled=
"sysPassword.defaultPass"
/>
:disabled=
"sysPassword.defaultPass"
/>
</a-form-model-item>
</a-form-model-item>
</div>
</a-col>
</a-row>
</div>
</div>
</div>
</div>
...
@@ -93,7 +110,6 @@
...
@@ -93,7 +110,6 @@
</div>
</div>
</a-form-model>
</a-form-model>
</a-drawer>
</a-drawer>
</
template
>
</
template
>
...
@@ -186,7 +202,6 @@
...
@@ -186,7 +202,6 @@
this
.
isAdd
=
!
recordId
this
.
isAdd
=
!
recordId
// 数据恢复为默认数据
// 数据恢复为默认数据
this
.
saveObject
=
{
this
.
saveObject
=
{
isAdmin
:
1
,
state
:
1
,
state
:
1
,
sex
:
1
sex
:
1
}
}
...
@@ -238,10 +253,14 @@
...
@@ -238,10 +253,14 @@
that
.
callbackFunc
()
// 刷新列表
that
.
callbackFunc
()
// 刷新列表
that
.
resetIsShow
=
false
// 取消展示
that
.
resetIsShow
=
false
// 取消展示
that
.
sysPassword
.
resetPass
=
false
that
.
sysPassword
.
resetPass
=
false
that
.
sysPassword
.
defaultPass
=
true
// 是否使用默认密码默认为true
that
.
resetPassEmpty
(
that
)
// 清空密码
}).
catch
(
res
=>
{
}).
catch
(
res
=>
{
that
.
confirmLoading
=
false
that
.
confirmLoading
=
false
that
.
resetIsShow
=
false
// 取消展示
that
.
resetIsShow
=
false
// 取消展示
that
.
sysPassword
.
resetPass
=
false
that
.
sysPassword
.
resetPass
=
false
that
.
sysPassword
.
defaultPass
=
true
// 是否使用默认密码默认为true
that
.
resetPassEmpty
(
that
)
// 清空密码
})
})
}
}
}
}
...
@@ -251,7 +270,9 @@
...
@@ -251,7 +270,9 @@
onClose
()
{
onClose
()
{
this
.
isShow
=
false
this
.
isShow
=
false
this
.
resetIsShow
=
false
// 取消重置密码板块展示
this
.
resetIsShow
=
false
// 取消重置密码板块展示
this
.
sysPassword
.
resetPass
=
false
this
.
resetPassEmpty
(
this
)
// 清空密码
this
.
sysPassword
.
resetPass
=
false
// 关闭密码输入
this
.
sysPassword
.
defaultPass
=
true
// 是否使用默认密码默认为true
},
},
// 使用默认密码重置是否为true
// 使用默认密码重置是否为true
isResetPass
()
{
isResetPass
()
{
...
@@ -259,6 +280,11 @@
...
@@ -259,6 +280,11 @@
this
.
sysPassword
.
newPwd
=
''
this
.
sysPassword
.
newPwd
=
''
this
.
sysPassword
.
confirmPwd
=
''
this
.
sysPassword
.
confirmPwd
=
''
}
}
},
// 保存后清空密码
resetPassEmpty
(
that
)
{
that
.
sysPassword
.
newPwd
=
''
that
.
sysPassword
.
confirmPwd
=
''
}
}
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录