From e6a149ea753350d3bebbd76ce40315a8b6016b4e Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Thu, 23 Jul 2020 13:04:47 +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 | 413 ++--------------------------------------------------------
1 files changed, 20 insertions(+), 393 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 b4094b0..c581393 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
@@ -17,15 +17,15 @@
<option value="true">正常</option>
<option value="false">试用</option>
</select> 
- <input name="hospitalName-seach" id="hospitalName-seach" placeholder="请输入医院名称" type="text"
- class="layui-input search-input" maxlength="50" autocomplete="off" /> 
+ <input name="hospitalName" id="hospitalName-seach" placeholder="请输入医院名称" type="text"
+ class="layui-input search-input" maxlength="50" autocomplete="off" /> 
</div>
<button id="app-btn-search" class="layui-btn icon-btn permissions" layt="abc"
permissions="sysdoctor-list"><i class="layui-icon"></i>搜索</button>
<button id="doctor-btn-add" class="layui-btn icon-btn permissions" permissions="sysdoctor-edit"><i
class="layui-icon"></i>添加</button>
- <!-- 数据表格 -->
- <table class="layui-table" id="app-table" lay-filter="app-table"></table>
+ <!-- 数据表格 -->
+ <table class="layui-table" id="app-table" lay-filter="app-table"></table>
</div>
</div>
</div>
@@ -173,175 +173,17 @@
</form>
</script>
-<!-- 表单弹窗 添加-->
-<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-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="doctorName" 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="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">
- <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>
- </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" 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="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" lay-verify="required|email" required/>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">医生简介</label>
- <div class="layui-input-block">
- <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">
- <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>
- </div>
- </div>
- <div style="display:flex">
- <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" maxlength="20"/>
- <input name="isAnswer" id="isAnswer-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="isSigning" id="isSigning-shi" type="radio" checked value="true" title="是" class="layui-input" maxlength="20"/>
- <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">
- <input name="doctorState" id="doctorState-shi" type="radio" checked value="true" title="是" class="layui-input" maxlength="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="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" 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" 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" 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 permissions" permissions="sysdoctor-edit" id="sure" lay-filter="user-form-submit" lay-submit>保存</button>
- </div>
- </form>
-</script>
-
<script>
- layui.use(['form', 'table', 'laydate', 'util', 'config', 'upload', 'admin', 'autocomplete'], function () {
+ layui.use(['form', 'table', 'laydate', 'util', 'config', 'upload', 'admin', 'autocomplete','formSelects'], function () {
var form = layui.form;
var table = layui.table;
var config = layui.config;
var layer = layui.layer;
var util = layui.util;
var admin = layui.admin;
- var upload = layui.upload;
var autocomplete = layui.autocomplete;
+ var formSelects = layui.formSelects;
var $ = layui.jquery;
form.verify({ confirmPass: function (value) { if ($('input[name=password]').val() !== value) return '两次密码输入不一致！'; } });
@@ -467,9 +309,9 @@
headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
page: true,
cols: [[
- { field: 'hospitalName', width: 260, title: '医院名称' },
+ { field: 'hospitalName', width: 180, title: '医院名称' },
{ field: 'doctorName', width: 120, title: '医生姓名' },
- { field: 'doctorRank', width: 180, title: '职称' },
+ { field: 'doctorRank', width: 100, title: '职称' },
{ field: 'username', width: 150, title: '登录帐号' },
{ field: 'doctorTel', width: 150, title: '联系方式' },
{
@@ -484,12 +326,12 @@
},
{ field: 'enabled', width: 100, align: 'center', templet: '#doctor-tpl-state', title: '状态' },
// { field: 'createTime', width: 150, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd HH:mm')}}</div>" },
- { field: 'createTime', width: 250, sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd HH:mm')}}</div>" },
+ { field: 'createTime', width: 100, sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd HH:mm')}}</div>" },
{ field: 'serverUserName', width: 100, title: '销售代表' },
- { width: 200,align: 'center', toolbar: '#doctor-table-bar', title: '操作' },
+ { width: 300, align: 'center', toolbar: '#doctor-table-bar', title: '操作' },
]],
done: function (res, curr, count) {
- permissionsInput();
+ permissionsInput(res,config);
}
});
@@ -533,240 +375,25 @@
// 搜索按钮点击事件
$('#app-btn-search').click(function () {
- if(strUtil.isEmpty($("#hospitalName-seach").val()))
- {
+ if (strUtil.isEmpty($("#hospitalName-seach").val())) {
$("#hospitalId").val("");
}
var doctorState = $('#doctorState').val();
- var hospitalName = $("#hospitalId").val();
+ var hospitalName = $("#hospitalName-seach").val();
var doctorTel = $('#doctorTel').val();
var doctorName = $('#doctorName').val();
- table.reload('app-table', { where: { doctorState: doctorState, hospitalId: hospitalName, doctorTel: doctorTel, doctorName: doctorName } });
+ table.reload('app-table', { where: { doctorState: doctorState, hospitalName: hospitalName, doctorTel: doctorTel, doctorName: doctorName } });
});
+
// 显示新增弹窗
var showEditModel_add = function () {
- layer.open({
- type: 1,
- title: '新增',
- 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');
- //将医院的数据保存到下拉表
- let selected = false;
- //获取职称的
- getZhiCheng();
- //获取销售代表
- getXiaoShouDaiBiao();
- var upload = layui.upload;
- //执行实例
- upload.render({
- elem: '#phonto',
- url: config.base_server + 'api-file/files-anon',
- accept: 'file',
- auto: true,
- headers: { "Authorization": "Bearer " + config.getToken().access_token },
- before: function (obj) {
- layer.load(); //上传loading
- //预读本地文件示例，不支持ie8
- obj.preview(function (index, file, result) {
- $(".layui-upload-img").remove();
- $('#demo2').append('<img src="' + result + '" width="50px" height="50px" alt="' + file.name + '" class="layui-upload-img">')
- });
- },
- done: function (data) {
- layer.closeAll('loading');
- $("#doctorLogo-add").val(data.url);
- },
- error: function (data) {
- layer.closeAll('loading');
- }
- });
- $.each(hospital, function (index, item) {
- if (config.clientId === item.clientId) {
- selected = true;
- } else {
- selected = false;
- }
- console.log(item)
- $('#hospitalName-add').append(new Option(item.hospitalName, item.id, false, selected));
- })
- form.render();
+ admin.popupCenter({
+ title: '编辑医生',
+ path: 'pages/opration/doctor_form.html',
+ area: '900px',
+ finish: function () {
}
});
};
- // 显示编辑弹窗
- var showEditModel = function (data, flag) {
- var title = "";
- if (flag == 1) {
- title = "查看详情";
- } else if (flag == 2) {
- title = "新增";
- } else if (flag == 3) {
- title = "编辑";
- }
-
- layer.open({
- type: 1,
- title: title,
- area: '650px',
- offset: '120px',
- content: $('#app-model').html(),
- success: function () {
- $('#app-form')[0].reset();
- $('#app-form').attr('method', 'POST');
- //将医院的数据保存到下拉表
- let selected = false;
- $.each(hospital, function (index, item) {
- if (config.clientId === item.clientId) {
- selected = true;
- } else {
- selected = false;
- }
- //往下拉菜单里添加元素
- $('#hospitalId').append(new Option(item.hospitalName, item.id, false, selected));
- })
- //将科室的数据绑定到里面
- if (flag != 2) {
- getdepartment(data.hospitalId);
- }
- if (data) {
- if (data.isAnswer) {
- $("#isAnswer-shi").attr('checked', true);
- } else {
- $("#isAnswer-fou").attr('checked', true);
- }
-
- if (data.isSigning) {
- $("#isSigning-shi").attr('checked', true);
- } else {
- $("#isSigning-fou").attr('checked', true);
- }
-
- if (data.isTop) {
- $("#isTop-shi").attr('checked', true);
- } else {
- $("#isTop-fou").attr('checked', true);
- }
-
- if (data.doctorState) {
- $("#doctorState-shi").attr('checked', true);
- } else {
- $("#doctorState-fou").attr('checked', true);
- }
- form.val('app-form', data);
- 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);
- } else {
- $("#sure").show();
- $('#app-form').attr('method', 'POST');
- }
- }
- }
- });
- };
- // 表单提交事件
- form.on('submit(user-form-submit)', function (data) {
- layer.load(2);
- data.field.hospitalId = parseInt(data.field.hospitalId);
- admin.req('api-user/sysdoctor', JSON.stringify(data.field), function (data) {
- layer.closeAll('loading');
- if (data.code == 0) {
- // layer.msg(data.msg, { icon: 1, time: 500 });
- layer.closeAll();
- table.reload('app-table', {});
- } else {
- layer.msg(data.msg, { icon: 2, time: 500 });
- }
- }, "POST");
- return false;
- });
- //更新 点击医院触发的事件
- form.on('select(getdepartment)', function (data) {
- //将医院名称赋值
- $.each(hospital, function (index, item) {
- if (item.id == data.value) {
- $('#hospitalName').val(item.hospitalName);
- }
- })
- //
- getdepartment(data.value);
- });
- //新增----点击医院触发的事件
- form.on('select(getdepartment-add)', function (data) {
- //将医院名称赋值
- $.each(hospital, function (index, item) {
- if (item.id == data.value) {
- $('#hospitalId-add').val(item.hospitalName);
- console.log($('#hospitalId-add').val())
- }
- })
- //
- getdepartment(data.value);
- });
- //将新增 中的 serverUserName 赋值
- form.on('select(serverUserId-add)', function (data) {
- //将医院名称赋值
- $.each(user, function (index, item) {
- if (item.id == data.value) {
- $('#serverUserName-add').val(item.nickname);
- console.log($('#serverUserName-add').val())
- }
- })
- //
- });
- //新增 点击职称的触发事件
- form.on('select(doctorRankId)', function (data) {
- //将部门名称赋值
-
- $.each(doctorRank, function (index, item) {
- if (item.id == data.value) {
- console.log(12312312312)
- $('#doctorRank').val(item.dictionariesName);
- console.log($('#doctorRank').val())
- }
- })
- });
- //新增 和 更新 科室触发的事件
- form.on('select(departmentId)', function (data) {
- //将部门名称赋值
- $.each(department, function (index, item) {
- if (item.id == data.value) {
- $('#departmentName').val(item.departmentName);
- }
- })
- //
- // getdepartment(data.value);
- });
- //获取科室
- var getdepartment = function (data) {
- admin.req('api-user/sysdepartment/findListByHospitalId', { id: data }, function (data) {
- layer.closeAll('loading');
- if (0 === data.code) {
- department = data.data;
- $('#departmentId').empty();
- if (data.data.length > 0) {
- $('#departmentName').val(data.data[0].departmentName);
- }
- $.each(data.data, function (index, item) {
- //往下拉菜单里添加元素
- $('#departmentId').append(new Option(item.departmentName, item.id, false, false));
- form.render('select', 'app-form');
- })
- form.render();
- } else {
- layer.msg(data.msg, { icon: 2, time: 500 });
- }
- }, 'get');
- }
-
});
</script>
\ No newline at end of file
--
Gitblit v1.8.0