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 | 74 ++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 29 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 31c7e63..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
@@ -19,7 +19,7 @@
placeholder="按诊断医生名" /> 
<input id="hospitalName" class="layui-input search-input" type="text" placeholder="按医院名,必选条件！"
autocomplete="off" /></div> 
- <button id="diagnostic-btn-search" class="layui-btn icon-btn">
+ <button id="diagnostic-btn-search" class="layui-btn icon-btn permissions" permissions="diagnostic-get">
<i class="layui-icon"></i>搜索</button>
<table class="layui-table" id="diagnostic-table" lay-filter="diagnostic-table"></table>
@@ -30,7 +30,7 @@
<input id="hospitalId" type="hidden" />
<!-- 表格操作列 -->
<script type="text/html" id="diagnostic-table-bar">
- <a class="layui-btn layui-btn-xs" lay-event="select"">查看报告</a>
+ <a class="layui-btn layui-btn-xs permissions" permissions="diagnostic-get" lay-event="select">查看报告</a>
</script>
<script>
@@ -65,38 +65,47 @@
// 渲染表格
table.render({
elem: '#diagnostic-table',
- url: config.base_server + 'api-opration/productorderdetail/alldata',
+ url: config.base_server + 'api-opration/productorderrecord/alldata',
method: 'POST',
headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
page: true,
cols: [[
- { field: 'hospitalName', width: 300, title: '医院名称' },
- { field: 'departmentName', width: 100, title: '科室名称' },
- { field: 'diagnosticDoctorName', width: 100, title: '医生姓名' },
- { field: 'childName', width: 100, title: '患者姓名' },
- { field: 'childSex', width: 80, title: '性别' },
- { field: 'childBirthday', width: 100, title: '出生日期' },
- { field: 'childPhone', width: 150, title: '联系电话' },
+ { field: 'diagnosticHospitalName',width: "10%", title: '医院名称' },
+ { field: 'diagnosticDepartName', width: "10%", title: '科室名称' },
+ { field: 'diagnosticDoctorName', width: "10%", title: '医生姓名' },
+ { field: 'childName', width: "10%", title: '患者姓名' },
+ { field: 'childSex', width: "10%", title: '性别' },
+ { field: 'childBirthday', width: "10%", title: '出生日期',templet:function(d){
+ return new Date(d.createTime).dateFormat("yyyy-MM-dd");
+ }},
+ { field: 'childPhone', width: "10%", title: '联系电话' },
{
- field: 'isDelete', sort: true, align: 'center', width: 80, templet: function (d) {
- if (d.proType === 0)
+ field: 'isDeleted', sort: true, align: 'center', width: 100, templet: function (d) {
+ if (!d.isDeleted)
return "正常"
else
return "已删除"
}, title: '状态'
},
{
- field: 'createTime', width: 160, sort: true, title: '创建时间', templet: function (d) {
- return new Date(d.createTime).dateFormat("yyyy/MM/dd hh:mm:ss");
+ field: 'createTime', width: "10%", sort: true, title: '创建时间', templet: function (d) {
+ return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
+ }
+ },{
+ field: 'diagnosticDiagnoseTime',width: "10%", sort: true, title: '诊断时间', templet: function (d) {
+ return new Date(d.diagnosticDiagnoseTime).dateFormat("yyyy-MM-dd");
}
},
{
- field: 'updateTime', width: 160, sort: true, title: '修改时间', templet: function (d) {
- return new Date(d.createTime).dateFormat("yyyy/MM/dd hh:mm:ss");
+ field: 'updateTime', width: "10%", sort: true, title: '修改时间', templet: function (d) {
+ return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
}
},
- { field: 'enabled', width: 100, templet: '#diagnostic-table-bar', title: '查看' }
- ]]
+ { field: 'enabled', width: "10%", templet: '#diagnostic-table-bar', title: '查看' }
+ ]],
+ done:function(res){
+ permissionsInput(res,config);
+ }
});
// 搜索按钮点击事件
$('#diagnostic-btn-search').click(function () {
@@ -121,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