From 4dabf145f35d9cedc37804cee8d36cf437766699 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Wed, 24 Jun 2020 14:10:08 +0800
Subject: [PATCH] 修改数据需求上传的功能，修改医院logo接口，图片上传缩略图的bug
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 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..6813051 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
@@ -11,9 +11,9 @@
<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>
+ <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(){
+ permissionsInput();
+ }
});
// 工具条点击事件
@@ -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');
--
Gitblit v1.8.0