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 |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html
index 02224a2..7e11c4d 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html
@@ -240,9 +240,9 @@
 <!--                </div>-->
 <!--            </div>-->
             <div class="form-group showByDangerLevelChange">
-                <label class="col-sm-3 control-label is-required">风险单元:</label>
+                <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" required>
+                    <input id="checkPointName"  placeholder="选择风险单元" class="form-control" type="text"  onclick="selectRiskPoint()" maxlength="30" readonly="true">
                     <input id="checkPointNum" name="hazardCode" type="hidden">
                 </div>
             </div>
@@ -312,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">

--
Gitblit v1.9.2