From 9e0686fa9f6b66cb45114e62cfe8f3c75311886d Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Wed, 24 Jun 2020 19:10:22 +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/verifyRecharge.html |   66 +++++++++++++++++++--------------
 1 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/verifyRecharge.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/verifyRecharge.html
index edee941..d511991 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/verifyRecharge.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/verifyRecharge.html
@@ -10,15 +10,15 @@
         <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="updateEnabled-detail"><i class="layui-icon">&#xe615;</i>搜索</button>
         </div>
-        <table class="layui-table" id="product-table" lay-filter="product-table"></table>
+        <table class="layui-table permissions" id="product-table" lay-filter="product-table" permissions="productorderdetail-verify"></table>
     </div>
 </div>
 <!-- 表格状态列 -->
 <script type="text/html" id="product-tpl-state">
     <input type="checkbox" lay-filter="product-tpl-state" value="{{d.id}}" lay-skin="switch" lay-text="生效|待审核"
-           {{d.enabled!=true?'checked':''}}/>
+           {{d.enabled==true?'checked':''}}/>
 </script>
 
 <script>
@@ -35,7 +35,7 @@
                 elem: '#product-table',
                 url: config.base_server + 'api-opration/productorderdetail/all',
                 method: 'GET',
-                where:{enabled:0,proType:0},
+                where: { enabled: 0, proType: 0 },
                 headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
                 page: true,
                 cols: [[
@@ -43,34 +43,43 @@
                     { field: 'departmentName', width: 100, 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: 'proType', sort: true, align: 'center', width: 80, templet: function (d) {
+                            if (d.proType === 0)
+                                return "试用"
+                            else
+                                return "正式"
+                        }, title: '类型'
+                    },
                     { field: 'ailightCount', width: 150, title: '读片量' },
                     { field: 'recordCount', width: 100, title: '报告量' },
-                    { field: 'isShare', width: 100, title: '是否共享',templet:function(d)
                     {
-                        if(d.isShare)
-                        return '共享'
-                        else
-                        return '私有'
-                    }
+                        field: 'isShare', width: 100, title: '是否共享', templet: function (d) {
+                            if (d.isShare)
+                                return '共享'
+                            else
+                                return '私有'
+                        }
                     },
-                    { field: 'proBegintime', width: 120, title: '开始时间',templet:function(d){
-                        return new Date(d.proBegintime).dateFormat("yyyy/MM/dd");
-                    } },
-                    { field: 'proEndtime', width: 120, title: '结束时间',templet:function(d){
-                        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");
-                    } },
+                    {
+                        field: 'proBegintime', width: 120, title: '开始时间', templet: function (d) {
+                            return new Date(d.proBegintime).dateFormat("yyyy/MM/dd");
+                        }
+                    },
+                    {
+                        field: 'proEndtime', width: 120, title: '结束时间', templet: function (d) {
+                            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");
+                        }
+                    },
                     { field: 'enabled', width: 100, templet: '#product-tpl-state', sort: true, title: '审核' }
-                ]]
+                ]],
+                done:function(){
+                permissionsInput();
+                }
             });
         }
         renderTable();
@@ -85,6 +94,7 @@
                 layer.closeAll('loading');
                 if (data.code == 0) {
                     layer.msg(data.msg, { icon: 1, time: 500 });
+        renderTable();
                 } else {
                     layer.msg(data.msg, { icon: 2, time: 500 });
                     $(obj.elem).prop('checked', !obj.elem.checked);
@@ -96,7 +106,7 @@
         $('#product-btn-search').click(function () {
             var proName = $('#product-search-value').val();
             var hospitalName = $('#hospital-search-value').val();
-            table.reload('product-table', { where: { proName: proName,hospitalName: hospitalName } });
+            table.reload('product-table', { where: { proName: proName, hospitalName: hospitalName } });
         });
     });
 </script>
\ No newline at end of file

--
Gitblit v1.8.0