Merge branch '20210406-maqv2' into 20210412-youhua

linzhijie

2021-04-12 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd

 src/main/resources/templates/exam/userpaper/edit.html

@@ -26,11 +26,19 @@
        <div class="form-group">
            <label class="col-sm-3 control-label">[[#{jsp.exam.productReportTemplate}]]：</label>
            <div class="col-sm-8">
                <select id="reportTemplateId" name="reportTemplateId" class="form-control noselect2 selectpicker"
                        multiple>
                    <option th:each="dict : ${templateList}" th:text="${dict['reportType']}"
                            th:value="${dict['id']}"></option>
                </select>
<!--                <select id="reportTemplateId" name="reportTemplateId" class="form-control noselect2 selectpicker"-->
<!--                        multiple>-->
<!--                    <option th:each="dict : ${templateList}" th:text="${dict['reportType']}"-->
<!--                            th:value="${dict['id']}"></option>-->
<!--                </select>-->
                <ui id="tempB">
                    <li>
                        <span th:each="temp:${templateList}" style="margin-right:10px;">
                            <input type="checkbox" th:value="${temp.id}" name="templateN">
                            <span th:text="${temp.reportType}" name="unitspan"></span>
                        </span>
                    </li>
                </ui>
<!--                <select id="reportTemplateIdAll" name="reportTemplateIdAll" class="form-control noselect2 selectpicker"-->
<!--                        multiple>-->
<!--                    <option th:each="dict : ${templateList}" th:text="${dict['reportType']}"-->
@@ -59,6 +67,7 @@
<th:block th:include="include :: bootstrap-select-js"/>
<script type="text/javascript">
    var prefix = ctx + "exam/paper";

    $("#form-demographyParam-edit").validate({
        focusCleanup: true
    });
@@ -106,11 +115,27 @@
        $.table.init(options);
    });

    function testTypeChange() {
        var prodName = $("#prodId option:selected").text();
        if ("睿邻" == prodName) {
            prodName = "RuiLin";
        }
        $("#tempB").empty();
        $.post(prefix + "/filterTemplate/" + prodName, function (data) {
            for (var i = 0; i < data.length; i++) {
                $("#tempB").append('<li><span><input type="checkbox" name="templateN" value="'+data[i].id+'">' +data[i].reportType + '</span></span></li>');
            }
        });
    }

    /*[[#{basis.add}]]表格行 */
    function insertRow() {
        var prodId = $("#prodId").val();
        var prodName = $("#prodId option:selected").text();
        var arr = $("#reportTemplateId").val();//取值是一个数组

        var arr = [];
        $("input[name='templateN']:checked").each(function (index, item) {//
            arr.push($(this).val());
        });

        var reportTemplateId = "";
        for(var i = 0; i < arr.length; i++) {
            if (i==arr.length-1) {
@@ -120,8 +145,10 @@
            }
        }

        var reportTemplateText = $("#reportTemplateId option:selected").text();
        var prodId = $("#prodId").val();
        var prodName = $("#prodId option:selected").text();

        $.post(prefix + "/reportTemplateText/" + reportTemplateId, function (data) {
        if (checkDuplicate(prodId)) {
            $.modal.alertWarning('存在产品包权限，不允许重复添加！');
            return;
@@ -132,10 +159,12 @@
            row: {
                prodId: prodId,
                reportTemplateId: reportTemplateId,
                reportTemplateText: reportTemplateText,
                    reportTemplateText: data,
                prodName: prodName
            }
        })
        });

    }

    function checkDuplicate(prodId) {