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/opration/diagnosisRecord.html |   40 +++++++++++++++++++++++-----------------
 1 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html
index e8ec4f1..7a02a41 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html
@@ -10,14 +10,14 @@
         <div class="layui-form toolbar">
             <div class="layui-form-item">
                 <div class="layui-inline">
-                    <input type="text" name="date" id="datebegin" lay-verify="date" autocomplete="off"
+                    <input type="text" name="date" id="datebegin" lay-verify="date"
                         class="layui-input search-input" />&emsp;至&emsp;
-                    <input type="text" name="date" id="dateend" lay-verify="date" autocomplete="off"
+                    <input type="text" name="date" id="dateend" lay-verify="date"
                         class="layui-input search-input" />&emsp;
-                    <input id="childName" class="layui-input search-input" type="text" placeholder="按患者名" />&emsp;
-                    <input id="diagnosticDoctorName" class="layui-input search-input" type="text"
+                    <input id="childName" class="layui-input search-input"  type="text" placeholder="按患者名" />&emsp;
+                    <input id="diagnosticDoctorName" class="layui-input search-input" autocomplete="off"  type="text"
                         placeholder="按诊断医生名" />&emsp;
-                    <input id="hospitalName" class="layui-input  search-input" type="text" placeholder="按医院名,必选条件！"
+                    <input id="hospitalName" class="layui-input  search-input"   type="text" placeholder="按医院名,必选条件！"
                         autocomplete="off" /></div>&emsp;
                 <button id="diagnostic-btn-search" class="layui-btn icon-btn permissions"  permissions="diagnostic-get">
                     <i class="layui-icon">&#xe615;</i>搜索</button>
@@ -109,7 +109,6 @@
         });
         // 搜索按钮点击事件
         $('#diagnostic-btn-search').click(function () {
-            debugger
             var diagnosticHospitalId = $('#hospitalId').val();
             if (!strUtil.isEmpty(diagnosticHospitalId)) {
                 var childName = $('#childName').val();
@@ -131,25 +130,32 @@
                     startTime: datebegin,
                     endTime: dateend
                 };
-                table.reload('diagnostic-table', { where: whereData });
+                table.reload('diagnostic-table', { where: whereData,page: {curr: 1  }});
+            }else{
+                layer.msg('请输入医院');
+                return false;
             }
         });
+        //获取软件的服务周期
+        var getCycleTime = function (departmentId) {
+            
+        }
         // 工具条点击事件
         table.on('tool(diagnostic-table)', function (obj) {
             var data = obj.data;
             var layEvent = obj.event;
             if (layEvent === "select") {
-                //查看报告  报告列数据缓存起来
-                admin.putTempData("t_diagnosis", data);
-                admin.popupCenter({
-                    title: '查看报告',
-                    path: 'pages/opration/recordNote.html',
-                    area: '1200px',
-                    offset: '10px',
-                    finish: function () {
-                        admin.putTempData("t_diagnosis", "");
+                admin.req('api-opration/productorderrecord/pdfname/'+data.diagnosticId+"/0/"+data.diagnosticHospitalId+"/"+data.diagnosticDepartId, {},
+                function (data) {
+                    if (data.code == 0) {
+                        //打开新的窗口
+                       window.open(data.data)
+                    }else{
+                        layer.msg("查询报告失败")
                     }
-                });
+
+                }, "post")
+                admin.re
             }
         });
     });

--
Gitblit v1.8.0