From e6ba57b6f4be54633931ac13078d59978fe01852 Mon Sep 17 00:00:00 2001
From: dougang <78125310@kidgrow.com>
Date: Tue, 26 May 2020 11:37:02 +0800
Subject: [PATCH] 消费记录增加按照时间段查询功能
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html | 84 +++++++++++++++++++++++++++--------------
1 files changed, 55 insertions(+), 29 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
index 89896c5..956d11e 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
@@ -8,6 +8,8 @@
</div>
<div class="layui-card-body">
<div class="layui-form toolbar"> 
+ <input type="text" class="layui-input search-input" id="startTime"> 至 <input type="text"
+ class="layui-input search-input" id="endTime">  
<input id="product-search-value" class="layui-input search-input" type="text" placeholder="按产品名" /> 
<input id="hospital-search-value" class="layui-input search-input" type="text" placeholder="按医院名" /> 
<button id="product-btn-search" class="layui-btn icon-btn"><i class="layui-icon"></i>搜索</button>
@@ -21,7 +23,7 @@
</script>
<!-- 表格状态列 -->
<script type="text/html" id="product-tpl-state">
- <input type="checkbox" lay-filter="product-tpl-state" value="{{d.id}}" lay-skin="switch" lay-text="未处理|已处理"
+ <input type="checkbox" lay-filter="product-tpl-state" value="{{d.id}}" lay-skin="switch" lay-text="启用|已禁用"
{{d.enabled==true?'checked':''}}/>
</script>
@@ -44,10 +46,18 @@
cols: [[
{ field: 'hospitalName', width: 300, title: '医院名称' },
{ field: 'departmentName', width: 100, title: '科室名称' },
- { field: 'proName', width: 200, title: '产品名称' },
- { field: 'ailightCount', width: 150, title: '读片量' },
+ { field: 'proName', width: 250, title: '产品名称' },
+ {
+ field: 'proType', sort: true, align: 'center', width: 80, templet: function (d) {
+ if (d.proType === 0)
+ return "试用"
+ else
+ return "正式"
+ }, title: '类型'
+ },
+ { field: 'ailightCount', width: 100, title: '读片量' },
{ field: 'recordCount', width: 100, title: '报告量' },
- { field: 'isShare', width: 150, title: '是否共享',templet:function(d)
+ { field: 'isShare', width: 100, title: '是否共享',templet:function(d)
{
if(d.isShare)
return '共享'
@@ -61,34 +71,15 @@
{ field: 'proEndtime', width: 120, title: '结束时间',templet:function(d){
return new Date(d.proEndtime).dateFormat("yyyy/MM/dd");
} },
- { field: 'createTime', width: 160, sort: true, title: '创建时间',templet:function(d){
- return new Date(d.createTime).dateFormat("yyyy/MM/dd hh:mm:ss");
- } },
- { field: 'enabled', width: 150, templet: '#product-tpl-state', sort: true, title: '状态' },
+ // { field: 'createTime', width: 160, sort: true, title: '创建时间',templet:function(d){
+ // return new Date(d.createTime).dateFormat("yyyy/MM/dd hh:mm:ss");
+ // } },
+ { field: 'createTime', width: 250, sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd HH:mm')}}</div>" },
{ align: 'center', width: 100, toolbar: '#product-table-bar', title: '操作' }
]]
});
}
renderTable();
-
- // 修改状态
- form.on('switch(product-tpl-state)', function (obj) {
- layer.load(2);
- admin.req('api-opration/productorderdetail/updateEnabled', {
- id: obj.elem.value,
- enabled: obj.elem.checked ? true : false
- }, function (data) {
- layer.closeAll('loading');
- if (data.code == 0) {
- layer.msg(data.msg, { icon: 1, time: 500 });
- } else {
- layer.msg(data.msg, { icon: 2, time: 500 });
- $(obj.elem).prop('checked', !obj.elem.checked);
- form.render('checkbox');
- }
- }, 'GET');
- });
-
// 工具条点击事件
table.on('tool(product-table)', function (obj) {
if (obj.event === 'del') { // 删除
@@ -98,7 +89,6 @@
admin.req('api-opration/productorderdetail/' + obj.data.id, {}, function (data) {
layer.closeAll('loading');
layer.msg(data.msg, { icon: 1, time: 500 }, function () {
-
renderTable();
});
obj.del();
@@ -109,9 +99,45 @@
// 搜索按钮点击事件
$('#product-btn-search').click(function () {
+ var startTime = $('#startTime').val();
+ var endTime = $('#endTime').val();
+ if (startTime != null && endTime != null) {
+ var flag = compareDate(startTime, endTime);
+ if (!flag) {
+ layer.msg('结束时间不得小于开始时间');
+ return;
+ }
+ }
var proName = $('#product-search-value').val();
var hospitalName = $('#hospital-search-value').val();
- table.reload('product-table', { where: { proName: proName,hospitalName: hospitalName } });
+ table.reload('product-table', { where: { proName: proName,hospitalName: hospitalName,startTime: startTime, endTime: endTime } });
});
+
+ //时间格式
+ var laydate = layui.laydate;
+ //执行一个laydate实例
+ laydate.render({
+ elem: '#startTime' //指定元素
+ });
+ laydate.render({
+ elem: '#endTime' //指定元素
+ });
+
+ //比较日期大小
+ function compareDate(logintime, logouttime) {
+ var arys1 = new Array();
+ var arys2 = new Array();
+ if (logintime != null && logouttime != null) {
+ arys1 = logintime.split('-');
+ var logindate = new Date(arys1[0], parseInt(arys1[1] - 1), arys1[2]);
+ arys2 = logouttime.split('-');
+ var logoutdate = new Date(arys2[0], parseInt(arys2[1] - 1), arys2[2]);
+ if (logindate > logoutdate) {
+ return false;
+ } else {
+ return true;
+ }
+ }
+ }
});
</script>
\ No newline at end of file
--
Gitblit v1.8.0