From e7c3314727fc06444689c0e6ecab5fea337afeb0 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 26 Feb 2021 15:24:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html
index e60539d..3b73c15 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html
@@ -1,4 +1,4 @@
-<form id="app-form-add" lay-filter="app-form-add" class="layui-form model-form">
+<form id="app-form-add" lay-filter="app-form-add" autocomplete="off" class="layui-form model-form">
     <input name="id" type="hidden" />
     <div style="display:flex">
         <div class="layui-form-item">
@@ -57,7 +57,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="v_email"
-                         />
+                    autocomplete="off"  />
                 </div>
             </div>
         </div>
@@ -289,7 +289,6 @@
 
         // 表单提交事件
         form.on('submit(user-form-submit)', function (data) {
-            debugger
             data.field.hospitalId = $("#hospitalId").val();
             if (data.field.roleId != null && data.field.roleId != "") {
                 data.field.roles = data.field.roleId.split(',');
@@ -442,7 +441,7 @@
             }, 'Post');
         }
         //获取销售代表
-        var getXiaoShouDaiBiao = function () {
+        var getXiaoShouDaiBiao = function (selectVal) {
             admin.req('api-user/users/getAppointUser', { type: 0 }, function (data) {
                 layer.closeAll('loading');
                 if (0 === data.code) {
@@ -450,7 +449,7 @@
                     $.each(data.data, function (index, item) {
                         //往下拉菜单里添加元素
                         $('#serverUserId-add').append(new Option(item.nickname, item.id,
-                            false, false));
+                            false, (!strUtil.isEmpty(selectVal) && selectVal == item.id)));
                     })
                 } else {
                     layer.msg(data.msg, {
@@ -467,10 +466,16 @@
             $('.layui-layer-content').css('overflow', 'auto');
             //将医院的数据保存到下拉表
             let selected = false;
+            var selectVal="";
+            //先拿到当前登录用户的信息
+            var nowUser = config.getUser();
+            if (!strUtil.isEmpty(nowUser)) {
+                selectVal = nowUser.id;
+            }
             //获取职称的
             getZhiCheng();
             //获取销售代表
-            getXiaoShouDaiBiao();
+            getXiaoShouDaiBiao(selectVal);
             //获取角色
             get_role();
             var upload = layui.upload;
@@ -525,6 +530,7 @@
         $("#username").blur(function () {
             if (!validatorTel(doctorTel_add)) {
                 layer.msg("请输入正确的手机号");
+                
             } else {
                 username_is_usered("username");
             }
@@ -534,6 +540,10 @@
             var doctorTel_add = $("#doctorTel-add").val();
             if (!validatorTel(doctorTel_add)) {
                 layer.msg("请输入正确的手机号");
+                //将手机号还原
+                $("#doctorTel-add").val("")
+                $("#username").val("")
+
             } else {
                 username_is_usered("username");
             }
@@ -606,8 +616,8 @@
             $("#hospitalId").val(doctor.hospitalId);
             $("#password_div").hide();
             $("#passwordSure_div").hide();
-            $("#doctorTel-add").prop("disabled",true)
-
+            // $("#doctorTel-add").prop("disabled",true)
+            $("#doctorTel-add").unbind("blur")
             //将密码项取消
             if (doctor.doctorType == 2) {
                 $(".account").hide();
@@ -622,7 +632,8 @@
             $("#password").removeAttr("lay-verify")
             $("#password").removeAttr("required")
             $("#passwordSure").removeAttr("lay-verify")
-
+            
+            
             form.render();
         } else {
             loadEditData();

--
Gitblit v1.8.0