From 2c4e339508f78a215518a8a12af34ca0b1564d44 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 31 十月 2025 13:07:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/隐藏列设置/Gy_GridView_Hide.html | 74 ++++++++++++++++++++++++++++++++-----
1 files changed, 64 insertions(+), 10 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..057e1e9 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"
@@ -11,6 +11,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
<style>
/* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
.layui-table-cell {
@@ -21,6 +22,11 @@
margin-top: -10px;
margin-left: -15px;
margin-right: -15px;
+ }
+
+ /*鐢ㄤ簬鏍囪talbe涓彲浠ヨЕ鍙戣鎷栨嫿鏁堟灉鐨勫垪*/
+ .drag-column{
+
}
</style>
</head>
@@ -119,17 +125,24 @@
<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/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ }).use(['index', 'form', 'laydate', 'table',"soulTable", 'element'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
, table = layui.table
+ , soulTable = layui.soulTable
, form = layui.form
, element = layui.element;
//鏌ヨ鏉′欢
@@ -178,6 +191,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) {//鎻愪氦
@@ -233,12 +259,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) {
@@ -250,12 +276,13 @@
$("#HColumnWidth").val(data1.data[0].HColumnWidth);
//榛樿鍒嗛〉
$("#HPageSize").val(data1.data[0].HPageSize);
-
+ //鏄惁鎺掑簭
+ $("#HSortFlag").val(data1.data[0].HSortFlag);
//琛ㄦ牸鐨勬暟鎹～鍏�
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": dataCols[5], "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 +293,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 +305,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 +313,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');
@@ -299,26 +330,49 @@
//琛ㄦ牸鏁版嵁
function set_InitGrid() {
option = {
- elem: '#mainTable'
+ id: "mainTable"
+ , elem: '#mainTable'
//, toolbar: '#toolbarDemo'
, height: 420
, cellMinWidth: 90
, limit: 500
, cols: [[
- { field: 'ColumnName', title: '鍒楀悕', width: 100 }
+ {
+ field: 'ColumnName', title: '鍒楀悕', width: 100, templet: function (d) {
+ return '<div class="drag-column" style="cursor: move; width: 100%; height: 100%;">' + d.ColumnName + '</div>';
+ }
+ }
, { file: 'IsHide', title: '鏄惁闅愯棌', width: 100, templet: '#IsHide' }
, { 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' }
]]
+ , even: true
+ , rowDrag: {/*trigger: 'row',*/
+ trigger: '.drag-column' // 鎸囧畾瑙﹀彂鎷栨嫿鐨勫厓绱犻�夋嫨鍣�
+ ,onlyHandle: true // 璁句负true琛ㄧず鍙湁trigger鎸囧畾鐨勫厓绱犳墠鑳借Е鍙戞嫋鎷�
+ ,done: function (obj) {
+ // 瀹屾垚鏃讹紙鏉惧紑鏃讹級瑙﹀彂
+ // 濡傛灉鎷栧姩鍓嶅拰鎷栧姩鍚庢棤鍙樺寲锛屽垯涓嶄細瑙﹀彂姝ゆ柟娉�
+ console.log(obj.row) // 褰撳墠琛屾暟鎹�
+ console.log(obj.cache) // 鏀瑰姩鍚庡叏琛ㄦ暟鎹�
+ console.log(obj.oldIndex) // 鍘熸潵鐨勬暟鎹储寮�
+ console.log(obj.newIndex) // 鏀瑰姩鍚庢暟鎹储寮�
+ console.log(table.cache["mainTable"]) // 鏀瑰姩鍚庢暟鎹储寮�
+ }
+ }
+ , done: function () {
+ soulTable.render(this)
+ }
};
}
//淇濆瓨HMaker
function set_AddNew(data) {
- var num = [];
+ var num = []
for (var i = 0; i < table.cache["mainTable"].length; i++) {
if (table.cache["mainTable"][i] != "") {
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
--
Gitblit v1.9.1