From 90f2acaa6c61d5a60822d4fee5a44ec3c5404f67 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Wed, 31 Mar 2021 18:52:02 +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/keaigao/screeningHospital.html |   31 +++++++++++++++++++++++++++----
 1 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/screeningHospital.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/screeningHospital.html
index 282f27f..e56bb05 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/screeningHospital.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/screeningHospital.html
@@ -43,6 +43,9 @@
     <button class="layui-btn layui-btn-xs" lay-event="downLoad">
         下载二维码
     </button>
+    <button class="layui-btn layui-btn-xs" lay-event="export">
+        导出
+    </button>
 </script>
 
 <script type="text/html" id="hospital-push-state">
@@ -91,19 +94,25 @@
                 page: true,
                 cols: [
                     [{
-                        field: 'hospitalId',
-                        width: "150",
-                        title: '医院ID',
+                        field: 'id',
+                        width: "200",
+                        title: '筛查医院ID',
                         fixed: 'left'
                     }, {
                         field: 'hospitalName',
                         width: "200",
                         title: '医院名称',
                         fixed: 'left'
+                    }, {
+                        field: 'departmentName',
+                        width: "120",
+                        title: '科室',
+                        align: 'center',
+                        fixed: 'left'
                     },
                         {
                             field: 'isScreeningPush',
-                            width: "120",
+                            width: "100",
                             title: '推送状态',
                             align: 'center',
                             fixed: 'left',
@@ -229,6 +238,8 @@
                     downLoad(data.hospitalQrImage);
                 } else if (layEvent === 'edit') {
                     showEditModel_add("编辑", data);
+                }else if(layEvent === 'export'){
+                    showEditModel_import("导出",data);
                 }
             });
 
@@ -236,5 +247,17 @@
                 window.open(url);
             }
 
+            var showEditModel_import = function (title, data) {
+                admin.putTempData('t_hospital', data);
+                admin.popupCenter({
+                    title: title,
+                    path: 'pages/keaigao/exportScreeningHospital.html',
+                    area: '500px',
+                    offset: '0px',
+                    finish: function () {
+                    }
+                });
+            };
+
         });
 </script>
\ No newline at end of file

--
Gitblit v1.8.0