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/hospital.html |   41 ++++++++++++++++++++++++++++++-----------
 1 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
index 809efd5..48cfcc4 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
@@ -36,8 +36,8 @@
             &emsp;
             <input id="hosName" class="layui-input search-input" type="text" placeholder="按医院名" />&emsp;
             <button id="hospita-btn-search" class="layui-btn icon-btn"><i
-                    class="layui-icon">&#xe615;</i>搜索</button>&emsp;
-            <button id="hospital-btn-add" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>添加医院</button>
+                    class="layui-icon permissions" permissions="hospital-get">&#xe615;</i>搜索</button>&emsp;
+            <button id="hospital-btn-add" class="layui-btn icon-btn"><i class="layui-icon permissions" permissions="hospital-save">&#xe654;</i>添加医院</button>
         </div>
 
         <!-- 数据表格 -->
@@ -47,10 +47,10 @@
 
 <!-- 表格操作列 -->
 <script type="text/html" id="businessRecords-table-bar">
-    <a class="layui-btn layui-btn-xs" lay-event="pay">充值</a>
+    <a class="layui-btn layui-btn-xs permissions" permissions="product-rechage" lay-event="pay">充值</a>
     <!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看详情</a> -->
-    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
-    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+    <a class="layui-btn layui-btn-primary layui-btn-xs permissions" permissions="hospital-save" lay-event="edit">修改</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs permissions" permissions="hospital-del" lay-event="del">删除</a>
 </script>
 <!-- 表格状态列 -->
 <script type="text/html" id="hospital-tpl-state">
@@ -87,24 +87,29 @@
                 { field: 'hospitalLink', width: 100, title: '联系人' },
                 { field: 'hospitalTel', width: 100, title: '联系方式' },
                 {
-                    field: 'enabled', width: 80, sort: true, title: '状态', templet: function (d) {
+                    field: 'enabled', width: 80,  title: '状态', templet: function (d) {
                         return d.hospitalState == 0 ? "试用" : "正式"
                     }
                 },
                 {
-                    field: 'isScreen', width: 80, sort: true, title: '筛查', templet: function (d) {
+                    field: 'isScreen', width: 80,  title: '筛查', templet: function (d) {
                         return d.isScreen ? "是" : "否"
                     }
                 },
-                // { field: 'isAnswer', width: 80, sort: true, title: '医答',templet:function (d) {
+                // { field: 'isAnswer', width: 80,  title: '医答',templet:function (d) {
                 //     return d.isScreen?"是":"否"
                 // } },
 
                 { field: 'serverUserName', width: 100, title: '服务人员' },
-                { field: 'createTime', width: 120, sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd')}}</div>" },
-                { field: 'enabled', width: 100, templet: '#hospital-tpl-state', sort: true, title: '状态' },
+                { field: 'createTime', width: 120,  title: '创建时间', templet:function (d) {
+                        return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
+                    } },
+                { field: 'enabled', width: 100, templet: '#hospital-tpl-state',  title: '状态' },
                 { field: 'hospitalId', width: 300, align: 'center', toolbar: '#businessRecords-table-bar', title: '操作', fixed: 'right' }
-            ]]
+            ]],
+            done:function(res){
+                permissionsInput(res,config);
+            }
         });
         //省份数据加载
         area.areaData("#province", 1, "", "");
@@ -133,6 +138,20 @@
                 admin.putTempData("t_hospital", data);
                 showEditModel("edit");
             }
+            else if(layEvent==="pay")
+            {
+                //充值
+                admin.putTempData("t_hospital", data);
+                admin.popupCenter({
+                title: '医院充值',
+                path: 'pages/opration/recharge.html',
+                area: '1200px',
+                offset:'10px',
+                finish: function () {
+                    $('#hospita-btn-search').click();
+                }
+            });
+            }
         });
         // 搜索按钮点击事件
         $('#hospita-btn-search').click(function () {

--
Gitblit v1.8.0