From 346ae7f3ce0e30785b9cc0aea1d92204534a83d6 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Thu, 14 May 2020 18:37:26 +0800
Subject: [PATCH] 1.增加运营管理部分的所有的功能按钮权限显示隐藏功能 2.修改了部分已知的bug

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

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
index 89896c5..ab13ea9 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
@@ -10,18 +10,18 @@
         <div class="layui-form toolbar">&emsp;
             <input id="product-search-value" class="layui-input search-input" type="text" placeholder="按产品名" />&emsp;
             <input id="hospital-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-search" class="layui-btn icon-btn permissions" permissions="productorderdetail-get"><i class="layui-icon">&#xe615;</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="productorderdetail-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>
 
@@ -44,10 +44,18 @@
                 cols: [[
                     { field: 'hospitalName', width: 300, title: '医院名称' },
                     { field: 'departmentName', width: 100, title: '科室名称' },
-                    { field: 'proName', width: 200, title: '产品名称' },
-                    { field: 'ailightCount', width: 150, title: '读片量' },
+                    { field: 'proName', width: 250, title: '产品名称' },
+                    {
+                    field: 'proType', sort: true, align: 'center', width: 80, templet: function (d) {
+                        if (d.proType === 0)
+                            return "试用"
+                        else
+                            return "正式"
+                    }, title: '类型'
+                },
+                    { field: 'ailightCount', width: 100, title: '读片量' },
                     { field: 'recordCount', width: 100, title: '报告量' },
-                    { field: 'isShare', width: 150, title: '是否共享',templet:function(d)
+                    { field: 'isShare', width: 100, title: '是否共享',templet:function(d)
                     {
                         if(d.isShare)
                         return '共享'
@@ -62,33 +70,16 @@
                         return new Date(d.proEndtime).dateFormat("yyyy/MM/dd");
                     } },
                     { field: 'createTime', width: 160, sort: true, title: '创建时间',templet:function(d){
-                        return new Date(d.createTime).dateFormat("yyyy/MM/dd hh:mm:ss");
+                        return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
                     } },
-                    { field: 'enabled', width: 150, templet: '#product-tpl-state', sort: true, title: '状态' },
                     { align: 'center', width: 100, toolbar: '#product-table-bar', title: '操作' }
-                ]]
+                ]],
+                done:function(){
+                    permissionsInput();
+                }
             });
         }
         renderTable();
-
-        // 修改状态
-        form.on('switch(product-tpl-state)', function (obj) {
-            layer.load(2);
-            admin.req('api-opration/productorderdetail/updateEnabled', {
-                id: obj.elem.value,
-                enabled: obj.elem.checked ? true : false
-            }, function (data) {
-                layer.closeAll('loading');
-                if (data.code == 0) {
-                    layer.msg(data.msg, { icon: 1, time: 500 });
-                } else {
-                    layer.msg(data.msg, { icon: 2, time: 500 });
-                    $(obj.elem).prop('checked', !obj.elem.checked);
-                    form.render('checkbox');
-                }
-            }, 'GET');
-        });
-
         // 工具条点击事件
         table.on('tool(product-table)', function (obj) {
             if (obj.event === 'del') { // 删除
@@ -98,7 +89,6 @@
                     admin.req('api-opration/productorderdetail/' + obj.data.id, {}, function (data) {
                         layer.closeAll('loading');
                         layer.msg(data.msg, { icon: 1, time: 500 }, function () {
-
                             renderTable();
                         });
                         obj.del();

--
Gitblit v1.8.0