From e98eeaaa5766511fdb8e6d5e412eb1c59d1f07ce Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 24 六月 2025 10:24:43 +0800
Subject: [PATCH] 隐患来源功能外加仓吉基础数据定时上报
---
src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html | 79 +++++++++++++++++++++++++++++++--------
1 files changed, 63 insertions(+), 16 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..5ee5df8 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html
@@ -97,7 +97,15 @@
</div>
</div>
</div>
-
+ <div class="form-group">
+ <label class="col-sm-3 control-label is-required">隐患来源：</label>
+ <div class="col-sm-8">
+ <select name="dangerSrc" class="form-control m-b" th:with="type=${@dict.getType('danger_source')}" required>
+ <option value="">--请选择隐患来源--</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+ </select>
+ </div>
+ </div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">隐患名称：</label>
@@ -163,10 +171,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>
@@ -304,15 +328,15 @@
</div>
</div>
- <div class="form-group showByDangerLevelChange">
- <label class="col-sm-3 control-label is-required">隐患来源：</label>
- <div class="col-sm-8">
- <select name="dangerSrc" class="form-control m-b" th:with="type=${@dict.getType('danger_source')}" required>
- <option value="">--请选择隐患来源--</option>
- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
- </select>
- </div>
- </div>
+<!-- <div class="form-group showByDangerLevelChange">-->
+<!-- <label class="col-sm-3 control-label is-required">隐患来源：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <select name="dangerSrc" class="form-control m-b" th:with="type=${@dict.getType('danger_source')}" required>-->
+<!-- <option value="">--请选择隐患来源--</option>-->
+<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="form-group showByDangerLevelChange">
<label class="col-sm-3 control-label is-required">隐患类型：</label>
@@ -485,7 +509,7 @@
/*登记人 选择 end*/
- /*判定人 选择 start*/
+ /*隐患责任人 选择 start*/
function selectJudgeUser() {
var url = ctx + "system/user/selectUserListByParentSonCompany";
var options = {
@@ -504,9 +528,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 +647,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 +706,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 +803,7 @@
// }
// });
// });
+
layui.use('upload', function() {
var $ = layui.jquery;
upload = layui.upload;
--
Gitblit v1.9.2