From 3c470b15b952b86c1e38cb9634190a12ccf3d38d Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Wed, 22 Jul 2020 15:32:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html
index 4f03084..14462d0 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html
@@ -9,10 +9,10 @@
     <div class="layui-card-body">
         <div class="layui-form toolbar">&emsp;
             <input id="user-search-value" class="layui-input search-input" type="text" placeholder="输入医生姓名" />&emsp;
-            <input type="text" name="date" id="datebegin" lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off"
+            <input type="text" name="date" id="datebegin" lay-verify="date" placeholder="请输入开始时间" autocomplete="off"
                 class="layui-input search-input">
             至
-            <input type="text" name="date" id="dateend" lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off"
+            <input type="text" name="date" id="dateend" lay-verify="date" placeholder="请输入结束时间" autocomplete="off"
                 class="layui-input search-input"> &emsp;
             <button id="user-btn-search" class="layui-btn icon-btn permissioins" permissioins="feedback-list"><i class="layui-icon">&#xe615;</i>搜索</button>
         </div>
@@ -70,8 +70,8 @@
                     return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
                 } },
                 { align: 'center', width: 200, toolbar: '#feeedback-table-bar', title: '操作' }
-            ]],done:function(){
-                permissionsInput();
+            ]],done:function(res){
+                permissionsInput(res,config);
             }
         });
 

--
Gitblit v1.8.0