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/recharge.html | 4 +-
kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/controller/OAuth2Controller.java | 3 +
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html | 25 +++++++-----
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html | 60 ++++++++++++++----------------
4 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/controller/OAuth2Controller.java b/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/controller/OAuth2Controller.java
index fe1f754..9f796c2 100644
--- a/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/controller/OAuth2Controller.java
+++ b/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/controller/OAuth2Controller.java
@@ -67,7 +67,8 @@
//先解密
String decryptName = AesUtils.desEncrypt(username).trim();
String decryptPwd = AesUtils.desEncrypt(password).trim();
-
+ log.error("user+++++++++"+decryptName+"+++++++++++");
+ log.error("password+++++++++"+decryptPwd+"+++++++++++");
UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(decryptName, decryptPwd);
writerToken(request, response, token, "用户名或密码错误");
}
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..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
@@ -131,6 +131,9 @@
endTime: dateend
};
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")
}
});
});
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
index bad1015..27257d1 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
@@ -173,7 +173,7 @@
</div>
<div class="layui-col-sm6">
<div class="layui-input-inline">
- <input type="radio" id="custom_isShare" name="gongxiang" value="1" title="是否共享" />
+ <input type="checkbox" id="custom_isShare" name="gongxiang" value="1" lay-skin="primary" title="是否共享" />
</div>
</div>
</div>
@@ -182,7 +182,7 @@
<div class="layui-row">
<div class="layui-col-sm12">
<div class="layui-input-inline" style="width: 160px;text-align: right;">
- <input type="radio" id="termType" name="termType" value="true" checked
+ <input type="checkbox" id="termType" lay-skin="primary" name="termType" value="true" checked
title="期限限制" />
</div>
<div class="layui-col-sm4" style="margin-right: 30px;">
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html
index 457e557..cc711aa 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html
@@ -167,7 +167,7 @@
</div>
<div class="layui-col-sm6">
<div class="layui-input-inline">
- <input type="radio" id="custom_isShare" name="gongxiang" value="1" title="是否共享" />
+ <input type="checkbox" lay-skin="primary" id="custom_isShare" name="gongxiang" value="1" title="是否共享" />
</div>
</div>
</div>
@@ -176,7 +176,7 @@
<div class="layui-row">
<div class="layui-col-sm12">
<div class="layui-input-inline" style="width: 120px;text-align: right;">
- <input type="radio" id="termType" name="termType" value="true" checked title="期限限制" />
+ <input type="checkbox" lay-skin="primary" id="termType" name="termType" value="true" checked title="期限限制" />
</div>
<div class="layui-col-sm4" style="margin-right: 30px;">
<input autocomplete="off" id="custom_beginTime" type="text" placeholder="请输开始时间"
@@ -554,33 +554,33 @@
},"get")
}
//获取软件的服务周期
- var getCycleTime=function(departmentId){
- admin.req('api-opration/productorderdetail/getContractBeginEndTimeAndNum' , {departmentId: departmentId},
- function (data) {
- if(data.code==0){
- $("#contractBeginTime").val(layui.util.toDateString(data.data.beginTime,"yyyy-MM-dd"));
- $("#contractEndTime").val( layui.util.toDateString(data.data.endTime,"yyyy-MM-dd"));
- $("#contractNum").val(data.data.count);
- contractBeginTime.config.max = {
- year: layui.util.toDateString(data.data.beginTime, "yyyy"),
- month: layui.util.toDateString(data.data.beginTime, "MM") - 1,//关键
- date: layui.util.toDateString(data.data.beginTime, "dd"),
- hours: layui.util.toDateString(data.data.beginTime, "HH"),
- minutes: layui.util.toDateString(data.data.beginTime, "mm"),
- seconds: layui.util.toDateString(data.data.beginTime, "ss")
- }
- contractEndTime.config.min = {
- year: layui.util.toDateString(data.data.endTime, "yyyy"),
- month: layui.util.toDateString(data.data.endTime, "MM") - 1,//关键
- date: layui.util.toDateString(data.data.endTime, "dd"),
- hours: layui.util.toDateString(data.data.endTime, "HH"),
- minutes: layui.util.toDateString(data.data.endTime, "mm"),
- seconds: layui.util.toDateString(data.data.endTime, "ss")
- }
- }
+ // var getCycleTime=function(departmentId){
+ // admin.req('api-opration/productorderdetail/getContractBeginEndTimeAndNum' , {departmentId: departmentId},
+ // function (data) {
+ // if(data.code==0){
+ // $("#contractBeginTime").val(layui.util.toDateString(data.data.beginTime,"yyyy-MM-dd"));
+ // $("#contractEndTime").val( layui.util.toDateString(data.data.endTime,"yyyy-MM-dd"));
+ // $("#contractNum").val(data.data.count);
+ // contractBeginTime.config.max = {
+ // year: layui.util.toDateString(data.data.beginTime, "yyyy"),
+ // month: layui.util.toDateString(data.data.beginTime, "MM") - 1,//关键
+ // date: layui.util.toDateString(data.data.beginTime, "dd"),
+ // hours: layui.util.toDateString(data.data.beginTime, "HH"),
+ // minutes: layui.util.toDateString(data.data.beginTime, "mm"),
+ // seconds: layui.util.toDateString(data.data.beginTime, "ss")
+ // }
+ // contractEndTime.config.min = {
+ // year: layui.util.toDateString(data.data.endTime, "yyyy"),
+ // month: layui.util.toDateString(data.data.endTime, "MM") - 1,//关键
+ // date: layui.util.toDateString(data.data.endTime, "dd"),
+ // hours: layui.util.toDateString(data.data.endTime, "HH"),
+ // minutes: layui.util.toDateString(data.data.endTime, "mm"),
+ // seconds: layui.util.toDateString(data.data.endTime, "ss")
+ // }
+ // }
- },"get")
- }
+ // },"get")
+ // }
//回显医院基本数据
@@ -602,9 +602,6 @@
} else {
hospitalData.contractBeginTime = layui.util.toDateString(hospitalData.contractBeginTime, 'yyyy-MM-dd')
hospitalData.contractEndTime = layui.util.toDateString(hospitalData.contractEndTime, 'yyyy-MM-dd')
- delete hospitalData.contractBeginTime
- delete hospitalData.contractEndTime
- delete hospitalData.contractNum
form.val('recharge-form', hospitalData);
getHospitalAddress(hospitalData.hospitalId);
//装载产品数据
@@ -793,7 +790,6 @@
$("#submit").click(function () {
submit();
})
- getCycleTime(hospitalData.departmentId);
}
//已充值列表 功能操作
table.on('tool(product-table-now)', function (obj) {
--
Gitblit v1.8.0