From 5a4040ba6977febaff8d73e4ed27fefaceb24167 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 29 Sep 2020 11:19:23 +0800
Subject: [PATCH] Merge branch 'pay_master' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into pay_master
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 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 ed14279..e8ec4f1 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,45 +70,46 @@
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(){
- permissionsInput();
+ done:function(res){
+ permissionsInput(res,config);
}
});
// 搜索按钮点击事件
$('#diagnostic-btn-search').click(function () {
+ debugger
var diagnosticHospitalId = $('#hospitalId').val();
if (!strUtil.isEmpty(diagnosticHospitalId)) {
var childName = $('#childName').val();
--
Gitblit v1.8.0