From d7a58eb17814af2a16ee13afaf93acda09745ed9 Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Wed, 22 Jul 2020 22:10:35 +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 |    9 +++++----
 1 files changed, 5 insertions(+), 4 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 6813051..71cf9ca 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,8 +9,8 @@
     <div class="layui-card-body">
         <div class="layui-form toolbar">
             <input id="app-edit-search" class="layui-input search-input" type="text" placeholder="输入医生姓名" />&emsp;
-            <input type="text" class="layui-input search-input" id="test1"> 至 <input type="text"
-                class="layui-input search-input" id="test2"> &emsp;
+            <input type="text" class="layui-input search-input" id="test1" placeholder="请输入开始时间" > 至 <input type="text"
+                class="layui-input search-input" id="test2" placeholder="请输入结束时间" > &emsp;
             <button id="app-btn-search" class="layui-btn icon-btn permissions"  permissions="diagnostic-get"><i class="layui-icon">&#xe615;</i>搜索</button>
             <!-- <button id="app-btn-add" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>添加</button> -->
             <button id="app-btn-export" class="layui-btn icon-btn permissions"  permissions="dataneed-export"><i class="layui-icon">&#xe654;</i>导出</button>
@@ -150,8 +150,8 @@
                 { 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();
+            ]],done:function(res){
+                permissionsInput(res,config);
             }
         });
 
@@ -245,6 +245,7 @@
         }
         // 导出
         $('#app-btn-export').click(function () {
+            //获取
             var url = config.base_server + 'api-opration/dataneed/export';
             var xhr = new XMLHttpRequest();
             xhr.open('POST', url, true);

--
Gitblit v1.8.0