From d6c989a5d9122e5cf969dd640a92b8e12caf8aa6 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Thu, 22 Apr 2021 11:18:28 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html | 142 ++++++++++++++++++++++++++++++++---------------
1 files changed, 96 insertions(+), 46 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 2ef11ad..27ae8b8 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
@@ -21,24 +21,16 @@
<option value="1">-是-</option>
<option value="0">-否-</option>
</select>
-  
- <!-- <select id="isanswer" placeholder="选择医答状态" lay-filter="isanswer">
- <option value="">-是否医答-</option>
- <option value="1">-是-</option>
- <option value="0">-否-</option>
+ <select id="ispay" placeholder="支付功能" lay-filter="ispay">
+ <option value="">-支付功能-</option>
+ <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> -->
-  
- <input id="hosName" class="layui-input search-input" type="text" placeholder="按医院名" /> 
+ <input id="hosName" class="layui-input search-input" type="text" autocomplete="off" placeholder="按医院名" />
<button id="hospita-btn-search" class="layui-btn icon-btn"><i 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>
+ permissions="hospital-save"></i>添加医院/科室</button>
</div>
<!-- 数据表格 -->
@@ -50,8 +42,10 @@
<script type="text/html" id="businessRecords-table-bar">
<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>
+ <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">
@@ -82,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: 250,
+ width: "10%",
title: '所在地区',
templet: function (d) {
return ((d.hospitalProvince == null) ? "" : d.hospitalProvince) +
@@ -113,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 ? "是" : "否"
@@ -137,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");
@@ -153,14 +158,15 @@
},
{
field: 'enabled',
- width: 80,
+ width: "7%",
templet: '#hospital-tpl-state',
title: '状态',
+ align: 'center',
fixed: 'right'
},
{
- field: 'hospitalId',
- width: 250,
+ // field: 'hospitalId',
+ width: "20%",
align: 'center',
toolbar: '#businessRecords-table-bar',
title: '操作',
@@ -204,10 +210,10 @@
//充值
admin.putTempData("t_hospital", data);
admin.popupCenter({
- title: '医院充值',
+ title: '医院科室充值',
path: 'pages/opration/recharge.html',
area: '1200px',
- offset: '10px',
+ offset: '0px',
finish: function () {
$('#hospita-btn-search').click();
}
@@ -217,11 +223,37 @@
{
productdetailShow(obj);
}
+ else if (layEvent === "userpay") {
+ //充值
+ admin.putTempData("t_hospital", data);
+ admin.popupCenter({
+ title: '单次支付功能',
+ path: 'pages/opration/hospital_pay.html',
+ area: '500px',
+ offset: '50px',
+ finish: function () {
+ $('#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();
+ }
+ });
+ }
});
// 搜索按钮点击事件
$('#hospita-btn-search').click(function () {
var isscreen = $('#isscreen').val();
var isanswer = $('#isanswer').val();
+ var ispay = $('#ispay').val();
var hospitalstate = $('#hospitalstate').val();
var hospitalName = $('#hosName').val();
@@ -233,14 +265,19 @@
var whereModel = {
isScreen: isscreen,
isAnswer: isanswer,
+ isPay: ispay,
hospitalState: hospitalstate,
hospitalName: hospitalName,
hospitalProvince: hospitalProvince,
hospitalCity: hospitalCity,
- hospitalArea: hospitalArea
+ hospitalArea: hospitalArea,
+ // page: 1,
};
table.reload('hospital-table', {
- where: whereModel
+ where: whereModel,
+ page: {
+ curr: 1
+ }
});
});
@@ -250,6 +287,7 @@
title: (strUtil.isEmpty(data)) ? '添加医院/科室' : '编辑医院/科室',
path: 'pages/opration/hospital_form_base.html',
area: '900px',
+ offset: '0px',
finish: function () {
$('#hospita-btn-search').click();
}
@@ -312,7 +350,8 @@
method: 'GET',
where: {
'hospitalId': data.hospitalId,
- 'departmentId': data.departmentId
+ 'departmentId': data.departmentId,
+ 'enabled': true
},
headers: {
'Authorization': 'Bearer ' + config.getToken().access_token
@@ -330,6 +369,14 @@
field: 'ailightCount',
width: 150,
title: '读片量(剩余)'
+ },
+ {
+ field: 'ailightCount',
+ width: 150,
+ title: '读片使用量',
+ templet: function (d) {
+ return d.orderAilightCount-d.ailightCount;
+ }
},
{
field: 'recordCount',
@@ -353,7 +400,7 @@
title: '开始时间',
templet: function (d) {
return new Date(d.proBegintime)
- .dateFormat("yyyy/MM/dd");
+ .dateFormat("yyyy/MM/dd hh:mm:ss");
}
},
{
@@ -361,8 +408,11 @@
width: 180,
title: '结束时间',
templet: function (d) {
- return new Date(d.proEndtime)
- .dateFormat("yyyy/MM/dd");
+ var dateTime=new Date(d.proEndtime);
+ dateTime=dateTime.setDate(dateTime.getDate()-1);
+ dateTime=new Date(dateTime);
+ return dateTime
+ .dateFormat("yyyy/MM/dd")+" 24:00:00";
}
},
{
--
Gitblit v1.8.0