Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yusijie

2024-09-10 4836d8e0c4fa15e7092c894857b3ffb569e06508

 WebTM/views/»ù´¡×ÊÁÏ/Òþ²ØÁÐÉèÖÃ/Gy_GridView_Hide_New.html

@@ -121,6 +121,12 @@
        <input type="checkbox" name="IsHide" lay-filter="IsHide" id="IsHide{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
    </div>
</script>
<!--复选框 æ˜¯å¦ç»Ÿè®¡è¡Œ-->
<script type="text/html" id="IsTotalRow">
    <div class="layui-input-block" style="margin-left: 20px;">
        <input type="checkbox" name="IsTotalRow" lay-filter="IsTotalRow" id="IsTotalRow{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
    </div>
</script>
<script>
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
@@ -176,7 +182,17 @@
                }
            });
        });

        //是否统计
        form.on('checkbox(IsTotalRow)', function (data) {
            //获取下拉框选中的值
            var elem = data.othis.parents('tr');
            var dataindex = elem.attr("data-index");
            $.each(option.data, function (index, value) {
                if (value.LAY_TABLE_INDEX == dataindex) {
                    value.IsTotalRow = data.elem.checked;//把选中下拉框id值赋值给表格缓存
                }
            });
        });
        //保存提交
        form.on('submit(btnSave)', function (data) {//提交
            set_AddNew(data);
@@ -223,6 +239,9 @@
                            if (option.data[j - 1].IsHide == true) {
                                $("#IsHide" + j).attr("checked", true);
                            }
                            if (option.data[j - 1].IsTotalRow == true) {
                                $("#IsTotalRow" + j).attr("checked", true);
                            }
                            $('#Alignment' + j).find("option[value='" + option.data[j - 1].Alignment + "']").attr("selected", true);
                        }
                        form.render('select');
@@ -254,6 +273,9 @@
                        for (var j = 1; j <= option.data.length; j++) {
                            if (option.data[j - 1].IsHide == true) {
                                $("#IsHide" + j).attr("checked", true);
                            }
                            if (option.data[j - 1].IsTotalRow == true) {
                                $("#IsTotalRow" + j).attr("checked", true);
                            }
                            $('#Alignment' + j).find("option[value='" + option.data[j - 1].Alignment + "']").attr("selected", true);
                        }
@@ -296,7 +318,7 @@
                    var colNames = [];//相对单据传过来的列名
                    var cols = [];//要传进表格的数据
                    var dataCol = [];//表格数据
                

                    if (data1.data.length != 0) {
                        //数据库查询出的列数据
                        dataCol = data1.data[0].HGridString.split(',');
@@ -317,7 +339,7 @@
                        for (var i = 0; i < colNames.length; i++) {
                            var dataCols = dataCol[i].split('|');
                            var ColumnName_Other = dataCols[4] == dataCols[5] ? "" : dataCols[4];
                            cols.push({ "ColumnName": colNames[i], "IsHide": dataCols[1] == 1 ? true : false, "Alignment": dataCols[2], "ColumnWidth": dataCols[3], "ColumnName_Other": ColumnName_Other, "ColumnName_real": dataCols[5] })
                            cols.push({ "ColumnName": colNames[i], "IsHide": dataCols[1] == 1 ? true : false, "Alignment": dataCols[2], "ColumnWidth": dataCols[3], "ColumnName_Other": ColumnName_Other, "ColumnName_real": dataCols[5], "IsTotalRow": dataCols[6] == 1 ? true : false })
                        }
                        option.data = cols;
                        table.render(option);
@@ -328,6 +350,9 @@
                            if (dataCols[1] == 1) {
                                $("#IsHide" + (i + 1)).attr("checked", true);
                            }
                            if (dataCols[6] == 1) {
                                $("#IsTotalRow" + (i + 1)).attr("checked", true);
                            }
                            $('#Alignment' + (i + 1)).find("option[value='" + dataCols[2] + "']").attr("selected", true);
                        }
                        form.render('checkbox');
@@ -336,7 +361,7 @@
                    } else {
                        //默认不选中 æ˜¾ç¤ºå­—体居左  è¡¨æ ¼çš„数据填充
                        for (var i = 0; i < colNames.length; i++) {
                            cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L", "ColumnWidth": 120 })
                            cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L", "ColumnWidth": 120, "IsTotalRow": false })
                        }
                        option.data = cols;
                        table.render(option);
@@ -344,6 +369,7 @@
                        //默认不选中 æ˜¾ç¤ºå­—体居左 é¡µé¢å¤šé€‰æ¡† ä¸‹æ‹‰æ¡† é‡æ–°æ¸²æŸ“
                        for (var i = 0; i < colNames.length; i++) {
                            $('#IsHide' + (i + 1)).prop("checked", false);
                            $('#IsTotalRow' + (i + 1)).prop("checked", false);
                            $('#Alignment' + (i + 1)).find("option[value='L']").attr("selected", true);
                        }
                        form.render('checkbox');
@@ -374,6 +400,7 @@
                    , { field: 'ColumnWidth', title: '列宽', width: 100, edit: 'text' }
                    , { field: 'ColumnName_Other', title: '别名', width: 120, edit: 'text' }
                    , { field: 'ColumnName_real', title: '别名对应列名', width: 120, edit: 'text', hide: "true" }
                    , { field: 'IsTotalRow', title: '是否统计', width: 100, templet: '#IsTotalRow' }
                ]]
            };
        }