From cffe020f05fe07f491ab7cfc0a3e4d5b83ff805e Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 26 八月 2024 16:45:08 +0800
Subject: [PATCH] 1

---
 WebTM/views/基础资料/隐藏列设置/Gy_GridView_Hide.html |   77 ++++++++++++++++++++++++++++++++++----
 1 files changed, 69 insertions(+), 8 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 f73fbf6..bb68207 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"
@@ -34,6 +34,7 @@
                         <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="ClearBill" id="ClearBill">鍏ㄦ竻</button>
                         <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
                         <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Exit" id="Exit">閫�鍑�</button>
+                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Del" id="Del">鍒犻櫎</button>
                     </div>
                     <div class="layui-collapse">
                         <div class="layui-colla-item">
@@ -63,6 +64,12 @@
                                             <label class="layui-form-label" style="width: 85px;">鍒楀</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" lay-verify="HColumnWidth" name="HColumnWidth" id="HColumnWidth">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">榛樿鍒嗛〉</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HPageSize" name="HPageSize" id="HPageSize">
                                             </div>
                                         </div>
                                     </div>
@@ -135,7 +142,12 @@
         var params = getUrlVars();
         var HModName = params[params[0]]; //妯″潡鍚嶇О
         var colName = params[params[1]]; //鍒楀悕
+        var colTitleName = params[params[2]]; //鍒楀埆鍚�
+        if (colTitleName == undefined) {
+            colTitleName = "";
+        }
         colName = decodeURI(colName);//瀵筓RI 杩涜瑙g爜
+        colTitleName = decodeURI(colTitleName);
         //鍒濆鍖栫晫闈�
         set_ClearBill();
 
@@ -195,6 +207,11 @@
             Pub_Close(1);
         })
 
+        //鍒犻櫎
+        form.on('submit(Del)', function () {
+            get_Del();
+        })
+
         //#endregion
 
         //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -215,25 +232,30 @@
                 success: function (data1) {
                     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 && data1.data.length == colNames.length) {
+                    if (data1.data.length != 0 && dataCol.length == colNames.length) {
                         //鍐荤粨鍒�
                         $("#HFixCols").val(data1.data[0].HFixCols);
                         //瀛椾綋澶у皬
                         $("#HFontSize").val(data1.data[0].HFontSize);
                         //鍒楀
                         $("#HColumnWidth").val(data1.data[0].HColumnWidth);
-
-                        var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-
-                        dataCol = data1.data[0].HGridString.split(',');
+                        //榛樿鍒嗛〉
+                        $("#HPageSize").val(data1.data[0].HPageSize);
 
                         //琛ㄦ牸鐨勬暟鎹~鍏�
                         for (var i = 0; i < colNames.length; i++) {
                             var dataCols = dataCol[i].split('|');
-                            cols.push({ "ColumnName": colNames[i], "IsHide": dataCols[1] == 1 ? true : false, "Alignment": dataCols[2], "ColumnWidth": dataCols[3] })
+                            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] })
                         }
                         option.data = cols;
                         table.render(option);
@@ -250,9 +272,10 @@
                         form.render('select');
                         layer.close(ajaxLoad);
                     } else {
+                        var colTitleNames = colTitleName.split(',');
                         //榛樿涓嶉�変腑 鏄剧ず瀛椾綋灞呭乏  琛ㄦ牸鐨勬暟鎹~鍏�
                         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, "ColumnName_Other": colTitleNames[i] })
                         }
                         option.data = cols;
                         table.render(option);
@@ -285,7 +308,9 @@
                     { field: 'ColumnName', title: '鍒楀悕', width: 100 }
                     , { file: 'IsHide', title: '鏄惁闅愯棌', width: 100, templet: '#IsHide' }
                     , { field: 'Alignment', title: '瀵归綈鏂瑰紡', width: 100, templet: '#Alignment' }
-                    , { field: 'ColumnWidth', title: '鍒楀', width: 100,edit: 'text' }
+                    , { 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" }
                 ]]
             };
         }
@@ -298,6 +323,16 @@
                 if (table.cache["mainTable"][i] != "") {
                     table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                     num.push(table.cache["mainTable"][i])
+                }
+            }
+
+            //榛樿鍒嗛〉
+            var HPageSize = $("#HPageSize").val();
+            if (HPageSize != "") {
+                var nums = /^[0-9]+?[0-9]*$/;
+                if (!nums.test(HPageSize)) {
+                    layer.msg("榛樿鍒嗛〉涓嶄负姝f暣鏁�!")
+                    return false;
                 }
             }
 
@@ -342,6 +377,32 @@
             return vars;
         }
 
+        //鍒犻櫎
+        function get_Del() {
+            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                var wait = layer.load();
+                //閫昏緫鍒犻櫎鏂规硶
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/DelgrdAlignmentWMES',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.msg(result.Message, { icon: 1 }, function () {
+                                //鍏抽棴褰撳墠frame
+                                layer.close(wait);
+                            });
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                            layer.close(wait);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        layer.close(wait);
+                    }
+                });
+            })
+        }
 
 
         //#endregion

--
Gitblit v1.9.1