From 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Mon, 01 Mar 2021 14:14:35 +0800
Subject: [PATCH] Merge branch 'dev1.1' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 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 dc6173c..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
@@ -131,24 +131,31 @@
endTime: dateend
};
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