From 2a0e777c3d5d8198554bcdf50f36d54927176fae Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Thu, 23 Jul 2020 12:05:12 +0800
Subject: [PATCH] 网关修改 判断逻辑 ， 数据权限修改
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html | 250 +++++++++++++++++++++++++++++---------------------
1 files changed, 145 insertions(+), 105 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 7c116bf..ece5883 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
@@ -2,82 +2,101 @@
<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">
- <input name="hospitalName" id="hospitalName" placeholder="请输入医院名称" type="text" class="layui-input"
- maxlength="50" lay-verify="required" required style="width: 175px;"/>
- <input type="hidden" name="hospitalId" id="hospitalId"/>
+ <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: 150px;" />
+ <input type="hidden" name="hospitalId" id="hospitalId" />
+ </div>
</div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">科室</label>
- <div class="layui-input-block">
- <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 class="layui-inline">
+ <label class="layui-form-label">科室</label>
+ <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>
-
- <div class="layui-form-item">
- <label class="layui-form-label">医生类型</label>
- <div class="layui-input-block">
- <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 class="layui-inline">
+ <label class="layui-form-label">医生类型</label>
+ <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">
- <label class="layui-form-label">姓名</label>
- <div class="layui-input-block">
- <input name="doctorName" type="text" class="layui-input" maxlength="20" lay-verify="required"
- required style="width: 175px;"/>
+ <div class="layui-inline">
+ <label class="layui-form-label">姓名</label>
+ <div class="layui-input-block" style="width: 150px;">
+ <input name="doctorName" type="text" class="layui-input" maxlength="20" lay-verify="required"
+ required style="width: 150px;" />
+ </div>
</div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">职称</label>
- <div class="layui-input-block">
- <select id="doctorRankId" name="doctorRankId" lay-filter="doctorRankId" placeholder="选择一个职称"
- lay-verify="required" required>
- <option value="">-请选择-</option>
- </select>
- <input name="doctorRank" id='doctorRank' type="hidden" class="layui-input" maxlength="20" />
+ <div class="layui-inline">
+ <label class="layui-form-label">职称</label>
+ <div class="layui-input-block" style="width: 150px;">
+ <select id="doctorRankId" name="doctorRankId" lay-filter="doctorRankId" placeholder="选择一个职称"
+ lay-verify="required" required>
+ <option value="">-请选择-</option>
+ </select>
+ <input name="doctorRank" id='doctorRank' type="hidden" class="layui-input" maxlength="20" />
+ </div>
</div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">角色</label>
- <div class="layui-input-block">
- <select name="roleId" xm-select="roleId" lay-verify="required">
- </select>
+ <div class="layui-inline">
+ <label class="layui-form-label">角色</label>
+ <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">
- <label class="layui-form-label">联系电话</label>
- <div class="layui-input-block">
- <input name="doctorTel" id="doctorTel-add" type="text" class="layui-input" maxlength="20"
- lay-verify="required|phone" required style="width: 175px;"/>
+ <div class="layui-inline">
+ <label class="layui-form-label">联系电话</label>
+ <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: 150px;" />
+ </div>
</div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">联系电话2</label>
- <div class="layui-input-block">
- <input name="doctorOtherLink" type="text" class="layui-input" maxlength="20" />
+ <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>
- <div class="layui-form-item">
- <label class="layui-form-label">Email</label>
- <div class="layui-input-block">
- <input name="doctorEmail" type="text" class="layui-input" maxlength="20" lay-verify="required|email"
- required />
+ <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 />
+ </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,21 +113,24 @@
<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">
<label class="layui-form-label"> 置顶</label>
<div class="layui-input-block">
- <input name="isTop" id="isTop-shi" type="radio" checked value="true" title="是" class="layui-input"/>
+ <input name="isTop" id="isTop-shi" type="radio" checked value="true" title="是" class="layui-input" />
<input name="isTop" id="isTop-fou" type="radio" value="false" title="否" class="layui-input" />
</div>
</div>
<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>
@@ -115,58 +138,74 @@
<label class="layui-form-label">签约</label>
<div class="layui-input-block">
<input name="isSigning" id="isSigning-shi" type="radio" checked value="true" title="是"
- class="layui-input"/>
- <input name="isSigning" id="isSigning-fou" type="radio" value="false" title="否" class="layui-input"/>
+ class="layui-input" />
+ <input name="isSigning" id="isSigning-fou" type="radio" value="false" title="否" class="layui-input" />
</div>
</div>
</div>
<div style="display:flex">
<div class="layui-form-item">
- <label class="layui-form-label">登录帐号</label>
- <div class="layui-input-block">
- <input name="username" id="username" readonly type="text" class="layui-input" maxlength="20"
- lay-verify="required" required />
+ <div class="layui-inline">
+ <label class="layui-form-label">登录帐号</label>
+ <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>
+ <div class="layui-inline">
+ <label class="layui-form-label">登录密码</label>
+ <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-inline">
+ <label class="layui-form-label">确认密码</label>
+ <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">
- <label class="layui-form-label">登录密码</label>
- <div class="layui-input-block">
- <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">
- <label class="layui-form-label">确认密码</label>
- <div class="layui-input-block">
- <input name="passwordSure" type="password" lay-verify="required|confirmPass" class="layui-input"
- maxlength="20" />
- </div>
+ <div class="layui-form-item"> -->
+
</div>
</div>
<div style="display:flex">
<div class="layui-form-item">
- <label class="layui-form-label">医生的头像</label>
- <div class="layui-input-block" id="demo">
- <button type="button" class="layui-btn" id="phonto">
- <i class="layui-icon"></i>上传图片
- </button>
- <input name="doctorLogo" id="doctorLogo-add" type="hidden" class="layui-input" maxlength="20" />
- <blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
- 预览效果
- <div class="layui-upload-list" id="demo2"></div>
- </blockquote>
+ <div class="layui-inline">
+ <label class="layui-form-label">医生的头像</label>
+ <div class="layui-input-block" id="demo" style="width: 150px;">
+ <button type="button" class="layui-btn" id="phonto">
+ <i class="layui-icon"></i>上传图片
+ </button>
+ <input name="doctorLogo" id="doctorLogo-add" type="hidden" class="layui-input" maxlength="20" />
+ <blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
+ 预览效果
+ <div class="layui-upload-list" id="demo2"></div>
+ </blockquote>
+ </div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">销售代表</label>
+ <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">
- <label class="layui-form-label">销售代表</label>
- <div class="layui-input-block">
- <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 class="layui-form-item"> -->
+
</div>
</div>
@@ -188,7 +227,7 @@
var autocomplete = layui.autocomplete;
var formSelects = layui.formSelects;
var $ = layui.jquery;
-
+
//获取角色
var get_role = function () {
admin.req('api-user/findByMap?tenant_id=hospital', {}, function (data) {
@@ -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) {
@@ -337,7 +377,7 @@
}, "POST");
return false;
});
-
+
//将新增 中的 serverUserName 赋值
form.on('select(serverUserId-add)', function (data) {
//将医院名称赋值
--
Gitblit v1.8.0