添加字段

马宇豪

2023-11-28 33f993317a85c9f2f51edb312dd2481427ad1228

添加字段

 src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReport.html

@@ -119,10 +119,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>
@@ -203,7 +219,7 @@
    }


    /*判定人  选择 start*/
    /*隐患责任人  选择 start*/
    function selectJudgeUser() {
        var url = ctx + "system/user/selectUserListByParentSonCompany";
        var options = {
@@ -222,7 +238,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";
@@ -272,6 +307,12 @@
    //     });
    // });

    $("input[name='findTime']").datetimepicker({
        format: "yyyy-mm-dd",
        minView: "month",
        autoclose: true
    });

    layui.use('upload', function() {
        var $ = layui.jquery;
        upload = layui.upload;

 src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html

@@ -163,10 +163,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>

@@ -485,7 +501,7 @@
    /*登记人  选择 end*/


    /*判定人  选择 start*/
    /*隐患责任人  选择 start*/
    function selectJudgeUser() {
        var url = ctx + "system/user/selectUserListByParentSonCompany";
        var options = {
@@ -504,9 +520,32 @@
            });
        });
    }
    /*判定人  选择 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);
            });
        });
    }

    $("input[name='findTime']").datetimepicker({
        format: "yyyy-mm-dd",
        minView: "month",
        autoclose: true
    });

    /*核查人  选择 start*/
    function selectExamineUser() {
@@ -606,7 +645,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();//核查人名称

 src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotDanger.html

@@ -125,7 +125,7 @@
            </div>
            <div class="col-sm-6">
                <div class="form-group">
                    <label class="col-sm-4 control-label  ">判定人：</label>
                    <label class="col-sm-4 control-label  ">隐患责任人（判定人）：</label>
                    <div class="col-sm-8">
                        <input th:value="*{judgeUserName}" class="form-control" type="text" readonly="readonly">
                    </div>
@@ -133,6 +133,24 @@
            </div>
        </div>

        <div class="row">
            <div class="col-sm-6">
                <div class="form-group">
                    <label class="col-sm-4 control-label  ">隐患发现时间：</label>
                    <div class="col-sm-8">
                        <input th:value="*{findTime}" class="form-control" type="text" readonly="readonly">
                    </div>
                </div>
            </div>
            <div class="col-sm-6">
                <div class="form-group">
                    <label class="col-sm-4 control-label  ">检查人：</label>
                    <div class="col-sm-8">
                        <input th:value="*{checkPerson}" class="form-control" type="text" readonly="readonly">
                    </div>
                </div>
            </div>
        </div>

        <div class="row">
            <div class="col-sm-6">

 src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailNotJudge.html

@@ -124,7 +124,7 @@
            </div>
            <div class="col-sm-6">
                <div class="form-group">
                    <label class="col-sm-4 control-label  ">判定人：</label>
                    <label class="col-sm-4 control-label  ">隐患责任人（判定人）：</label>
                    <div class="col-sm-8">
                        <input th:value="*{judgeUserName}" class="form-control" type="text" readonly="readonly">
                    </div>
@@ -132,6 +132,24 @@
            </div>
        </div>

        <div class="row">
            <div class="col-sm-6">
                <div class="form-group">
                    <label class="col-sm-4 control-label  ">隐患发现时间：</label>
                    <div class="col-sm-8">
                        <input th:value="*{findTime}" class="form-control" type="text" readonly="readonly">
                    </div>
                </div>
            </div>
            <div class="col-sm-6">
                <div class="form-group">
                    <label class="col-sm-4 control-label  ">检查人：</label>
                    <div class="col-sm-8">
                        <input th:value="*{checkPerson}" class="form-control" type="text" readonly="readonly">
                    </div>
                </div>
            </div>
        </div>

        <div class="row">
            <div class="col-sm-6">

 src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/detailYesDanger.html

@@ -178,14 +178,31 @@
            </div>
            <div class="col-sm-6">
                <div class="form-group">
                    <label class="col-sm-4 control-label  ">判定人：</label>
                    <label class="col-sm-4 control-label  ">隐患责任人（判定人）：</label>
                    <div class="col-sm-8">
                        <input th:value="*{judgeUserName}" class="form-control" type="text" readonly="readonly">
                    </div>
                </div>
            </div>
        </div>

        <div class="row">
            <div class="col-sm-6">
                <div class="form-group">
                    <label class="col-sm-4 control-label  ">隐患发现时间：</label>
                    <div class="col-sm-8">
                        <input th:value="*{findTime}" class="form-control" type="text" readonly="readonly">
                    </div>
                </div>
            </div>
            <div class="col-sm-6">
                <div class="form-group">
                    <label class="col-sm-4 control-label  ">检查人：</label>
                    <div class="col-sm-8">
                        <input th:value="*{checkPerson}" class="form-control" type="text" readonly="readonly">
                    </div>
                </div>
            </div>
        </div>

        <div class="row">
            <div class="col-sm-6">

 src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/editDangerReport.html

@@ -100,10 +100,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"  th:field="*{judgeUserName}" placeholder="选择判定人" class="form-control" type="text"  onclick="selectJudgeUser()" maxlength="30" readonly="true" required>
                <input id="judgeUserName"  name="judgeUserName"  th:field="*{judgeUserName}" placeholder="选择隐患责任人（判定人）" class="form-control" type="text"  onclick="selectJudgeUser()" maxlength="30" readonly="true" required>
                <input id="judgeUserId" name="judgeUserId"  th:field="*{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>

@@ -229,7 +245,7 @@



    /*判定人  选择 start*/
    /*隐患责任人  选择 start*/
    function selectJudgeUser() {
        var url = ctx + "system/user/selectUserListByParentSonCompany";
        var options = {
@@ -248,8 +264,32 @@
            });
        });
    }
    /*判定人  选择 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);
            });
        });
    }

    $("input[name='findTime']").datetimepicker({
        format: "yyyy-mm-dd",
        minView: "month",
        autoclose: true
    });

    var prefix = ctx + "tr/hiddenDangerCheck/dangerReport";
    $("#form-hiddenDangerCheck-edit").validate({

 src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/editJudgeDangerReport.html

@@ -98,12 +98,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 th:value="*{judgeUserName}" class="form-control" type="text" readonly="readonly">
            </div>
        </div>

        <div class="form-group">
            <label class="col-sm-3 control-label  is-required">隐患发现时间：</label>
            <div class="col-sm-8">
                <input th:value="*{findTime}" class="form-control" type="text" readonly="readonly">
            </div>
        </div>

        <div class="form-group">
            <label class="col-sm-3 control-label is-required">检查人：</label>
            <div class="col-sm-8">
                <input th:value="*{checkPerson}" class="form-control" type="text" readonly="readonly">
            </div>
        </div>

        <h4 class="form-header h4">隐患判定结果</h4>

        <div class="form-group">