From e6a149ea753350d3bebbd76ce40315a8b6016b4e Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Thu, 23 Jul 2020 13:04:47 +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/product.html |   33 +++++++++++++++++++++------------
 1 files changed, 21 insertions(+), 12 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 53c6ebb..74bf61a 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
@@ -9,24 +9,22 @@
     <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>
+            <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">
-    <input type="checkbox" lay-filter="product-tpl-state" value="{{d.id}}" lay-skin="switch" lay-text="未处理|已处理"
+    <input type="checkbox" lay-filter="product-tpl-state" value="{{d.id}}" lay-skin="switch" lay-text="禁用|启用"
            {{d.enabled==true?'checked':''}}/>
-</script>
-<!-- 弹窗内容 -->
-<script type="text/html" id="feedback-detail">
-
 </script>
 
 <script>
@@ -40,7 +38,6 @@
 
         // 渲染表格
         var renderTable = function () {
-            layer.load(2);
             table.render({
                 elem: '#product-table',
                 url: config.base_server + 'api-opration/product',
@@ -49,6 +46,14 @@
                 page: true,
                 cols: [[
                     { field: 'proName', width: 300, title: '产品名称' },
+                    {
+                        field: 'proType', align: 'center', width: 100, templet: function (d) {
+                            if (d.proType === 0)
+                                return "试用"
+                            else
+                                return "正式"
+                        }, title: '类型'
+                    },
                     {
                         field: 'proTime', width: 150, title: '有效时长', templet: function (d) {
                             switch (d.proTimeUnit) {
@@ -68,11 +73,15 @@
                     { 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 () {
-                    layer.closeAll('loading');
+                done: function (res) {
+                    permissionsInput(res,config);
                 }
             });
         }

--
Gitblit v1.8.0