From 90f2acaa6c61d5a60822d4fee5a44ec3c5404f67 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Wed, 31 Mar 2021 18:52:02 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 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 6b072f7..33bea84 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
@@ -10,8 +10,8 @@
         <div class="layui-form toolbar">
             <div class="layui-form-item">
                 <div class="layui-inline" style="margin-bottom: -25px;">
-                    <input id="doctorTel" class="layui-input search-input" type="text" placeholder="按手机号" />&emsp;
-                    <input id="doctorName" class="layui-input search-input" type="text" placeholder="按医生名" />&emsp;
+                    <input id="doctorTel" class="layui-input search-input" autocomplete="off" type="text" placeholder="按手机号" />&emsp;
+                    <input id="doctorName" class="layui-input search-input" autocomplete="off" type="text" placeholder="按医生名" />&emsp;
                     <select id="doctorState" lay-filter="role_clients">
                         <option value="">-医院状态-</option>
                         <option value="1">正常</option>
@@ -52,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,7 +137,7 @@
                     <label class="layui-form-label">Email</label>
                     <div class="layui-input-block" style="width: 150px;">
                         <input name="doctorEmail" type="text" class="layui-input" maxlength="50"
-                            lay-verify="email"  autocomplete="off"/>
+                            lay-verify="email"  />
                     </div>
                 </div>
             </div>
@@ -410,7 +410,7 @@
                         },
                         {
                             field: 'doctorName',
-                            width: "150",
+                            width: "100",
                             title: '医生姓名',
                             fixed: 'left'
                         },
@@ -431,7 +431,7 @@
                         },
                         {
                             field: 'isAnswer',
-                            width: "100",
+                            width: "75",
                             title: '医答',
                             templet: function (d) {
                                 return d.isAnswer ? "是" : "否"
@@ -439,10 +439,18 @@
                         },
                         {
                             field: 'isSigning',
-                            width: "100",
+                            width: "75",
                             title: '签约',
                             templet: function (d) {
                                 return d.isSigning ? "是" : "否"
+                            }
+                        },
+                        {
+                            field: 'isAdminUser',
+                            width: "100",
+                            title: '是否管理员',
+                            templet: function (d) {
+                                return d.isAdminUser ? "管理员" : "普通医生"
                             }
                         },
                         {
@@ -586,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 
+                    } 
                 });
             });
 

--
Gitblit v1.8.0