From 9ab21680926a8e9938fe6195513bc166ad87044f Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Thu, 23 Apr 2020 15:48:53 +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, 14 insertions(+), 27 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 9840a14..809efd5 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
@@ -34,7 +34,7 @@
                 <option value="1">正式</option>
             </select>
             &emsp;
-            <input id="hospitalName" class="layui-input search-input" type="text" placeholder="按医院名" />&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>
@@ -48,8 +48,7 @@
 <!-- 表格操作列 -->
 <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-primary layui-btn-xs" lay-event="detail">查看详情</a>
-    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="addDepartment">添加科室</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>
 </script>
@@ -59,7 +58,7 @@
            {{d.enabled==true?'checked':''}}/>
 </script>
 <script>
-    layui.use(['form', 'table', 'laydate', 'util', 'config', 'admin', 'area'], function () {
+    layui.use(['form', 'table', 'laydate', 'util', 'config', 'admin', 'autocomplete', 'area'], function () {
         var form = layui.form;
         var table = layui.table;
         var config = layui.config;
@@ -67,7 +66,7 @@
         var util = layui.util;
         var admin = layui.admin;
         var area = layui.area;
-
+        
         // 渲染表格
         table.render({
             elem: '#hospital-table',
@@ -76,8 +75,8 @@
             headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
             page: true,
             cols: [[
-                { field: 'hospitalName', width: 250, title: '医院名称',fixed:'left'},
-                { field: 'departmentName', width: 100, title: '科室' ,fixed:'left'},
+                { field: 'hospitalName', width: 250, title: '医院名称', fixed: 'left' },
+                { field: 'departmentName', width: 100, title: '科室', fixed: 'left' },
                 {
                     field: 'hospitalArea', width: 250, title: '所在地区', templet: function (d) {
                         return ((d.hospitalProvince == null) ? "" : d.hospitalProvince) + " "
@@ -104,7 +103,7 @@
                 { 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: 'hospitalId', width: 300, align: 'center', toolbar: '#businessRecords-table-bar', title: '操作' ,fixed:'right'}
+                { field: 'hospitalId', width: 300, align: 'center', toolbar: '#businessRecords-table-bar', title: '操作', fixed: 'right' }
             ]]
         });
         //省份数据加载
@@ -129,23 +128,10 @@
                     }, 'GET');
                 });
             }
-            else if (layEvent === 'addDepartment') {
-                //添加科室
-                admin.putTempData("t_hospital", data);
-                admin.popupCenter({
-                    title: '添加科室',
-                    path: 'pages/opration/department_form.html',
-                    area: ['900px', '60%'],
-                    finish: function () {
-                        //清理缓存数据
-                        admin.putTempData("t_hospital", "");
-                    }
-                })
-            }
             else if (layEvent === "edit") {
                 //修改
                 admin.putTempData("t_hospital", data);
-                showEditModel();
+                showEditModel("edit");
             }
         });
         // 搜索按钮点击事件
@@ -153,7 +139,7 @@
             var isscreen = $('#isscreen').val();
             var isanswer = $('#isanswer').val();
             var hospitalstate = $('#hospitalstate').val();
-            var hospitalName = $('#hospitalName').val();
+            var hospitalName = $('#hosName').val();
 
             var hospitalProvince = ($("#province").val() != "") ? $('#province option:selected').text() : "";
             var hospitalCity = ($("#city").val() != "") ? $('#city option:selected').text() : "";
@@ -174,11 +160,11 @@
         // // 显示编辑弹窗
         var showEditModel = function (data) {
             admin.popupCenter({
-                title: '编辑医院/科室',
-                path: 'pages/opration/hospital_form_tab.html',
-                area: ['900px', '80%'],
+                title: (strUtil.isEmpty(data))?'添加医院':'编辑医院',
+                path: 'pages/opration/hospital_form_base.html',
+                area: '900px',
                 finish: function () {
-
+                    $('#hospita-btn-search').click();
                 }
             });
         };
@@ -213,6 +199,7 @@
         });
         // 添加按钮点击事件
         $('#hospital-btn-add').click(function () {
+            admin.putTempData("t_hospital","");
             showEditModel();
         });
     });

--
Gitblit v1.8.0