From 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Mon, 01 Mar 2021 14:14:35 +0800
Subject: [PATCH] Merge branch 'dev1.1' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html | 89 +++++++++++++++++++++++++++++++-------------
1 files changed, 63 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 faa35c9..e8dd898 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
@@ -43,6 +43,7 @@
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="productdetail-List">套餐</a>
<a class="layui-btn layui-btn-xs permissions" permissions="product-rechage" lay-event="pay">充值</a>
<a class="layui-btn layui-btn-xs layui-btn-normal" permissions="product-pay" lay-event="userpay">支付</a>
+ <a class="layui-btn layui-btn-xs layui-btn-normal" permissions="product-pay" lay-event="health">运功处方</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>
@@ -75,27 +76,26 @@
},
page: true,
cols: [
- [{
- field: 'hospitalId',
- width: 180,
- title: '医院编号',
- fixed: 'left'
- },
+ [
+
{
field: 'hospitalName',
- width: 250,
+ width: "10%",
title: '医院名称',
fixed: 'left'
},
{
field: 'departmentName',
- width: 100,
+ width: "6%",
title: '科室/部门',
fixed: 'left'
},
{
+ field: 'hospitalId',width: '12%',title: '医院编号',
+ },
+ {
field: 'hospitalArea',
- width: 200,
+ width: "10%",
title: '所在地区',
templet: function (d) {
return ((d.hospitalProvince == null) ? "" : d.hospitalProvince) +
@@ -106,22 +106,35 @@
},
{
field: 'hospitalLink',
- width: 100,
+ width: "7%",
title: '联系人'
},
{
field: 'hospitalTel',
- width: 150,
+ width: "8%",
title: '联系方式'
},
- // {
- // field: 'enabled', width: 80, title: '状态', templet: function (d) {
- // return d.hospitalState == 0 ? "试用" : "正式"
- // }
- // },
+ {
+ field: 'departmentLink',
+ width: "6%",
+ title: '科室联系人'
+ },
+ {
+ field: 'departmentTel',
+ width: "8%",
+ title: '科室联系方式'
+ },
+ {
+ field: 'orderType', width: 80, title: '状态', templet: function (d) {
+ if(d.orderType==null){
+ return "";
+ }
+ return d.orderType ? "正式" : "试用"
+ }
+ },
{
field: 'isScreen',
- width: 80,
+ width: "4%",
title: '筛查',
templet: function (d) {
return d.isScreen ? "是" : "否"
@@ -130,15 +143,14 @@
// { field: 'isAnswer', width: 80, title: '医答',templet:function (d) {
// return d.isScreen?"是":"否"
// } },
-
{
field: 'serverUserName',
- width: 100,
+ width: "6%",
title: '服务人员'
},
{
field: 'createTime',
- width: 150,
+ width: "10%",
title: '创建时间',
templet: function (d) {
return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
@@ -146,15 +158,15 @@
},
{
field: 'enabled',
- width: 80,
+ width: "7%",
templet: '#hospital-tpl-state',
title: '状态',
align: 'center',
fixed: 'right'
},
{
- field: 'hospitalId',
- width: 240,
+ // field: 'hospitalId',
+ width: "20%",
align: 'center',
toolbar: '#businessRecords-table-bar',
title: '操作',
@@ -223,6 +235,18 @@
$('#hospita-btn-search').click();
}
});
+ } else if(layEvent=="health"){
+ //运动处方服务
+ admin.putTempData("t_hospital", data);
+ admin.popupCenter({
+ title: '运动处方服务',
+ path: 'pages/opration/hospital_health.html',
+ area: '500px',
+ offset: '50px',
+ finish: function () {
+ $('#hospita-btn-search').click();
+ }
+ });
}
});
// 搜索按钮点击事件
@@ -246,10 +270,14 @@
hospitalName: hospitalName,
hospitalProvince: hospitalProvince,
hospitalCity: hospitalCity,
- hospitalArea: hospitalArea
+ hospitalArea: hospitalArea,
+ // page: 1,
};
table.reload('hospital-table', {
- where: whereModel
+ where: whereModel,
+ page: {
+ curr: 1
+ }
});
});
@@ -322,7 +350,8 @@
method: 'GET',
where: {
'hospitalId': data.hospitalId,
- 'departmentId': data.departmentId
+ 'departmentId': data.departmentId,
+ 'enabled': true
},
headers: {
'Authorization': 'Bearer ' + config.getToken().access_token
@@ -342,6 +371,14 @@
title: '读片量(剩余)'
},
{
+ field: 'ailightCount',
+ width: 150,
+ title: '读片使用量',
+ templet: function (d) {
+ return d.orderAilightCount-d.ailightCount;
+ }
+ },
+ {
field: 'recordCount',
width: 150,
title: '报告量(剩余)'
--
Gitblit v1.8.0