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/addDangerReport.html |   74 ++++++++++++++++++++++++++++++++++---
 1 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReport.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReport.html
index c08536d..61264a2 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReport.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReport.html
@@ -45,14 +45,35 @@
                 <input name="dangerName" class="form-control" type="text" required>
             </div>
         </div>
-
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">排查方法:</label>
+            <div class="col-sm-8">
+                <select name="remark" class="form-control m-b" required>
+                    <option style="display: none"></option>
+                    <option value="查现场">查现场</option>
+                    <option value="查行为">查行为</option>
+                    <option value="查事故">查事故</option>
+                    <option value="查图纸">查图纸</option>
+                    <option value="查制度">查制度</option>
+                    <option value="查标准">查标准</option>
+                </select>
+            </div>
+        </div>
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">隐患描述:</label>
             <div class="col-sm-8">
                 <textarea name="dangerDescription" maxlength="500" class="form-control" rows="3" required></textarea>
             </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>
@@ -106,10 +127,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>
     </form>
@@ -190,7 +227,7 @@
     }
 
 
-    /*判定人  选择 start*/
+    /*隐患责任人  选择 start*/
     function selectJudgeUser() {
         var url = ctx + "system/user/selectUserListByParentSonCompany";
         var options = {
@@ -209,7 +246,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);
+            });
+        });
+    }
 
 
     var prefix = ctx + "tr/hiddenDangerCheck/dangerReport";
@@ -259,6 +315,12 @@
     //     });
     // });
 
+    $("input[name='findTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
     layui.use('upload', function() {
         var $ = layui.jquery;
         upload = layui.upload;

--
Gitblit v1.9.2