From e6a149ea753350d3bebbd76ce40315a8b6016b4e Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Thu, 23 Jul 2020 13:04:47 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html | 53 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 17 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 7106b72..fcaee07 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
@@ -9,11 +9,11 @@
<div class="layui-card-body">
<div class="layui-form toolbar">
<input id="app-edit-search" class="layui-input search-input" type="text" placeholder="输入医生姓名" /> 
- <input type="text" class="layui-input search-input" id="test1"> 至 <input type="text"
- class="layui-input search-input" id="test2">  
- <button id="app-btn-search" class="layui-btn icon-btn"><i class="layui-icon"></i>搜索</button>
+ <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>
<!-- <button id="app-btn-add" class="layui-btn icon-btn"><i class="layui-icon"></i>添加</button> -->
- <button id="app-btn-export" class="layui-btn icon-btn"><i class="layui-icon"></i>导出</button>
+ <button id="app-btn-export" class="layui-btn icon-btn permissions" permissions="dataneed-export"><i class="layui-icon"></i>导出</button>
</div>
<!-- 数据表格 -->
@@ -27,7 +27,7 @@
</script>
<script type="text/html" id="app-table-bar1">
- {{# if (d.enabled ==0){}}
+ {{# if (d.enabled ==0&&d.dataFile==null){}}
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="upload">待上传数据</a>
{{# } else { }}
<p>已上传</p>
@@ -142,15 +142,17 @@
page: true,
cols: [[
{ type: 'numbers' },
- { field: 'doctorName', width: 180, sort: true, title: '医生姓名' },
- { field: 'doctorTel', width: 200, sort: true, title: '联系电话' },
- { field: 'hospitalName', width: 180, sort: true, title: '所在医院' },
- { field: 'needBegintime', width: 300, sort: true, title: '时间段', templet: "<div>{{layui.util.toDateString(d.needBegintime, 'yyyy年MM月dd日')}}至{{layui.util.toDateString(d.needEndtime, 'yyyy年MM月dd日')}}</div>" },
- { field: 'needType', width: 250, sort: true, title: '数据类型', templet: function (d) { if (d.needType == 1) { return '筛查' } else { return '就诊' } } },// 0就诊数据 1筛查
- { field: 'needTags', width: 250, align: 'center', toolbar: '#app-table-bar', sort: true, title: '需求标签' },
- { field: 'enabled', width: 250, sort: true, toolbar: '#app-table-bar1', title: '处理状态', },
- { field: 'downTime', width: 250, sort: true, title: '时间', templet: "<div>{{layui.util.toDateString(d.downTime, 'yyyy年MM月dd日')}}</div>" }
- ]]
+ { field: 'doctorName', width: 100, title: '医生姓名' },
+ { field: 'doctorTel', width: 150, title: '联系电话' },
+ { field: 'hospitalName', width: 300, title: '所在医院' },
+ { field: 'needBegintime', width: 240, title: '时间段', templet: "<div>{{layui.util.toDateString(d.needBegintime, 'yyyy-MM-dd')}}至{{layui.util.toDateString(d.needEndtime, 'yyyy-MM-dd')}}</div>" },
+ { field: 'needType', width: 100, title: '数据类型', templet: function (d) { if (d.needType == 1) { return '筛查' } else { return '就诊' } } },// 0就诊数据 1筛查
+ { field: 'needTags', width: 100, align: 'center', toolbar: '#app-table-bar', title: '需求标签' },
+ { field: 'enabled', width: 200, toolbar: '#app-table-bar1', title: '处理状态', },
+ { field: 'downTime', width: 250, title: '下载时间', templet: "<div>{{layui.util.toDateString(d.downTime, 'yyyy-MM-dd HH:mm')}}</div>" }
+ ]],done:function(res){
+ permissionsInput(res,config);
+ }
});
// 工具条点击事件
@@ -163,7 +165,7 @@
} else if (layEvent === 'upload') { // 上传
layer.open({
type: 1,
- title: '上传图片',
+ title: '上传数据',
area: ["500px", "150px"],
content: $('#app-upload').html(),
success: function () {
@@ -182,7 +184,7 @@
done: function (data) {
layer.closeAll('loading');
// $("#dataFile").val(data.url);
- updateEnabled(data.url, true);
+ updateEnabled(data.url, false);
},
error: function (data) {
layer.closeAll('loading');
@@ -243,10 +245,27 @@
}
// 导出
$('#app-btn-export').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);
+ if (!flag) {
+ layer.msg('结束时间不得小于开始时间');
+ return;
+ }
+ }
+ //获取
var url = config.base_server + 'api-opration/dataneed/export';
var xhr = new XMLHttpRequest();
xhr.open('POST', url, true);
xhr.responseType = "blob";
+ var form = new FormData();
+ // Add selected file to form
+ form.append("doctor_name", key);
+ form.append('need_begintime',needBegintime);
+ form.append('need_endtime',needEndtime);
+
xhr.setRequestHeader("client_type", "DESKTOP_WEB");
xhr.setRequestHeader("Authorization", "Bearer " + config.getToken().access_token);
xhr.onload = function () {
@@ -265,7 +284,7 @@
document.body.removeChild(a);
}
}
- xhr.send();
+ xhr.send(form);
});
// 显示编辑弹窗
--
Gitblit v1.8.0