From cdf8f1e691531a6fb1c3462d0ad70df7f68c0047 Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Fri, 21 Aug 2020 14:42:17 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 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 08830dd..6b920bc 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 @@ -14,8 +14,8 @@ <input id="doctorName" class="layui-input search-input" type="text" placeholder="按医生名" />  <select id="doctorState" lay-filter="role_clients"> <option value="">-医院状态-</option> - <option value="true">正常</option> - <option value="false">试用</option> + <option value="1">正常</option> + <option value="0">试用</option> </select>  <input name="hospitalName" id="hospitalName-seach" placeholder="按医院名称" type="text" class="layui-input search-input" maxlength="50" autocomplete="off" />  @@ -40,7 +40,7 @@ <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> @@ -148,7 +148,7 @@ <label class="layui-form-label">医生简介</label> <div class="layui-input-block"> <textarea name="doctorAbout" id="doctorAbout" class="layui-textarea" maxlength="300" - style="width: 650px;"></textarea> + style="width: 697px;"></textarea> </div> </div> </div> @@ -400,12 +400,20 @@ [{ field: 'hospitalName', width: 180, - title: '医院名称' + title: '医院名称', + fixed: 'left' + }, + { + field: 'departmentName', + width: 80, + title: '科室', + fixed: 'left' }, { field: 'doctorName', width: 120, - title: '医生姓名' + title: '医生姓名', + fixed: 'left' }, { field: 'doctorRank', @@ -541,7 +549,9 @@ data) { layer.closeAll('loading'); if (data.code == 0) { - layer.alert("密码重置为:"+data.data, {icon: 1}); + layer.alert("密码重置为:" + data.data, { + icon: 1 + }); } else { layer.msg(data.msg, { icon: 2, @@ -551,7 +561,7 @@ }, 'PUT'); }); } else if (layEvent === 'edit') { - showEditModel_add("编辑",data); + showEditModel_add("编辑", data); } else if (layEvent === 'del') { layer.confirm('确定删除此用户吗?', function (i) { layer.close(i); @@ -595,7 +605,7 @@ }); // 显示新增弹窗 - var showEditModel_add = function (title,data) { + var showEditModel_add = function (title, data) { admin.putTempData('t_doctor', data); admin.popupCenter({ title: title, -- Gitblit v1.8.0