From 7be0d5b901b999d2347774df3cc1a64927838bb3 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 15 四月 2025 10:10:35 +0800
Subject: [PATCH] 优化每年专项数据获取
---
src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html | 51 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html
index 82b72c0..47522e9 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html
@@ -163,10 +163,26 @@
<div class="form-group">
- <label class="col-sm-3 control-label is-required">判定人：</label>
+ <label class="col-sm-3 control-label is-required">隐患责任人（判定人）：</label>
<div class="col-sm-8">
- <input id="judgeUserName" name="judgeUserName" placeholder="选择判定人" class="form-control" type="text" onclick="selectJudgeUser()" maxlength="30" readonly="true" required>
+ <input id="judgeUserName" name="judgeUserName" placeholder="选择隐患责任人（判定人）" class="form-control" type="text" onclick="selectJudgeUser()" maxlength="30" readonly="true" required>
<input id="judgeUserId" name="judgeUserId" type="hidden">
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label is-required">隐患发现时间：</label>
+ <div class="col-sm-8">
+ <input name="findTime" placeholder="请选择隐患发现时间" class="form-control" type="text"
+ readonly="readonly" required>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label is-required">检查人：</label>
+ <div class="col-sm-8">
+ <input id="checkPerson" name="checkPerson" placeholder="选择检查人" class="form-control" type="text" onclick="selectCheckPerson()" maxlength="30" readonly="true" required>
+ <!-- <input id="checkPersonId" name="checkPersonId" type="hidden">-->
</div>
</div>
@@ -485,7 +501,7 @@
/*登记人 选择 end*/
- /*判定人 选择 start*/
+ /*隐患责任人 选择 start*/
function selectJudgeUser() {
var url = ctx + "system/user/selectUserListByParentSonCompany";
var options = {
@@ -504,9 +520,26 @@
});
});
}
- /*判定人 选择 end*/
+ /*隐患责任人 选择 end*/
-
+ function selectCheckPerson() {
+ var url = ctx + "system/user/selectUserListByParentSonCompany";
+ var options = {
+ title: '用户选择',
+ width: "800",
+ url: url,
+ };
+ $.modal.openOptionsByCallback(options, function (layero, index) {
+ var body = layer.getChildFrame('body', index);
+ body.on("click", ".selectUser", function () {
+ var userId = $(this).data("userid");
+ var userName = $(this).data("username");
+ // $("#checkPersonId").val(userId);
+ $("#checkPerson").val(userName);
+ layer.close(index);
+ });
+ });
+ }
/*核查人 选择 start*/
function selectExamineUser() {
@@ -606,7 +639,7 @@
// form.submit();
var data = $('#form').serializeArray();
- // var judgeUserName = $("select[name='judgeUserId']").find("option:selected").text();//判定人名称
+ // var judgeUserName = $("select[name='judgeUserId']").find("option:selected").text();//隐患责任人名称
// data.push({"name": "judgeUserName", "value": judgeUserName});
//
// var examineUserName = $("select[name='examineUserId']").find("option:selected").text();//核查人名称
@@ -665,6 +698,11 @@
});
$("input[name='acceptCreateTime']").datetimepicker({
format: "yyyy-mm-dd hh:ii",
+ autoclose: true
+ });
+ $("input[name='findTime']").datetimepicker({
+ format: "yyyy-mm-dd",
+ minView: "month",
autoclose: true
});
});
@@ -757,6 +795,7 @@
// }
// });
// });
+
layui.use('upload', function() {
var $ = layui.jquery;
upload = layui.upload;
--
Gitblit v1.9.2