Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

bingbing

2020-07-23 e6a149ea753350d3bebbd76ce40315a8b6016b4e

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html

@@ -2,48 +2,57 @@
    <input name="id" type="hidden" />
    <div style="display:flex">
        <div class="layui-form-item">
            <label class="layui-form-label">所在医院</label>
            <div class="layui-input-block">
            <div class="layui-inline">
                <label class="layui-form-label" style="width: 75px;">所在医院</label>
                <div class="layui-input-block" style="width: 150px;">
                <input name="hospitalName" id="hospitalName" placeholder="请输入医院名称" type="text" class="layui-input"
                    maxlength="50" lay-verify="required" required style="width: 175px;"/>
                        maxlength="50" lay-verify="required" required style="width: 150px;" />
    <input type="hidden" name="hospitalId" id="hospitalId"/>
            </div>
        </div>
        <div class="layui-form-item">
            <div class="layui-inline">
            <label class="layui-form-label">科室</label>
            <div class="layui-input-block">
                <input name="departmentName" id="departmentName" placeholder="请选择科室" type="hidden" class="layui-input"
                    maxlength="20" />
                <div class="layui-input-block" style="width: 150px;">
                    <input name="departmentName" id="departmentName" placeholder="请选择科室" type="hidden"
                        class="layui-input" maxlength="20" />
                <select id="departmentId" name="departmentId" lay-filter="departmentId" placeholder="请选择科室"
                    lay-verify="required" required>
                    <option value="">-请选择科室-</option>
                </select>
            </div>
        </div>
        
        <div class="layui-form-item">
            <div class="layui-inline">
            <label class="layui-form-label">医生类型</label>
            <div class="layui-input-block">
                <select id="doctorType" name="doctorType" lay-filter="doctorType" 
                    lay-verify="required" required>
                <div class="layui-input-block" style="width: 150px;">
                    <select id="doctorType" name="doctorType" lay-filter="doctorType" lay-verify="required" required>
                    <option value="2" selected>C端医生</option>
                    <option value="1">H端医生</option>
                    <option value="0">C端+H端</option>
                </select>
            </div>
        </div>

            <!-- </div>
        <div class="layui-form-item"> -->

            <!-- </div>

        <div class="layui-form-item"> -->

        </div>
    </div>
    <div style="display:flex">
        <div class="layui-form-item">
            <div class="layui-inline">
            <label class="layui-form-label">姓名</label>
            <div class="layui-input-block">
                <div class="layui-input-block" style="width: 150px;">
                <input name="doctorName" type="text" class="layui-input" maxlength="20" lay-verify="required"
                    required  style="width: 175px;"/>
                        required style="width: 150px;" />
            </div>
        </div>
        <div class="layui-form-item">
            <div class="layui-inline">
            <label class="layui-form-label">职称</label>
            <div class="layui-input-block">
                <div class="layui-input-block" style="width: 150px;">
                <select id="doctorRankId" name="doctorRankId" lay-filter="doctorRankId" placeholder="选择一个职称"
                    lay-verify="required" required>
                    <option value="">-请选择-</option>
@@ -51,33 +60,43 @@
                <input name="doctorRank" id='doctorRank' type="hidden" class="layui-input" maxlength="20" />
            </div>
        </div>
        <div class="layui-form-item">
            <div class="layui-inline">
            <label class="layui-form-label">角色</label>
            <div class="layui-input-block">
                <div class="layui-input-block" style="width: 150px;">
                <select name="roleId" xm-select="roleId" lay-verify="required">
                </select>
            </div>
        </div>

            <!-- </div>
        <div class="layui-form-item"> -->

            <!-- </div>
        <div class="layui-form-item"> -->

        </div>
    </div>
    <div style="display:flex">
        <div class="layui-form-item">
            <div class="layui-inline">
            <label class="layui-form-label">联系电话</label>
            <div class="layui-input-block">
                <div class="layui-input-block" style="width: 150px;">
                <input name="doctorTel" id="doctorTel-add" type="text" class="layui-input" maxlength="20"
                    lay-verify="required|phone" required  style="width: 175px;"/>
                        lay-verify="required|phone" required style="width: 150px;" />
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">联系电话2</label>
            <div class="layui-input-block">
            <div class="layui-inline">
                <label class="layui-form-label">其它联系方式</label>
                <div class="layui-input-block" style="width: 150px;">
                <input name="doctorOtherLink" type="text" class="layui-input" maxlength="20" />
            </div>
        </div>
        <div class="layui-form-item">
            <div class="layui-inline">
            <label class="layui-form-label">Email</label>
            <div class="layui-input-block">
                <div class="layui-input-block" style="width: 150px;">
                <input name="doctorEmail" type="text" class="layui-input" maxlength="20" lay-verify="required|email"
                    required />
                </div>
            </div>
        </div>
    </div>
@@ -85,7 +104,8 @@
        <div class="layui-form-item">
            <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>
                <textarea name="doctorAbout" id="doctorAbout" class="layui-textarea" maxlength="300"
                    style="width: 650px;"></textarea>
            </div>
        </div>
    </div>
@@ -93,8 +113,10 @@
        <div class="layui-form-item">
            <label class="layui-form-label">医生状态</label>
            <div class="layui-input-block">
                <input name="doctorState" id="doctorState-shi" type="radio" checked value="true" title="正常" class="layui-input"/>
                <input name="doctorState" id="doctorState-fou" type="radio" value="false" title="试用" class="layui-input" />
                <input name="doctorState" id="doctorState-shi" type="radio" checked value="true" title="正常"
                    class="layui-input" />
                <input name="doctorState" id="doctorState-fou" type="radio" value="false" title="试用"
                    class="layui-input" />
            </div>
        </div>
        <div class="layui-form-item">
@@ -107,7 +129,8 @@
        <div class="layui-form-item">
            <label class="layui-form-label">医答</label>
            <div class="layui-input-block">
                <input name="isAnswer" id="isAnswer-shi" type="radio" checked value="true" title="是" class="layui-input"/>
                <input name="isAnswer" id="isAnswer-shi" type="radio" checked value="true" title="是"
                    class="layui-input" />
                <input name="isAnswer" id="isAnswer-fou" type="radio" value="false" title="否" class="layui-input" />
            </div>
        </div>
@@ -122,31 +145,41 @@
    </div>
    <div style="display:flex">
        <div class="layui-form-item">
            <div class="layui-inline">
            <label class="layui-form-label">登录帐号</label>
            <div class="layui-input-block">
                <div class="layui-input-block" style="width: 150px;">
                <input name="username" id="username" readonly type="text" class="layui-input" maxlength="20"
                    lay-verify="required" required />
            </div>
        </div>
        <div class="layui-form-item">
            <div class="layui-inline">
            <label class="layui-form-label">登录密码</label>
            <div class="layui-input-block">
                <div class="layui-input-block" style="width: 150px;">
                <input name="password" type="password" lay-verify="required" class="layui-input" maxlength="20"
                    lay-verify="required|phone" required />
            </div>
        </div>
        <div class="layui-form-item">
            <div class="layui-inline">
            <label class="layui-form-label">确认密码</label>
            <div class="layui-input-block">
                <div class="layui-input-block" style="width: 150px;">
                <input name="passwordSure" type="password" lay-verify="required|confirmPass" class="layui-input"
                    maxlength="20" />
            </div>
        </div>

            <!-- </div>
        <div class="layui-form-item">
            
        </div>
        <div class="layui-form-item"> -->

        </div>
    </div>
    <div style="display:flex">
        <div class="layui-form-item">
            <div class="layui-inline">
            <label class="layui-form-label">医生的头像</label>
            <div class="layui-input-block" id="demo">
                <div class="layui-input-block" id="demo" style="width: 150px;">
                <button type="button" class="layui-btn" id="phonto">
                    <i class="layui-icon">&#xe67c;</i>上传图片
                </button>
@@ -157,16 +190,22 @@
                </blockquote>
            </div>
        </div>
        
        <div class="layui-form-item">
            <div class="layui-inline">
            <label class="layui-form-label">销售代表</label>
            <div class="layui-input-block">
                <input name="serverUserName" id="serverUserName-add" type="hidden" class="layui-input" maxlength="15" />
                <div class="layui-input-block" style="width: 150px;">
                    <input name="serverUserName" id="serverUserName-add" type="hidden" class="layui-input"
                        maxlength="15" />
                <select id="serverUserId-add" name="serverUserId" lay-filter="serverUserId-add" 
                    lay-verify="required" required>
                    <option value="">-请选择-</option>
                </select>
            </div>
            </div>
            <!--             
        </div>

        <div class="layui-form-item"> -->

        </div>
    </div>

@@ -322,6 +361,7 @@
            if (data.field.roleId != null && data.field.roleId != "") {
                data.field.roles = data.field.roleId.split(',');
            }
            data.field.hospitalId = ""+data.field.hospitalId;
            data.field.roleId = null;
            debugger
            admin.req('api-user/sysdoctor', JSON.stringify(data.field), function (data) {