From e7c3314727fc06444689c0e6ecab5fea337afeb0 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 26 Feb 2021 15:24:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 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..789a050 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
@@ -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