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/hospital.html | 82 ++++++++++++++++++++++-------------------
1 files changed, 44 insertions(+), 38 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
index 9840a14..48cfcc4 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
@@ -34,10 +34,10 @@
<option value="1">正式</option>
</select>
 
- <input id="hospitalName" class="layui-input search-input" type="text" placeholder="按医院名" /> 
+ <input id="hosName" class="layui-input search-input" type="text" placeholder="按医院名" /> 
<button id="hospita-btn-search" class="layui-btn icon-btn"><i
- class="layui-icon"></i>搜索</button> 
- <button id="hospital-btn-add" class="layui-btn icon-btn"><i class="layui-icon"></i>添加医院</button>
+ class="layui-icon permissions" permissions="hospital-get"></i>搜索</button> 
+ <button id="hospital-btn-add" class="layui-btn icon-btn"><i class="layui-icon permissions" permissions="hospital-save"></i>添加医院</button>
</div>
<!-- 数据表格 -->
@@ -47,11 +47,10 @@
<!-- 表格操作列 -->
<script type="text/html" id="businessRecords-table-bar">
- <a class="layui-btn layui-btn-xs" lay-event="pay">充值</a>
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看详情</a>
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="addDepartment">添加科室</a>
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+ <a class="layui-btn layui-btn-xs permissions" permissions="product-rechage" lay-event="pay">充值</a>
+ <!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看详情</a> -->
+ <a class="layui-btn layui-btn-primary layui-btn-xs permissions" permissions="hospital-save" lay-event="edit">修改</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs permissions" permissions="hospital-del" lay-event="del">删除</a>
</script>
<!-- 表格状态列 -->
<script type="text/html" id="hospital-tpl-state">
@@ -59,7 +58,7 @@
{{d.enabled==true?'checked':''}}/>
</script>
<script>
- layui.use(['form', 'table', 'laydate', 'util', 'config', 'admin', 'area'], function () {
+ layui.use(['form', 'table', 'laydate', 'util', 'config', 'admin', 'autocomplete', 'area'], function () {
var form = layui.form;
var table = layui.table;
var config = layui.config;
@@ -67,7 +66,7 @@
var util = layui.util;
var admin = layui.admin;
var area = layui.area;
-
+
// 渲染表格
table.render({
elem: '#hospital-table',
@@ -76,8 +75,8 @@
headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
page: true,
cols: [[
- { field: 'hospitalName', width: 250, title: '医院名称',fixed:'left'},
- { field: 'departmentName', width: 100, title: '科室' ,fixed:'left'},
+ { field: 'hospitalName', width: 250, title: '医院名称', fixed: 'left' },
+ { field: 'departmentName', width: 100, title: '科室', fixed: 'left' },
{
field: 'hospitalArea', width: 250, title: '所在地区', templet: function (d) {
return ((d.hospitalProvince == null) ? "" : d.hospitalProvince) + " "
@@ -88,24 +87,29 @@
{ field: 'hospitalLink', width: 100, title: '联系人' },
{ field: 'hospitalTel', width: 100, title: '联系方式' },
{
- field: 'enabled', width: 80, sort: true, title: '状态', templet: function (d) {
+ field: 'enabled', width: 80, title: '状态', templet: function (d) {
return d.hospitalState == 0 ? "试用" : "正式"
}
},
{
- field: 'isScreen', width: 80, sort: true, title: '筛查', templet: function (d) {
+ field: 'isScreen', width: 80, title: '筛查', templet: function (d) {
return d.isScreen ? "是" : "否"
}
},
- // { field: 'isAnswer', width: 80, sort: true, title: '医答',templet:function (d) {
+ // { field: 'isAnswer', width: 80, title: '医答',templet:function (d) {
// return d.isScreen?"是":"否"
// } },
{ field: 'serverUserName', width: 100, title: '服务人员' },
- { field: 'createTime', width: 120, sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd')}}</div>" },
- { field: 'enabled', width: 100, templet: '#hospital-tpl-state', sort: true, title: '状态' },
- { field: 'hospitalId', width: 300, align: 'center', toolbar: '#businessRecords-table-bar', title: '操作' ,fixed:'right'}
- ]]
+ { field: 'createTime', width: 120, title: '创建时间', templet:function (d) {
+ return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
+ } },
+ { field: 'enabled', width: 100, templet: '#hospital-tpl-state', title: '状态' },
+ { field: 'hospitalId', width: 300, align: 'center', toolbar: '#businessRecords-table-bar', title: '操作', fixed: 'right' }
+ ]],
+ done:function(res){
+ permissionsInput(res,config);
+ }
});
//省份数据加载
area.areaData("#province", 1, "", "");
@@ -129,23 +133,24 @@
}, 'GET');
});
}
- else if (layEvent === 'addDepartment') {
- //添加科室
- admin.putTempData("t_hospital", data);
- admin.popupCenter({
- title: '添加科室',
- path: 'pages/opration/department_form.html',
- area: ['900px', '60%'],
- finish: function () {
- //清理缓存数据
- admin.putTempData("t_hospital", "");
- }
- })
- }
else if (layEvent === "edit") {
//修改
admin.putTempData("t_hospital", data);
- showEditModel();
+ showEditModel("edit");
+ }
+ else if(layEvent==="pay")
+ {
+ //充值
+ admin.putTempData("t_hospital", data);
+ admin.popupCenter({
+ title: '医院充值',
+ path: 'pages/opration/recharge.html',
+ area: '1200px',
+ offset:'10px',
+ finish: function () {
+ $('#hospita-btn-search').click();
+ }
+ });
}
});
// 搜索按钮点击事件
@@ -153,7 +158,7 @@
var isscreen = $('#isscreen').val();
var isanswer = $('#isanswer').val();
var hospitalstate = $('#hospitalstate').val();
- var hospitalName = $('#hospitalName').val();
+ var hospitalName = $('#hosName').val();
var hospitalProvince = ($("#province").val() != "") ? $('#province option:selected').text() : "";
var hospitalCity = ($("#city").val() != "") ? $('#city option:selected').text() : "";
@@ -174,11 +179,11 @@
// // 显示编辑弹窗
var showEditModel = function (data) {
admin.popupCenter({
- title: '编辑医院/科室',
- path: 'pages/opration/hospital_form_tab.html',
- area: ['900px', '80%'],
+ title: (strUtil.isEmpty(data))?'添加医院':'编辑医院',
+ path: 'pages/opration/hospital_form_base.html',
+ area: '900px',
finish: function () {
-
+ $('#hospita-btn-search').click();
}
});
};
@@ -213,6 +218,7 @@
});
// 添加按钮点击事件
$('#hospital-btn-add').click(function () {
+ admin.putTempData("t_hospital","");
showEditModel();
});
});
--
Gitblit v1.8.0