From 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Mon, 01 Mar 2021 14:14:35 +0800
Subject: [PATCH] Merge branch 'dev1.1' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html | 57 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 31 insertions(+), 26 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 e57d22c..26d43ab 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
@@ -35,15 +35,14 @@
<!-- 表格操作列 -->
<script type="text/html" id="doctor-table-bar">
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看详情</a>
+ <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>
+ <button class="layui-btn layui-btn-danger layui-btn-xs permissions" permissions="sysdoctor-del" lay-event="del">删除</button>
</script>
<!-- 表格状态列 -->
@@ -53,7 +52,7 @@
</script>
<!-- 表单弹窗 -->
<script type="text/html" id="app-model">
- <form id="app-form" lay-filter="app-form" class="layui-form model-form">
+ <form id="app-form" lay-filter="app-form" class="layui-form model-form" autocomplete="off">
<input name="id" type="hidden" />
<div style="display:flex">
<div class="layui-form-item">
@@ -137,8 +136,8 @@
<div class="layui-inline">
<label class="layui-form-label">Email</label>
<div class="layui-input-block" style="width: 150px;">
- <input name="doctorEmail" type="text" class="layui-input" maxlength="20"
- lay-verify="required|email" required />
+ <input name="doctorEmail" type="text" class="layui-input" maxlength="50"
+ lay-verify="email" autocomplete="off"/>
</div>
</div>
</div>
@@ -399,40 +398,40 @@
cols: [
[{
field: 'hospitalName',
- width: 180,
+ width: "200",
title: '医院名称',
fixed: 'left'
},
{
field: 'departmentName',
- width: 80,
+ width: "150",
title: '科室',
fixed: 'left'
},
{
field: 'doctorName',
- width: 100,
+ width: "100",
title: '医生姓名',
fixed: 'left'
},
{
field: 'doctorRank',
- width: 100,
+ width: "100",
title: '职称'
},
{
field: 'username',
- width: 150,
+ width: "150",
title: '登录帐号'
},
{
field: 'doctorTel',
- width: 150,
+ width: "150",
title: '联系方式'
},
{
field: 'isAnswer',
- width: 100,
+ width: "75",
title: '医答',
templet: function (d) {
return d.isAnswer ? "是" : "否"
@@ -440,34 +439,34 @@
},
{
field: 'isSigning',
- width: 100,
+ width: "75",
title: '签约',
templet: function (d) {
return d.isSigning ? "是" : "否"
}
},
- // {
- // field: 'enabled',
- // width: 100,
- // align: 'center',
- // templet: '#doctor-tpl-state',
- // title: '状态'
- // },
- // { field: 'createTime', width: 150, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd HH:mm')}}</div>" },
+ {
+ field: 'isAdminUser',
+ width: "100",
+ title: '是否管理员',
+ templet: function (d) {
+ return d.isAdminUser ? "管理员" : "普通医生"
+ }
+ },
{
field: 'createTime',
- width: 150,
+ width: "120",
sort: true,
title: '创建时间',
templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd HH:mm')}}</div>"
},
{
field: 'serverUserName',
- width: 100,
+ width: "120",
title: '销售代表'
},
{
- width: 300,
+ width: "260",
align: 'center',
toolbar: '#doctor-table-bar',
title: '操作',
@@ -595,13 +594,18 @@
var hospitalName = $("#hospitalName-seach").val();
var doctorTel = $('#doctorTel').val();
var doctorName = $('#doctorName').val();
+ var hospitalId=$("#hospitalId").val();
table.reload('app-table', {
where: {
doctorState: doctorState,
hospitalName: hospitalName,
+ hospitalId,
doctorTel: doctorTel,
doctorName: doctorName
- }
+ },
+ page: {
+ curr: 1
+ }
});
});
@@ -612,6 +616,7 @@
title: title,
path: 'pages/opration/doctor_form.html',
area: '900px',
+ offset: '0px',
finish: function () {}
});
};
--
Gitblit v1.8.0