~admin/kidgrow-microservices-platform.git

			@@ -10,14 +10,14 @@
			<div class="layui-form toolbar">
			<div class="layui-form-item">
			<div class="layui-inline" style="margin-bottom: -25px;">
			<input id="doctorTel" class="layui-input search-input" type="text" placeholder="按手机号..." />&emsp;
			<input id="doctorName" class="layui-input search-input" type="text" placeholder="按医生名..." />&emsp;
			<input id="doctorTel" class="layui-input search-input" type="text" placeholder="按手机号" />&emsp;
			<input id="doctorName" class="layui-input search-input" type="text" placeholder="按医生名" />&emsp;
			<select id="doctorState" lay-filter="role_clients">
			<option value="">-医院状态-</option>
			<option value="true">正常</option>
			<option value="false">试用</option>
			<option value="1">正常</option>
			<option value="0">试用</option>
			</select>&emsp;
			<input name="hospitalName" id="hospitalName-seach" placeholder="请输入医院名称" type="text"
			<input name="hospitalName" id="hospitalName-seach" placeholder="按医院名称" type="text"
			class="layui-input search-input" maxlength="50" autocomplete="off" />&emsp;
			</div>
			<button id="app-btn-search" class="layui-btn icon-btn permissions" layt="abc"
			@@ -36,8 +36,11 @@

			<script type="text/html" id="doctor-table-bar">
			<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看详情</a>
			{{# if (d.doctorType !=2){}}
			<button class="layui-btn layui-btn-primary layui-btn-xs permissions" permissions="users-edit"
			lay-event="reset">重置密码</button>
			{{#}}}

			<button class="layui-btn layui-btn-primary layui-btn-xs permissions" permissions="sysdoctor-edit"
			lay-event="edit">修改</button>
			<button class="layui-btn layui-btn-xs permissions" permissions="sysdoctor-del" lay-event="del">删除</button>
			@@ -145,7 +148,7 @@
			<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>
			style="width: 697px;"></textarea>
			</div>
			</div>
			</div>
			@@ -281,7 +284,7 @@
			} else {
			layer.msg(data.msg, {
			icon: 2,
			time: 500
			time: 2000
			});
			}
			}, 'Post');
			@@ -299,12 +302,6 @@

			// 修改company状态
			var updata_enable = function (obj) {

			// alert('确定审核通过吗',{icon: 3, title:'提示'}, function(index){
			// console.log("111111111111111111111",index)
			// layer.close(index);
			// });

			layer.confirm('确定审核通过吗？', function (i) {
			admin.req('api-user/sysdoctor/enable', JSON.stringify({
			id: obj.id,
			@@ -314,13 +311,13 @@
			if (data.code == 0) {
			layer.msg(data.msg, {
			icon: 1,
			time: 500
			time: 2000
			});
			parent.layui.table.reload('app-table', {});
			} else {
			layer.msg(data.msg, {
			icon: 2,
			time: 500
			time: 2000
			});
			$(obj.elem).prop('checked', !obj.elem.checked);
			form.render('checkbox');
			@@ -351,7 +348,7 @@
			} else {
			layer.msg(data.msg, {
			icon: 2,
			time: 500
			time: 2000
			});
			}
			}, 'Post');
			@@ -364,14 +361,13 @@
			user = data.data;
			$.each(data.data, function (index, item) {
			//往下拉菜单里添加元素
			console.log(item.nickname)
			$('#serverUserId-add').append(new Option(item.nickname, item.id,
			false, false));
			})
			} else {
			layer.msg(data.msg, {
			icon: 2,
			time: 500
			time: 2000
			});
			}
			}, 'get');
			@@ -404,12 +400,20 @@
			[{
			field: 'hospitalName',
			width: 180,
			title: '医院名称'
			title: '医院名称',
			fixed: 'left'
			},
			{
			field: 'departmentName',
			width: 80,
			title: '科室',
			fixed: 'left'
			},
			{
			field: 'doctorName',
			width: 120,
			title: '医生姓名'
			width: 100,
			title: '医生姓名',
			fixed: 'left'
			},
			{
			field: 'doctorRank',
			@@ -463,10 +467,11 @@
			title: '销售代表'
			},
			{
			width: 350,
			width: 300,
			align: 'center',
			toolbar: '#doctor-table-bar',
			title: '操作'
			title: '操作',
			fixed: 'right'
			},
			]
			],
			@@ -517,6 +522,7 @@
			}
			form.val('app-form', data);
			$('#app-form').find('input,select,textarea').prop('readonly', true);
			$('#app-form').find('select').prop('disabled', true);
			$('#app-form').find('input[type="radio"]').prop('disabled', true);
			$('#app-form').attr('method', 'POST');
			form.render();
			@@ -544,20 +550,19 @@
			data) {
			layer.closeAll('loading');
			if (data.code == 0) {
			layer.msg(data.msg, {
			icon: 1,
			time: 500
			layer.alert("密码重置为：" + data.data, {
			icon: 1
			});
			} else {
			layer.msg(data.msg, {
			icon: 2,
			time: 500
			time: 2000
			});
			}
			}, 'PUT');
			});
			} else if (layEvent === 'edit') {
			showEditModel_add("编辑",data);
			showEditModel_add("编辑", data);
			} else if (layEvent === 'del') {
			layer.confirm('确定删除此用户吗？', function (i) {
			layer.close(i);
			@@ -567,13 +572,13 @@
			if (data.code == 0) {
			layer.msg(data.msg, {
			icon: 1,
			time: 500
			time: 2000
			});
			table.reload('app-table', {});
			} else {
			layer.msg(data.msg, {
			icon: 2,
			time: 500
			time: 2000
			});
			}
			}, 'delete');
			@@ -601,7 +606,7 @@
			});

			// 显示新增弹窗
			var showEditModel_add = function (title,data) {
			var showEditModel_add = function (title, data) {
			admin.putTempData('t_doctor', data);
			admin.popupCenter({
			title: title,