From c49b95fc3576f9a5dad5bcaa6874157d5091f6e0 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Thu, 27 Aug 2020 09:19:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html | 96 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 80 insertions(+), 16 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 ed14d56..a12b18e 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,9 +8,22 @@
</div>
<div class="layui-card-body">
<div class="layui-form toolbar"> 
- <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>
+ <div class="layui-col-sm10">
+ <div class="layui-col-sm4">
+ <input type="text" class="layui-input search-input" id="startTime" placeholder="开始时间"> 至 <input type="text"
+ class="layui-input search-input" id="endTime" placeholder="结束时间">  
+ </div>
+ <div class="layui-col-sm2">
+ <input id="product-search-value" class="layui-input search-input" type="text" placeholder="按产品名" /> 
+ </div>
+ <div class="layui-col-sm2">
+ <input id="hospital-search-value" class="layui-input search-input" type="text" placeholder="按医院名" style="width: 100%;" />
+ <input type="hidden" id="hospitalId" value="">
+ </div>
+ <div class="layui-col-sm2">
+  <button id="product-btn-search" class="layui-btn icon-btn"><i class="layui-icon"></i>搜索</button>
+ </div>
+ </div>
</div>
<table class="layui-table" id="product-table" lay-filter="product-table"></table>
</div>
@@ -26,25 +39,36 @@
</script>
<script>
- layui.use(['table', 'util', 'admin', 'config', 'form'], function () {
+ layui.use(['table', 'util', 'admin', 'config', 'form', 'laydate', 'autocomplete'], function () {
let table = layui.table;
let util = layui.util;
let admin = layui.admin;
let form = layui.form;
let config = layui.config;
+ var autocomplete = layui.autocomplete;
+ var laydate = layui.laydate;
+
+ //执行一个laydate实例
+ laydate.render({
+ elem: '#startTime' //指定元素
+ });
+ laydate.render({
+ elem: '#endTime' //指定元素
+ });
// 渲染表格
var renderTable = function () {
table.render({
elem: '#product-table',
- url: config.base_server + 'api-opration/productorderdetail/all',
+ url: config.base_server + 'api-opration/productorderrecord/all',
method: 'GET',
headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
page: true,
cols: [[
- { field: 'hospitalName', width: 300, title: '医院名称' },
+ { field: 'hospitalId', width: 180, title: '医院编号' },
+ { field: 'hospitalName', width: 200, title: '医院名称' },
{ field: 'departmentName', width: 100, title: '科室名称' },
- { field: 'proName', width: 250, title: '产品名称' },
+ { field: 'proName', width: 200, title: '产品名称' },
{
field: 'proType', sort: true, align: 'center', width: 80, templet: function (d) {
if (d.proType === 0)
@@ -69,10 +93,12 @@
{ 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");
- } },
- { align: 'center', width: 100, toolbar: '#product-table-bar', 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: 200, 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: '操作',
+ fixed: 'right' }
]]
});
}
@@ -80,12 +106,12 @@
// 工具条点击事件
table.on('tool(product-table)', function (obj) {
if (obj.event === 'del') { // 删除
- layer.confirm('确定要删除吗？', function (i) {
+ layer.confirm('您确定要删除这次充值吗？删除后不可恢复!', function (i) {
layer.close(i);
layer.load(2);
- admin.req('api-opration/productorderdetail/' + obj.data.id, {}, function (data) {
+ admin.req('api-opration/productorderrecord/' + obj.data.id, {}, function (data) {
layer.closeAll('loading');
- layer.msg(data.msg, { icon: 1, time: 500 }, function () {
+ layer.msg(data.msg, { icon: 1, time: 2000 }, function () {
renderTable();
});
obj.del();
@@ -96,9 +122,47 @@
// 搜索按钮点击事件
$('#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 } });
+ var hospitalId = $('#hospitalId').val();
+ table.reload('product-table', { where: { proName: proName,hospitalId: hospitalId,startTime: startTime, endTime: 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;
+ }
+ }
+ }
+
+ //自动完成-医院名称
+ autocomplete.render({
+ elem: $('#hospital-search-value'),
+ keywordsName: 'hospitalName',//查询关键字名称
+ url: config.base_server + 'api-user/syshospital/findByName',
+ template_val: '{{d.hospitalName}}',//选择后文本框显示的数据字段
+ template_txt: "<div class='layui-table-cell'>{{d.hospitalName}}</div>",//下拉列表模板
+ onselect: function (resp) {
+ $("#hospitalId").val(resp.id);
+ }
});
});
</script>
\ No newline at end of file
--
Gitblit v1.8.0