From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/隐藏列设置/Gy_GridView_Hide.html | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
index bb68207..e5e9da4 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
@@ -119,6 +119,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/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -179,6 +185,19 @@
});
});
+ //鏄惁缁熻
+ 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;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+
//淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
set_AddNew(data);
@@ -233,12 +252,12 @@
var colNames = [];//鐩稿鍗曟嵁浼犺繃鏉ョ殑鍒楀悕
var cols = [];//瑕佷紶杩涜〃鏍肩殑鏁版嵁
var dataCol = [];
-
+
if (data1.data.length != 0) {
//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
dataCol = data1.data[0].HGridString.split(',');
}
-
+
colNames = colName.split(',');
if (data1.data.length != 0 && dataCol.length == colNames.length) {
@@ -255,7 +274,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);
@@ -266,6 +285,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');
@@ -275,7 +297,7 @@
var colTitleNames = colTitleName.split(',');
//榛樿涓嶉�変腑 鏄剧ず瀛椾綋灞呭乏 琛ㄦ牸鐨勬暟鎹～鍏�
for (var i = 0; i < colNames.length; i++) {
- cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L", "ColumnWidth": 120, "ColumnName_Other": colTitleNames[i] })
+ cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L", "ColumnWidth": 120, "ColumnName_Other": colTitleNames[i], "IsTotalRow": false })
}
option.data = cols;
table.render(option);
@@ -283,6 +305,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');
@@ -310,7 +333,8 @@
, { field: 'Alignment', title: '瀵归綈鏂瑰紡', width: 100, templet: '#Alignment' }
, { 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: 'ColumnName_real', title: '鍒悕瀵瑰簲鍒楀悕', width: 120, edit: 'text', hide: "true" }
+ , { field: 'IsTotalRow', title: '鏄惁缁熻', width: 100, templet:'#IsTotalRow' }
]]
};
}
--
Gitblit v1.9.1