From 0a8b731d9cf46c78c0c4c66fa9954eeb262e4017 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Mon, 10 Aug 2020 09:20:50 +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 |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 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 48cfcc4..d69a32d 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
@@ -27,17 +27,17 @@
                 <option value="1">-是-</option>
                 <option value="0">-否-</option>
             </select>
-             &emsp; -->
+             &emsp;
             <select id="hospitalstate" placeholder="选择医院状态" lay-filter="hospitalstate">
                 <option value="">-医院状态-</option>
                 <option value="0">试用</option>
                 <option value="1">正式</option>
-            </select>
+            </select> -->
             &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 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>
+            <button id="hospital-btn-add" class="layui-btn icon-btn"><i class="layui-icon permissions" permissions="hospital-save">&#xe654;</i>添加医院/科室</button>
         </div>
 
         <!-- 数据表格 -->
@@ -76,21 +76,21 @@
             page: true,
             cols: [[
                 { field: 'hospitalName', width: 250, title: '医院名称', fixed: 'left' },
-                { field: 'departmentName', width: 100, title: '科室', fixed: 'left' },
+                { field: 'departmentName', width: 100, title: '科室/部门', fixed: 'left' },
                 {
-                    field: 'hospitalArea', width: 250, title: '所在地区', templet: function (d) {
+                    field: 'hospitalArea', width: 360, title: '所在地区', templet: function (d) {
                         return ((d.hospitalProvince == null) ? "" : d.hospitalProvince) + " "
                             + ((d.hospitalCity == null) ? "" : d.hospitalCity) + " " +
                             ((d.hospitalArea == null) ? "" : d.hospitalArea)
                     }
                 },
                 { field: 'hospitalLink', width: 100, title: '联系人' },
-                { field: 'hospitalTel', width: 100, title: '联系方式' },
-                {
-                    field: 'enabled', width: 80,  title: '状态', templet: function (d) {
-                        return d.hospitalState == 0 ? "试用" : "正式"
-                    }
-                },
+                { field: 'hospitalTel', width: 150, title: '联系方式' },
+                // {
+                //     field: 'enabled', width: 80,  title: '状态', templet: function (d) {
+                //         return d.hospitalState == 0 ? "试用" : "正式"
+                //     }
+                // },
                 {
                     field: 'isScreen', width: 80,  title: '筛查', templet: function (d) {
                         return d.isScreen ? "是" : "否"
@@ -101,11 +101,11 @@
                 // } },
 
                 { field: 'serverUserName', width: 100, title: '服务人员' },
-                { field: 'createTime', width: 120,  title: '创建时间', templet:function (d) {
+                { field: 'createTime', width: 150,  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' }
+                { field: 'hospitalId', width: 200, align: 'center', toolbar: '#businessRecords-table-bar', title: '操作', fixed: 'right' }
             ]],
             done:function(res){
                 permissionsInput(res,config);
@@ -126,7 +126,7 @@
                     };
                     admin.req('api-user/syshospital/delete', whereModel, function (data) {
                         layer.closeAll('loading');
-                        layer.msg(data.msg, { icon: 1, time: 500 }, function () {
+                        layer.msg(data.msg, { icon: 1, time: 2000 }, function () {
                             $('#hospita-btn-search').click();
                         });
                         obj.del();
@@ -208,9 +208,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');
                 }

--
Gitblit v1.8.0