From d526d571cbe0a950e777fb325978d72f3ddb302b Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Thu, 13 Aug 2020 21:38:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html
index f00c1aa..08830dd 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html
@@ -36,8 +36,11 @@
<script type="text/html" id="doctor-table-bar">
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看详情</a>
+ {{# if (d.doctorType !=2){}}
<button class="layui-btn layui-btn-primary layui-btn-xs permissions" permissions="users-edit"
lay-event="reset">重置密码</button>
+ {{#}}}
+
<button class="layui-btn layui-btn-primary layui-btn-xs permissions" permissions="sysdoctor-edit"
lay-event="edit">修改</button>
<button class="layui-btn layui-btn-xs permissions" permissions="sysdoctor-del" lay-event="del">删除</button>
@@ -510,6 +513,7 @@
}
form.val('app-form', data);
$('#app-form').find('input,select,textarea').prop('readonly', true);
+ $('#app-form').find('select').prop('disabled', true);
$('#app-form').find('input[type="radio"]').prop('disabled', true);
$('#app-form').attr('method', 'POST');
form.render();
@@ -537,10 +541,7 @@
data) {
layer.closeAll('loading');
if (data.code == 0) {
- layer.msg(data.msg, {
- icon: 1,
- time: 2000
- });
+ layer.alert("密码重置为："+data.data, {icon: 1});
} else {
layer.msg(data.msg, {
icon: 2,
--
Gitblit v1.8.0