From e04d3e0d0492a6df38ee90c7d05f19c15d525b0d Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Thu, 26 Nov 2020 10:53:30 +0800
Subject: [PATCH] 添加用户名的打印日志

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html |   53 +++++++++++++++++++++++++++++------------------------
 1 files changed, 29 insertions(+), 24 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 c9f06ef..1d69a23 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
@@ -70,38 +70,38 @@
             headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
             page: true,
             cols: [[
-                { field: 'diagnosticHospitalName', width: 300, title: '医院名称' },
-                { field: 'diagnosticDepartName', width: 100, title: '科室名称' },
-                { field: 'diagnosticDoctorName', width: 100, title: '医生姓名' },
-                { field: 'childName', width: 100, title: '患者姓名' },
-                { field: 'childSex', width: 80, title: '性别' },
-                { field: 'childBirthday', width: 120, title: '出生日期',templet:function(d){
+                { 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: 150, title: '联系电话' },
+                { field: 'childPhone', width: "10%", title: '联系电话' },
                 {
-                    field: 'isDelete', sort: true, align: 'center', width: 100, 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: 170, sort: true, title: '创建时间', templet: function (d) {
+                    field: 'createTime', width: "10%", sort: true, title: '创建时间', templet: function (d) {
                         return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
                     }
                 },{
-                    field: 'diagnosticDiagnoseTime', width: 120, sort: true, title: '诊断时间', templet: function (d) {
+                    field: 'diagnosticDiagnoseTime',width: "10%", sort: true, title: '诊断时间', templet: function (d) {
                         return new Date(d.diagnosticDiagnoseTime).dateFormat("yyyy-MM-dd");
                     }
                 },
                 {
-                    field: 'updateTime', width: 170, sort: true, title: '修改时间', templet: function (d) {
+                    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);
@@ -130,7 +130,10 @@
                     startTime: datebegin,
                     endTime: dateend
                 };
-                table.reload('diagnostic-table', { where: whereData });
+                table.reload('diagnostic-table', { where: whereData,page: {curr: 1  }});
+            }else{
+                layer.msg('请输入医院');
+                return false;
             }
         });
         // 工具条点击事件
@@ -139,16 +142,18 @@
             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.putTempData("t_diagnosis", data);
+                // admin.popupCenter({
+                //     title: '查看报告',
+                //     path: 'pages/opration/recordNote.html',
+                //     area: '1200px',
+                //     offset: '10px',
+                //     finish: function () {
+                //         admin.putTempData("t_diagnosis", "");
+                //     }
+                // });
+                // console.log("vvvvvvvvvvvvv")
+                window.open(config.base_server + "ReportRecord/operation/pdfname")
             }
         });
     });

--
Gitblit v1.8.0