From e940b53f9d8fd9056aee2870e41a6e7932b2e8d6 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 24 Aug 2020 17:21:41 +0800
Subject: [PATCH] 1.修改获取余额的时候,将预扣费算作有效的bug 2.医院管理 增加了显示医院编号
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html | 72 +++++++++++++++++++++++-------------
1 files changed, 46 insertions(+), 26 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 809efd5..dfffdb2 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
@@ -27,17 +27,17 @@
<option value="1">-是-</option>
<option value="0">-否-</option>
</select>
-   -->
+  
<select id="hospitalstate" placeholder="选择医院状态" lay-filter="hospitalstate">
<option value="">-医院状态-</option>
<option value="0">试用</option>
<option value="1">正式</option>
- </select>
+ </select> -->
 
<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,10 +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-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" lay-event="edit">修改</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</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">
@@ -75,36 +75,42 @@
headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
page: true,
cols: [[
+ { field: 'hospitalId', width: 180, title: '医院编号', fixed: 'left' },
{ field: 'hospitalName', width: 250, title: '医院名称', fixed: 'left' },
- { field: 'departmentName', width: 100, title: '科室', fixed: 'left' },
+ { field: 'departmentName', width: 100, title: '科室/部门', fixed: 'left' },
{
- field: 'hospitalArea', width: 250, title: '所在地区', templet: function (d) {
+ field: 'hospitalArea', width: 360, title: '所在地区', templet: function (d) {
return ((d.hospitalProvince == null) ? "" : d.hospitalProvince) + " "
+ ((d.hospitalCity == null) ? "" : d.hospitalCity) + " " +
((d.hospitalArea == null) ? "" : d.hospitalArea)
}
},
{ field: 'hospitalLink', width: 100, title: '联系人' },
- { field: 'hospitalTel', width: 100, title: '联系方式' },
+ { field: 'hospitalTel', width: 150, title: '联系方式' },
+ // {
+ // field: 'enabled', width: 80, title: '状态', templet: function (d) {
+ // return d.hospitalState == 0 ? "试用" : "正式"
+ // }
+ // },
{
- field: 'enabled', width: 80, sort: true, 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: 150, 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: 200, align: 'center', toolbar: '#businessRecords-table-bar', title: '操作', fixed: 'right' }
+ ]],
+ done:function(res){
+ permissionsInput(res,config);
+ }
});
//省份数据加载
area.areaData("#province", 1, "", "");
@@ -113,7 +119,7 @@
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'del') {
- layer.confirm('确定要删除吗？', function (i) {
+ layer.confirm('确定要删除科室数据吗？', function (i) {
layer.load(2);
var whereModel = {
id: obj.data.hospitalId,
@@ -121,7 +127,7 @@
};
admin.req('api-user/syshospital/delete', whereModel, function (data) {
layer.closeAll('loading');
- layer.msg(data.msg, { icon: 1, time: 500 }, function () {
+ layer.msg(data.msg, { icon: 1, time: 2000 }, function () {
$('#hospita-btn-search').click();
});
obj.del();
@@ -132,6 +138,20 @@
//修改
admin.putTempData("t_hospital", data);
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();
+ }
+ });
}
});
// 搜索按钮点击事件
@@ -160,7 +180,7 @@
// // 显示编辑弹窗
var showEditModel = function (data) {
admin.popupCenter({
- title: (strUtil.isEmpty(data))?'添加医院':'编辑医院',
+ title: (strUtil.isEmpty(data))?'添加医院/科室':'编辑医院/科室',
path: 'pages/opration/hospital_form_base.html',
area: '900px',
finish: function () {
@@ -189,9 +209,9 @@
}, function (data) {
layer.closeAll('loading');
if (data.code == 0) {
- layer.msg(data.msg, { icon: 1, time: 500 });
+ layer.msg(data.msg, { icon: 1, time: 2000 });
} else {
- layer.msg(data.msg, { icon: 2, time: 500 });
+ layer.msg(data.msg, { icon: 2, time: 2000 });
$(obj.elem).prop('checked', !obj.elem.checked);
form.render('checkbox');
}
--
Gitblit v1.8.0