From 77162dbce2f3c8334c3c7b3a80c0e46c83eaf402 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Tue, 11 Aug 2020 20:35:06 +0800
Subject: [PATCH] 1.修改首页统计数据的显示文字 2.修改删除删除充值记录后,读片量不扣减问题

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html
index 175e7ce..ab5536d 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html
@@ -8,16 +8,18 @@
     </div>
     <div class="layui-card-body">
         <div class="layui-form toolbar">&emsp;
-            <input id="product-search-value" class="layui-input search-input" type="text" placeholder="输入产品名" />&emsp;
-            <button id="product-btn-search" class="layui-btn icon-btn"><i class="layui-icon">&#xe615;</i>搜索</button>
-            <button id="product-btn-add" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>添加</button>
+            <input id="product-search-value" class="layui-input search-input" type="text" placeholder="按产品名" />&emsp;
+            <button id="product-btn-search" class="layui-btn icon-btn"><i class="layui-icon permissions"
+                    permissions="product-list">&#xe615;</i>搜索</button>
+            <button id="product-btn-add" class="layui-btn icon-btn permissions" permissions="product-edit"><i
+                    class="layui-icon">&#xe654;</i>添加</button>
         </div>
         <table class="layui-table" id="product-table" lay-filter="product-table"></table>
     </div>
 </div>
 <!-- 表格操作列 -->
 <script type="text/html" id="product-table-bar">
-    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs permissions"  permissions="product-del" lay-event="del">删除</a>
 </script>
 <!-- 表格状态列 -->
 <script type="text/html" id="product-tpl-state">
@@ -45,7 +47,7 @@
                 cols: [[
                     { field: 'proName', width: 300, title: '产品名称' },
                     {
-                        field: 'proType',align: 'center', width: 100, templet: function (d) {
+                        field: 'proType', align: 'center', width: 100, templet: function (d) {
                             if (d.proType === 0)
                                 return "试用"
                             else
@@ -71,9 +73,16 @@
                     { field: 'recordCount', width: 180, title: '报告数' },
                     { field: 'ailightCount', width: 180, title: '读片量' },
                     { field: 'enabled', width: 150, templet: '#product-tpl-state', sort: true, title: '状态' },
-                    { field: 'createTime', width: 200, sort: true, title: '创建时间' },
+                    {
+                        field: 'createTime', width: 200, sort: true, title: '创建时间', templet: function (d) {
+                            return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
+                        }
+                    },
                     { align: 'center', width: 100, toolbar: '#product-table-bar', title: '操作' }
-                ]]
+                ]],
+                done: function (res) {
+                    permissionsInput(res,config);
+                }
             });
         }
         renderTable();
@@ -87,9 +96,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');
                 }
@@ -104,7 +113,7 @@
                     layer.load(2);
                     admin.req('api-opration/product/' + 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 () {
 
                             renderTable();
                         });

--
Gitblit v1.8.0