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/feedback.html |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 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 0c04123..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,12 +9,12 @@
     <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"><i class="layui-icon">&#xe615;</i>搜索</button>
+            <button id="user-btn-search" class="layui-btn icon-btn permissioins" permissioins="feedback-list"><i class="layui-icon">&#xe615;</i>搜索</button>
         </div>
 
         <table class="layui-table" id="feedback-table" lay-filter="feedback-table"></table>
@@ -24,7 +24,7 @@
 <!-- 表格操作列 -->
 <script type="text/html" id="feeedback-table-bar">
     <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看详情</a>
-    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs permissioins" permissioins="feedback-del" lay-event="del">删除</a>
 </script>
 <!-- 表格状态列 -->
 <script type="text/html" id="user-tpl-state">
@@ -65,10 +65,14 @@
                 { field: 'doctorTel', width: 200, title: '联系电话' },
                 { field: 'hospitalName', width: 300, title: '医院' },
                 { field: 'departmentName', width: 180, title: '科室' },
-                { field: 'enabled', width: 150, templet: '#user-tpl-state', sort: true, title: '状态' },
-                { field: 'createTime', width: 200, sort: true, title: '创建时间' },
+                { field: 'enabled', width: 150, templet: '#user-tpl-state',  title: '状态' },
+                { field: 'createTime', width: 200, title: '创建时间',templet:function(d){
+                    return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
+                } },
                 { align: 'center', width: 200, toolbar: '#feeedback-table-bar', title: '操作' }
-            ]]
+            ]],done:function(res){
+                permissionsInput(res,config);
+            }
         });
 
         // 修改状态

--
Gitblit v1.8.0