From f5df017deac69032a31b6f637c3ce80cd1c414cb Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 03 Mar 2021 10:42:10 +0800
Subject: [PATCH] 将查看套餐的开始时间和结束时间与h端对应
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html | 65 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 19 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
index c71802e..2fe11e8 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
@@ -8,7 +8,7 @@
</div>
<div class="layui-card-body">
<div class="layui-form toolbar">
- <input id="app-edit-search" class="layui-input search-input" type="text" placeholder="按医生姓名" /> 
+ <input id="app-edit-search" class="layui-input search-input" type="text" autocomplete="off" placeholder="按医生姓名" /> 
<input type="text" class="layui-input search-input" id="test1" placeholder="开始时间" > 至 <input type="text"
class="layui-input search-input" id="test2" placeholder="结束时间" >  
<button id="app-btn-search" class="layui-btn icon-btn permissions" permissions="diagnostic-get"><i class="layui-icon"></i>搜索</button>
@@ -36,13 +36,12 @@
<!-- 表单弹窗 -->
<script type="text/html" id="app-model">
- <form id="app-form" lay-filter="app-form" class="layui-form model-form">
+ <form id="app-form" lay-filter="app-form" class="layui-form model-form" autocomplete="off">
<input name="id" type="hidden"/>
<div class="layui-form-item">
<label class="layui-form-label">需求类型</label>
<div class="layui-input-block">
- <input name="needType" placeholder="请输入应用标识" type="text" class="layui-input" maxlength="20"
- lay-verify="required" required/>
+ <input name="needTypeName" id="needTypeName" placeholder="请输入应用标识" type="text" class="layui-input" maxlength="20"/>
</div>
</div>
<div class="layui-form-item">
@@ -61,31 +60,31 @@
<div class="layui-form-item">
<label class="layui-form-label">科室名称</label>
<div class="layui-input-block">
- <input name="departmentName" placeholder="请输入回调地址" type="text" class="layui-input" maxlength="20"/>
+ <input name="departmentName" type="text" class="layui-input" maxlength="20"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">医生联系方式</label>
<div class="layui-input-block">
- <input name="doctorTel" placeholder="请输入回调地址" type="text" class="layui-input" maxlength="20"/>
+ <input name="doctorTel" type="text" class="layui-input" maxlength="20"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">需求数据的开始时间</label>
<div class="layui-input-block">
- <input name="needBegintime" placeholder="请输入回调地址" type="text" class="layui-input" maxlength="20"/>
+ <input name="needBegintime" type="text" class="layui-input" maxlength="20"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">需求数据的结束时间</label>
<div class="layui-input-block">
- <input name="needEndtime" placeholder="请输入回调地址" type="text" class="layui-input" maxlength="20"/>
+ <input name="needEndtime" type="text" class="layui-input" maxlength="20"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">需求标签</label>
<div class="layui-input-block">
- <textarea name="needTags" placeholder="请输入回调地址" class="layui-input" style="height:200px;overflow:auto" maxlength="20"> </textarea>
+ <textarea name="needTags" class="layui-input" style="height:200px;overflow:auto" maxlength="20"> </textarea>
</div>
</div>
<div class="layui-form-item model-form-footer">
@@ -127,10 +126,30 @@
var laydate = layui.laydate;
//执行一个laydate实例
laydate.render({
- elem: '#test1' //指定元素
+ elem: '#test1', //指定元素
+ done: function (value, date, endDate) {
+ var startDate = new Date(value).getTime();
+ var endTime = new Date($('#test2').val()).getTime();
+ if (endTime < startDate) {
+ layer.msg('结束时间不能小于开始时间');
+ $('#test1').val($('#test2').val());
+ } else {
+ $('#custom_beginTime').val($("#test1").val())
+ }
+ }
});
laydate.render({
- elem: '#test2' //指定元素
+ elem: '#test2', //指定元素
+ done: function (value, date, endDate) {
+ var startDate = new Date($('#test1').val()).getTime();
+ var endTime = new Date(value).getTime();
+ if (endTime < startDate) {
+ layer.msg('结束时间不能小于开始时间');
+ $('#test2').val($('#test1').val());
+ } else {
+ $('#custom_endTime').val($("#test2").val())
+ }
+ }
});
// 渲染表格
@@ -149,7 +168,8 @@
{ field: 'needType',align:'center', width: 100, title: '数据类型', templet: function (d) { if (d.needType == 1) { return '筛查' } else { return '就诊' } } },// 0就诊数据 1筛查
{ field: 'needTags',align:'center', width: 100, align: 'center', toolbar: '#app-table-bar', title: '需求标签' },
{ field: 'enabled',align:'center', width: 200, toolbar: '#app-table-bar1', title: '处理状态', },
- { field: 'downTime',align:'center', width: 250, title: '下载时间', templet: "<div>{{layui.util.toDateString(d.downTime, 'yyyy-MM-dd HH:mm')}}</div>" }
+ { field: 'downTime',align:'center', width: 250, title: '下载时间', templet: "<div>{{layui.util.toDateString(d.downTime, 'yyyy-MM-dd HH:mm')}}</div>" },
+ { field: 'creatTime',align:'center', width: 250, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.creatTime, 'yyyy-MM-dd')}}</div>" }
]],done:function(res){
permissionsInput(res,config);
}
@@ -213,17 +233,17 @@
// 搜索按钮点击事件
$('#app-btn-search').click(function () {
var key = $('#app-edit-search').val();
- var needBegintime = $('#test1').val();
- var needEndtime = $('#test2').val();
- if (needBegintime != null && needEndtime != null) {
- var flag = compareDate(needBegintime, needEndtime);
+ var createTimeBegin = $('#test1').val();
+ var createTimeEnd = $('#test2').val();
+ if (createTimeBegin != null && createTimeEnd != null) {
+ var flag = compareDate(createTimeBegin, createTimeEnd);
if (!flag) {
layer.msg('结束时间不得小于开始时间');
return;
}
}
- table.reload('app-table', { where: { doctorName: key, needBegintime: needBegintime, needEndtime: needEndtime } });
+ table.reload('app-table', { where: { doctorName: key, createTimeBegin: createTimeBegin, createTimeEnd: createTimeEnd },page: {curr: 1 } });
});
//比较日期大小
function compareDate(logintime, logouttime) {
@@ -290,8 +310,8 @@
layer.open({
type: 1,
title: '详情',
- area: '450px',
- offset: '120px',
+ area: '700px',
+ offset: '0px',
content: $('#app-model').html(),
success: function () {
$('#app-form')[0].reset();
@@ -309,6 +329,13 @@
$("input[name='clientId']").attr('class', "layui-input layui-disabled");
$("input[name='webServerRedirectUri']").attr('disabled', true);
$("input[name='webServerRedirectUri']").attr('class', "layui-input layui-disabled");
+ if(data.needType===1)
+ {
+ $("#needTypeName").val("筛查");
+ }
+ else{
+ $("#needTypeName").val("就诊");
+ }
form.val('app-form', data);
$('#app-form').find('input,textarea').prop('readonly', true);
$('#app-form').attr('method', 'POST');
--
Gitblit v1.8.0