From 5bc66d568ea4b12d23dd181fd74a17e2845f3d7d Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期三, 17 七月 2024 16:43:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/templates/tr/TBSpecialCheckScoreAndDangerLog/edit.html | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/templates/tr/TBSpecialCheckScoreAndDangerLog/edit.html b/src/main/resources/templates/tr/TBSpecialCheckScoreAndDangerLog/edit.html
index 6fcf470..2aca93a 100644
--- a/src/main/resources/templates/tr/TBSpecialCheckScoreAndDangerLog/edit.html
+++ b/src/main/resources/templates/tr/TBSpecialCheckScoreAndDangerLog/edit.html
@@ -3,20 +3,23 @@
<head>
<th:block th:include="include :: header('检查项评分')"/>
<th:block th:include="include :: datetimepicker-css"/>
+ <th:block th:include="include :: select2-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
- <form class="form-horizontal m" id="form-job-edit" th:object="${specialCheckTaskLog}">
- <input id="id" name="id" type="hidden" th:field="*{id}"/>
-
+ <form class="form-horizontal m" id="form-job-edit" th:object="${specialCheckItem}">
+ <input id="indexId" name="indexId" type="hidden" th:field="*{indexId}"/>
+ <input class="form-control" th:field="*{checkItemId}" type="hidden" name="checkItemId" id="checkItemId" required>
+ <input class="form-control" th:field="*{checkScoreId}" type="hidden" name="checkScoreId" id="checkScoreId" required>
+ <input class="form-control" th:field="*{taskId}" type="hidden" name="taskId" id="taskId" required>
<!-- <input id="createUserId" name="createUserId" type="hidden" th:field="*{createUserId}"/>-->
<!-- <input id="createBy" name="createBy" type="hidden" th:field="*{createBy}"/>-->
<div class="form-group">
<label class="col-sm-3 control-label is-required">关联隐患：</label>
<div class="col-sm-8">
- <select id="hazardCode" name="hazardCode" th:field="*{hazardCode}" class="form-control" required>
- <option th:each="hazard : ${hazardList}" th:text="${hazard.riskListName}" th:value="${hazard.riskListNum}"></option>
+ <select id="dangerId" name="dangerId" th:field="*{dangerId}" class="form-control" required>
+ <option th:each="danger : ${dangerList}" th:text="${danger.dangerName}" th:value="${danger.id}"></option>
</select>
</div>
</div>
@@ -37,14 +40,14 @@
<div class="col-sm-8">
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
- <input name="checkDate" th:value="${#dates.format(specialCheckTaskLog.checkDate, 'yyyy-MM-dd')}" class="form-control" type="text" required>
+ <input name="checkDate" th:value="${#dates.format(specialCheckItem.checkDate, 'yyyy-MM-dd HH:mm:ss')}" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">危害类型：</label>
<div class="col-sm-8">
- <select name="checkType" th:field="*{checkType}" class="form-control m-b" required id="checkType">
+ <select name="harmType" th:field="*{harmType}" class="form-control m-b" required id="harmType">
<option value="">请选择</option>
<option value="1">事故隐患</option>
<option value="2">火灾隐患</option>
@@ -54,24 +57,28 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">罚款金额(元)：</label>
<div class="col-sm-8">
- <input class="form-control" th:field="*{jobName}" type="number" name="jobName" id="jobName" required>
+ <input class="form-control" th:field="*{checkPay}" type="number" name="checkPay" id="checkPay" required>
</div>
</div>
-<!-- <input id="jobGroup" name="jobGroup" type="hidden" value="specialCheckTaskLog"/>-->
+<!-- <input id="jobGroup" name="jobGroup" type="hidden" value="specialCheckItem"/>-->
</form>
</div>
<th:block th:include="include :: footer"/>
<th:block th:include="include :: datetimepicker-js"/>
+<th:block th:include="include :: select2-js" />
<script th:inline="javascript">
- var prefix = ctx + "tr/tbBaseCheckScore";
+ var prefix = ctx + "tr/TBSpecialCheckScoreAndDangerLog";
+ var now = new Date();
+ var hour = now.getHours(); //获取当前小时数(0-23)
+ var minute = now.getMinutes(); //获取当前分钟数(0-59)
+ var second = now.getSeconds(); //获取当前秒数(0-59)
$("input[name='checkDate']").datetimepicker({
- format: "yyyy-mm-dd",
+ format: "yyyy-mm-dd" + ' ' + '12:00:00',
minView: "month",
autoclose: true
});
-
$("#form-job-edit").validate({
onkeyup: false,
--
Gitblit v1.9.2