From b67a622b2becc49a2ae23fa905bc775411439bfa Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 27 Apr 2020 16:54:24 +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 | 201 ++++++++++++++++++++++++++++++--------------------
1 files changed, 121 insertions(+), 80 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 f9ba10b..f63ed3f 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
@@ -15,7 +15,7 @@
<option value="false">试用</option>
</select>
<select id="hospitalName-seach" placeholder="选择一个应用" lay-filter="role_clients">
- <option value="">-请选择-</option>
+ <option value="">-请选择医院-</option>
</select>
<input id="doctorTel" class="layui-input search-input" type="text" placeholder="按手机号..." /> 
<input id="doctorName" class="layui-input search-input" type="text" placeholder="按医生..." /> 
@@ -34,19 +34,24 @@
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="reset">重置密码</a>
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
<a class="layui-btn layui-btn-xs" lay-event="del">删除</a>
- <a class="layui-btn layui-btn-xs" lay-event="enable">停用</a>
+ <!-- <a class="layui-btn layui-btn-xs" lay-event="enable">停用</a> -->
</script>
-
+<!-- 表格状态列 -->
+<script type="text/html" id="doctor-tpl-state">
+ <input type="checkbox" lay-filter="doctor-tpl-state" value="{{d.id}}" lay-skin="switch" lay-text="正常|已停用"
+ {{d.enabled==true?'checked':''}}/>
+</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" >
<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" type="hidden" class="layui-input" maxlength="20"/>
- <select id="hospitalId" name="hospitalId" lay-filter="getdepartment" placeholder="选择一个应用" lay-filter="role_clients">
+ <select id="hospitalId" name="hospitalId" lay-filter="getdepartment" placeholder="选择一个应用" lay-verify="required" required>
<option value="">-请选择-</option>
</select>
</div>
@@ -55,11 +60,14 @@
<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-filter="role_clients">
+ <select id="departmentId" name="departmentId" lay-filter="departmentId" placeholder="选择一个应用" lay-verify="required" required>
<option value="">-请选择-</option>
</select>
</div>
</div>
+ </div>
+
+ <div style="display:flex">
<div class="layui-form-item">
<label class="layui-form-label">医生姓名</label>
<div class="layui-input-block">
@@ -68,35 +76,41 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">医生的头像</label>
+ <label class="layui-form-label" >销售代表名称</label>
<div class="layui-input-block">
- <input name="doctorLogo" type="text" class="layui-input" maxlength="20"/>
+ <input name="serverUserName" type="text" class="layui-input" maxlength="15" lay-verify="required" required/>
</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="doctorTel" type="text" class="layui-input" maxlength="20"/>
+ <input name="doctorTel" type="text" 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="doctorRank" type="text" class="layui-input" maxlength="20"/>
+ <input name="doctorRank" type="text" class="layui-input" maxlength="20" lay-verify="required" required/>
</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="doctorOtherLink" type="text" class="layui-input" maxlength="20"/>
+ <input name="doctorOtherLink" type="text" class="layui-input" maxlength="20" lay-verify="required" required/>
</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"/>
+ <input name="doctorEmail" type="text" class="layui-input" maxlength="20" lay-verify="required|email" required/>
</div>
</div>
+ </div>
+ <div style="display:flex">
<div class="layui-form-item">
<label class="layui-form-label">医生简介</label>
<div class="layui-input-block">
@@ -110,6 +124,8 @@
<input name="isAnswer" id="isAnswer-fou" type="radio" value="false" title="否" class="layui-input" maxlength="20"/>
</div>
</div>
+ </div>
+ <div style="display:flex">
<div class="layui-form-item">
<label class="layui-form-label">是否签约医生</label>
<div class="layui-input-block">
@@ -124,6 +140,7 @@
<input name="isTop" id="isTop-fou" type="radio" value="false" title="否" class="layui-input" maxlength="20"/>
</div>
</div>
+ </div>
<div class="layui-form-item">
<label class="layui-form-label"> 医生状态</label>
<div class="layui-input-block">
@@ -131,12 +148,20 @@
<input name="doctorState" id="doctorState-fou" type="radio" value="false" title="否" class="layui-input" maxlength="20"/>
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label" >销售代表名称</label>
- <div class="layui-input-block">
- <input name="serverUserName" type="text" class="layui-input" maxlength="15"/>
- </div>
+
+ <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; width:150px">
+ 预览图：
+ <div class="layui-upload-list" id="demo2"></div>
+ </blockquote>
</div>
+ </div>
<div class="layui-form-item model-form-footer">
<button class="layui-btn layui-btn-primary" ew-event="closeDialog" type="button">取消</button>
<button class="layui-btn" id="sure" lay-filter="user-form-submit" lay-submit>保存</button>
@@ -146,14 +171,15 @@
<!-- 表单弹窗 添加-->
<script type="text/html" id="app-model-add">
-
+
<form id="app-form-add" lay-filter="app-form-add" class="layui-form model-form">
<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="hospitalId-add" type="hidden" class="layui-input" maxlength="20"/>
- <select id="hospitalName-add" name="hospitalId" lay-filter="getdepartment-add" placeholder="选择一个应用" lay-filter="role_clients">
+ <select id="hospitalName-add" name="hospitalId" lay-filter="getdepartment-add" placeholder="选择一个应用" lay-verify="required" required >
<option value="">-请选择-</option>
</select>
</div>
@@ -165,11 +191,13 @@
lay-verify="required" required />
</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="departmentName" id="departmentName" placeholder="请输入应用名称" type="hidden" class="layui-input" maxlength="20"/>
- <select id="departmentId" name="departmentId" lay-filter="departmentId" placeholder="选择一个应用" lay-filter="role_clients">
+ <select id="departmentId" name="departmentId" lay-filter="departmentId" placeholder="选择一个应用" lay-verify="required" required>
<option value="">-请选择-</option>
</select>
</div>
@@ -177,16 +205,18 @@
<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="选择一个职称" >
+ <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 style="display:flex">
<div class="layui-form-item">
<label class="layui-form-label">联系电话</label>
<div class="layui-input-block">
- <input name="doctorTel" type="text" class="layui-input" maxlength="20"/>
+ <input name="doctorTel" type="text" class="layui-input" maxlength="20" lay-verify="required|phone" required/>
</div>
</div>
<div class="layui-form-item">
@@ -195,10 +225,12 @@
<input name="doctorOtherLink" type="text" class="layui-input" maxlength="20"/>
</div>
</div>
+ </div>
+ <div style="display:flex">
<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"/>
+ <input name="doctorEmail" type="text" class="layui-input" maxlength="20" lay-verify="required|email" required/>
</div>
</div>
<div class="layui-form-item">
@@ -207,26 +239,27 @@
<input name="doctorAbout" type="text" class="layui-input" maxlength="20"/>
</div>
</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>
+ <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" placeholder="选择一个应用" lay-verify="required" required>
+ <option value="">-请选择-</option>
+ </select>
</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" maxlength="20"/>
- <input name="isTop" id="isTop-fou" type="radio" value="false" title="否" class="layui-input" maxlength="20"/>
+ <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" maxlength="20"/>
+ <input name="isTop" id="isTop-fou" type="radio" value="false" title="否" class="layui-input" maxlength="20"/>
+ </div>
</div>
</div>
+ <div style="display:flex">
<div class="layui-form-item">
<label class="layui-form-label">是否医答</label>
<div class="layui-input-block">
@@ -241,6 +274,8 @@
<input name="isSigning" id="isSigning-fou" type="radio" value="false" title="否" class="layui-input" maxlength="20"/>
</div>
</div>
+ </div>
+ <div style="display:flex">
<div class="layui-form-item">
<label class="layui-form-label"> 医生状态</label>
<div class="layui-input-block">
@@ -251,30 +286,40 @@
<div class="layui-form-item">
<label class="layui-form-label" >登录帐号</label>
<div class="layui-input-block">
- <input name="username" type="text" class="layui-input" maxlength="15"/>
+ <input name="username" type="text" class="layui-input" maxlength="15" lay-verify="required" required/>
</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="password" type="text" class="layui-input" maxlength="15"/>
+ <input name="password" type="text" lay-verify="required" class="layui-input" maxlength="15" lay-verify="required" required/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label" >确认密码</label>
<div class="layui-input-block">
- <input name="passwordSure" type="text" class="layui-input" maxlength="15"/>
+ <input name="passwordSure" type="text" lay-verify="required|confirmPass" class="layui-input" maxlength="15"/>
</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="serverUserName" id="serverUserName-add" type="hidden" class="layui-input" maxlength="15"/>
- <select id="serverUserId-add" name="serverUserId" lay-filter="serverUserId-add" placeholder="选择一个应用" lay-filter="role_clients">
- <option value="">-请选择-</option>
- </select>
+ <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>
</div>
+ </div>
+
<div class="layui-form-item model-form-footer">
<button class="layui-btn layui-btn-primary" ew-event="closeDialog" type="button">取消</button>
<button class="layui-btn" id="sure" lay-filter="user-form-submit" lay-submit>保存</button>
@@ -292,19 +337,8 @@
var util = layui.util;
var admin = layui.admin;
var upload = layui.upload;
+ form.verify({ confirmPass:function(value){ if($('input[name=password]').val() !== value) return '两次密码输入不一致！'; }});
-
- //执行实例
- var uploadInst = upload.render({
- elem: '#phonto' //绑定元素
- , url: '/upload/' //上传接口
- , done: function (res) {
- //上传完毕回调
- }
- , error: function () {
- //请求异常回调
- }
- });
//医院数据绑定在弹框里
var hospital = "";
@@ -312,10 +346,10 @@
//销售代表
var user = "";
//职称
- var doctorRank="";
+ var doctorRank = "";
// 获取应用列表
// layer.load(2);
- admin.req('api-user/syshospital/findAll', JSON.stringify({ is_del: 0 }), function (data) {
+ admin.req('api-user/syshospital/findAllByMap', JSON.stringify({ is_del: 0 }), function (data) {
layer.closeAll('loading');
if (0 === data.code) {
let selected = false;
@@ -337,6 +371,25 @@
layer.msg(data.msg, { icon: 2, time: 500 });
}
}, 'Post');
+
+ // 修改company状态
+ form.on('switch(doctor-tpl-state)', function (obj) {
+ layer.load(2);
+ admin.req('api-user/sysdoctor/enable', JSON.stringify({
+ id: obj.elem.value,
+ enabled: obj.elem.checked ? true : false
+ }), function (data) {
+ layer.closeAll('loading');
+ if (data.code == 0) {
+ layer.msg(data.msg, { icon: 1, time: 500 });
+ //table.reload('table-user', {});
+ } else {
+ layer.msg(data.msg, { icon: 2, time: 500 });
+ $(obj.elem).prop('checked', !obj.elem.checked);
+ form.render('checkbox');
+ }
+ }, 'POST');
+ });
//职称添加数据
var getZhiCheng = function () {
admin.req('api-user/sysdictionaries/findAll', JSON.stringify({ dictionariesClassId: "1248150699682988034" }), function (data) {
@@ -418,6 +471,7 @@
return d.isSigning ? "是" : "否"
}
},
+ { field: 'enabled', width: 250, align: 'center', templet: '#doctor-tpl-state', sort: true, title: '状态' },
{ field: 'createTime', width: 250, sort: true, title: '时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy年MM月dd日 HH:mm:ss')}}</div>" },
{ field: 'serverUserName', width: 100, sort: true, title: '销售代表' },
{ width: 200, width: 300, align: 'center', toolbar: '#doctor-table-bar', sort: true, title: '操作' },
@@ -459,20 +513,6 @@
}
}, 'delete');
});
- } else if (layEvent === 'enable') {
- layer.confirm('确定删除此用户吗？', function (i) {
- layer.close(i);
- layer.load(2);
- admin.req('api-user/sysdoctor/enable', JSON.stringify({ id: obj.data.id }), function (data) {
- layer.closeAll('loading');
- if (data.code == 0) {
- layer.msg(data.msg, { icon: 1, time: 500 });
- table.reload('app-table', {});
- } else {
- layer.msg(data.msg, { icon: 2, time: 500 });
- }
- }, 'post');
- });
}
});
@@ -489,13 +529,13 @@
layer.open({
type: 1,
title: '新增',
- area: '450px',
+ area: '600px',
offset: '120px',
content: $('#app-model-add').html(),
success: function () {
$('#app-form-add')[0].reset();
$('#app-form-add').attr('method', 'POST');
- $('.layui-layer-content').css('overflow','auto');
+ $('.layui-layer-content').css('overflow', 'auto');
//将医院的数据保存到下拉表
let selected = false;
//获取职称的
@@ -553,7 +593,7 @@
layer.open({
type: 1,
title: title,
- area: '450px',
+ area: '650px',
offset: '120px',
content: $('#app-model').html(),
success: function () {
@@ -602,6 +642,7 @@
if (flag == 1) {
//将确定隐藏 doctorState-shi
$("#sure").hide();
+ $("#phonto").hide();
//将所有的设置为只读
$('#app-form').find('input').attr('readonly', true);
$('#app-form').find('select,input[type="radio"]').attr('disabled', true);
@@ -666,7 +707,7 @@
//新增 点击职称的触发事件
form.on('select(doctorRankId)', function (data) {
//将部门名称赋值
-
+
$.each(doctorRank, function (index, item) {
if (item.id == data.value) {
console.log(12312312312)
@@ -693,7 +734,7 @@
if (0 === data.code) {
department = data.data;
$('#departmentId').empty();
- if(data.data.length>0){
+ if (data.data.length > 0) {
$('#departmentName').val(data.data[0].departmentName);
}
$.each(data.data, function (index, item) {
--
Gitblit v1.8.0