From 9e0686fa9f6b66cb45114e62cfe8f3c75311886d Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Wed, 24 Jun 2020 19:10:22 +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 | 158 +++++++++++++++++++++++-----------------------------
1 files changed, 69 insertions(+), 89 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 c8010bc..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>
@@ -94,22 +94,23 @@
</form>
</script>
-<!-- <script type="text/html" id="app-upload">
+<script type="text/html" id="app-upload">
<form id="app-form-upload" lay-filter="app-form-upload" class="layui-form model-form">
<input name="id" id="upload-id" type="hidden"/>
<div class="layui-form-item">
-
+ <label class="layui-form-label">上传文件</label>
+ <div class="layui-input-block" id="demo">
+ <button type="button" class="layui-btn" id="phonto">
+ <i class="layui-icon"></i>上传文件
+ </button>
+ <input name="dataFile" id="dataFile" type="hidden" class="layui-input" maxlength="20"/>
+ <input name="enabled" id="enabled" type="hidden" value="0" class="layui-input" maxlength="20"/>
+ </div>
</div>
-
</form>
- <label class="layui-form-label">上传文件</label>
- <button type="button" class="layui-btn" id="uploads">
- <i class="layui-icon"></i>上传文件
- </button>
-</script> -->
+</script>
-<!-- <script type="text/javascript" src="../../assets/libs/layui/layui.js"></script> -->
<script>
layui.use(['form', 'table', 'laydate', 'util', 'upload', 'config', 'admin'], function () {
var form = layui.form;
@@ -141,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日 HH:mm:ss')}}至{{layui.util.toDateString(d.needEndtime, 'yyyy年MM月dd日 HH:mm:ss')}}</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日 HH:mm:ss')}}</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();
+ }
});
// 工具条点击事件
@@ -160,54 +163,55 @@
if (layEvent === 'detail') { // 显示详情
showEditModel(data);
} else if (layEvent === 'upload') { // 上传
- // console.log(12312312)
- // var upload = $("#app-upload");
- // console.log(123123123243)
- // console.log(upload)
- // upload.css('display', 'block')
- // layer.alert('');
- // showUpload(data)
layer.open({
type: 1,
- title:'上传图片',
- area: ["500px", "360px"],
- content:'<div style="" id="app-upload" class="text-center"><form id="app-form-upload" lay-filter="app-form-upload" class="layui-form model-form"><input name="id" id="upload-id" type="hidden" /> <div class="layui-form-item"> </div></form><label class="layui-form-label">上传文件</label> <button type="button" class="layui-btn" id="uploads"><i class="layui-icon"></i>上传文件</button></div>'
- });
+ title: '上传数据',
+ area: ["500px", "150px"],
+ content: $('#app-upload').html(),
+ success: function () {
+ $("#upload-id").val(data.id)
+ var upload = layui.upload;
+ //执行实例
+ upload.render({
+ elem: '#phonto',
+ url: config.base_server + 'api-file/files-anon',
+ accept: 'file',
+ auto: true,
+ headers: { "Authorization": "Bearer " + config.getToken().access_token },
+ before: function (obj) {
+ layer.load(); //上传loading
+ },
+ done: function (data) {
+ layer.closeAll('loading');
+ // $("#dataFile").val(data.url);
+ updateEnabled(data.url, false);
+ },
+ error: function (data) {
+ layer.closeAll('loading');
+ }
+ });
+ }
+ });
}
});
+ //更新上传的状态
+ var updateEnabled = function (dataFile, enabled) {
+ console.log($("#upload-id").val())
-
- // var showUpload = function (data) {
- // layer.open({
- // type: 1,
- // title: '上传文件',
- // area: '450px',
- // offset: '120px',
- // content: $('#app-upload').html(),
- // success: function () {
- // $('#app-form-upload')[0].reset();
- // $('#app-form-upload').attr('method', 'POST');
- // if (data) {
-
- // form.val('#app-form-upload', data);
- // $('#app-form-upload').attr('method', 'POST');
- // }
- // }
- // });
- // };
- // // 删除
- // var doDelete = function (obj) {
- // layer.confirm('确定要删除吗？', function (i) {
- // layer.close(i);
- // layer.load(2);
- // admin.req('api-opration/dataneed/' + obj.data.id, {}, function (data) {
- // layer.closeAll('loading');
- // layer.msg('成功', { icon: 1, time: 500 });
- // obj.del();
- // }, 'DELETE');
- // });
- // };
-
+ admin.req('api-opration/dataneed/updateEnabled', {
+ id: $("#upload-id").val(),
+ enabled: enabled,
+ dataFile: dataFile
+ }, function (data) {
+ layer.closeAll('loading');
+ if (data.code == 0) {
+ layer.closeAll();
+ table.reload('app-table', { where: {} });
+ } else {
+ layer.msg(data.msg, { icon: 2, time: 500 });
+ }
+ }, 'GET');
+ }
// 搜索按钮点击事件
$('#app-btn-search').click(function () {
var key = $('#app-edit-search').val();
@@ -296,30 +300,6 @@
}
});
};
- //文件上传
- upload.render({
- elem: '#uploads',
- url: config.base_server + 'api-file/files-anon',
- accept: 'file',
- auto: true,
- headers: { "Authorization": "Bearer " + config.getToken().access_token },
- before: function (obj) {
- console.log(2132132132)
- // layer.load(); //上传loading
- //预读本地文件示例，不支持ie8
- // obj.preview(function (index, file, result) {
- // $(".layui-upload-img").remove();
- // $('#demo2').append('<img src="' + result + '" width="50px" height="50px" alt="' + file.name + '" class="layui-upload-img">')
- // });
- },
- done: function (data) {
- layer.closeAll('loading');
- console.log(data);
- $("[name=headImgUrl]").val(data.url);
- },
- error: function (data) {
- layer.closeAll('loading');
- }
- });
+
});
</script>
\ No newline at end of file
--
Gitblit v1.8.0