From c0d6e7b5da697bb7dff873839fd28f14a490d247 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 21 八月 2023 15:38:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html | 61 +++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html
index 7d8b47f..7e11c4d 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html
@@ -233,6 +233,56 @@
</div>
</div>
</div>
+<!-- <div class="form-group showByDangerLevelChange">-->
+<!-- <label class="col-sm-3 control-label is-required">风险对象分析编码：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <textarea name="hazardCode" maxlength="500" class="form-control" rows="3" required></textarea>-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="form-group showByDangerLevelChange">
+ <label class="col-sm-3 control-label">风险单元：</label>
+ <div class="col-sm-8">
+ <input id="checkPointName" placeholder="选择风险单元" class="form-control" type="text" onclick="selectRiskPoint()" maxlength="30" readonly="true">
+ <input id="checkPointNum" name="hazardCode" type="hidden">
+ </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="hazardDangerType" class="form-control m-b" th:with="type=${@dict.getType('danger_type')}" 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="dangerResult" class="form-control m-b" th:with="type=${@dict.getType('danger_result')}" 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">
+ <textarea name="dangerReason" maxlength="500" class="form-control" rows="3" required></textarea>
+ </div>
+ </div>
+
</fieldset>
<h1>隐患整改</h1>
@@ -262,8 +312,9 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">隐患整改资金：</label>
- <div class="col-sm-8">
- <input name="rectifyFund" class="form-control" type="text" required>
+ <div class="col-sm-8" style="display: flex;align-items: center">
+ <input name="rectifyFund" class="form-control" type="number" placeholder="请输入数字（单位：万）" required>
+ <span style="width: 50px;background: #ccc;height:34px;text-align: center;line-height: 34px">万</span>
</div>
</div>
<div class="form-group">
@@ -418,7 +469,11 @@
}
/*核查人 选择 end*/
-
+ // 选择风险单元
+ function selectRiskPoint() {
+ var url = "/tr/riskList/selectRiskList/1"
+ $.modal.openNoConfirm("风险单元", url, '700', '500');
+ }
/*整改人 选择 start*/
function selectRectifyUser() {
--
Gitblit v1.9.2