From e7c3314727fc06444689c0e6ecab5fea337afeb0 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 26 Feb 2021 15:24:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 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..18b8fff 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
@@ -8,11 +8,11 @@
     </div>
     <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 id="user-search-value" class="layui-input search-input" type="text" placeholder="按医生姓名" />&emsp;
+            <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>
@@ -69,9 +69,9 @@
                 { 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(){
-                permissionsInput();
+                { align: 'center', width: 150, toolbar: '#feeedback-table-bar', title: '操作',fixed: 'right' }
+            ]],done:function(res){
+                permissionsInput(res,config);
             }
         });
 
@@ -84,9 +84,9 @@
             }, function (data) {
                 layer.closeAll('loading');
                 if (data.code == 0) {
-                    layer.msg(data.msg, { icon: 1, time: 500 });
+                    layer.msg(data.msg, { icon: 1, time: 2000 });
                 } else {
-                    layer.msg(data.msg, { icon: 2, time: 500 });
+                    layer.msg(data.msg, { icon: 2, time: 2000 });
                     $(obj.elem).prop('checked', !obj.elem.checked);
                     form.render('checkbox');
                 }
@@ -101,7 +101,7 @@
                     layer.load(2);
                     admin.req('api-opration/sysfeedback/' + obj.data.id, {}, function (data) {
                         layer.closeAll('loading');
-                        layer.msg(data.msg, { icon: 1, time: 500 }, function () {
+                        layer.msg(data.msg, { icon: 1, time: 2000 }, function () {
                             tableLoad();
                         });
                         obj.del();
@@ -126,7 +126,7 @@
                             });
                         }
                         else {
-                            layer.msg('未找到相关数据', { icon: 1, time: 500 });
+                            layer.msg('未找到相关数据', { icon: 1, time: 2000 });
                         }
                     },
                     beforeSend: function (xhr) {
@@ -150,7 +150,7 @@
                 dateend = dateUtil.getNowDate();
                 $('#dateend').val(dateend);
             }
-            table.reload('feedback-table', { where: { doctorName: doctorName, createTime: datebegin, updateTime: dateend } });
+            table.reload('feedback-table', { where: { doctorName: doctorName, createTime: datebegin, updateTime: dateend },page: {curr: 1  } });
         });
     });
 </script>
\ No newline at end of file

--
Gitblit v1.8.0