From ef440badf903c27eb05727453367d419f0adcc08 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 27 六月 2022 08:54:39 +0800
Subject: [PATCH] nothing

---
 WebTM/views/基础资料/隐藏列设置/Gy_GridView_Hide.html           |  311 +++++++++++++++++++++++++++++++++++++++++++++++++++
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html |    2 
 WebTM/views/生产管理/提料计划/JIT_LiftMaterPlanBillEdit.html   |   33 +++++
 3 files changed, 341 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 125a5a8..fbd3f6e 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"
@@ -2,9 +2,314 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <title></title>
+    <title>闅愯棌鍒楄缃�</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <style>
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+    </style>
 </head>
 <body>
-
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="CheckAll" id="CheckAll">鍏ㄩ��</button>
+                        <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>
+                    </div>
+                    <div class="layui-collapse">
+                        <div class="layui-colla-item">
+                            <div class="layui-form-item" style="padding-top: 10px;">
+                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <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" name="HFixCols" lay-verify="HFixCols" id="HFixCols">
+                                            </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" name="HFontSize" lay-verify="HFontSize" id="HFontSize">
+                                            </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="HHeadTextHeight" name="HHeadTextHeight" id="HHeadTextHeight">
+                                            </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="HTextHeight" name="HTextHeight" id="HTextHeight">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鐐瑰嚮鎺掑簭</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;width: 184px;">
+                                                <select name="HSortFlag" lay-verify="HSortFlag" id="HSortFlag">
+                                                    <option value=""></option>
+                                                    <option value="鏄�">鏄�</option>
+                                                    <option value="鍚�">鍚�</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">閫変腑琛屽悎璁�</label>
+                                            <div class="layui-input-block" style="margin-left: 125px;width: 184px;">
+                                                <select name="HSelTotal" lay-verify="HSelTotal" id="HSelTotal">
+                                                    <option value=""></option>
+                                                    <option value="鏄�">鏄�</option>
+                                                    <option value="鍚�">鍚�</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
 </body>
-</html>
\ No newline at end of file
+</html>
+<!--琛屼笅鎷夐�夋嫨(瀵归綈鏂瑰紡)-->
+<script type="text/html" id="Alignment">
+    <select name="Alignment" lay-filter="Alignment" id="Alignment{{d.LAY_TABLE_INDEX+1}}">
+        <option value="L">宸﹀榻�</option>
+        <option value="M">灞呬腑</option>
+        <option value="R">鍙冲榻�</option>
+    </select>
+</script>
+<!--澶嶉�夋 鏄惁闅愯棌-->
+<script type="text/html" id="IsHide">
+    <div class="layui-input-block" style="margin-left: 20px;">
+        <input type="checkbox" name="IsHide" lay-filter="IsHide" id="IsHide{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+    </div>
+</script>
+<script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        //#region 鍏叡鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element;
+        //鏌ヨ鏉′欢
+        var sWhere = "";
+        var option = [];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        var params = getUrlVars();
+        var HModName = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  娣诲姞 淇濆瓨
+        //var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+        //var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //琛岄�夋嫨澶勭悊锛堝榻愭柟寮忥級
+        form.on('select(Alignment)', 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.Alignment = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                }
+            });
+        });
+
+        //鏄惁闅愯棌
+        form.on('checkbox(IsHide)', 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.IsHide = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                }
+            });
+        });
+
+        //淇濆瓨鎻愪氦
+        form.on('submit(btnSave)', function (data) {//鎻愪氦
+            set_AddNew(data);
+        });
+
+        //鍏ㄩ��
+        form.on('submit(CheckAll)', function (data) {//鎻愪氦
+            for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                table.cache["mainTable"][i].IsHide = true;
+                $('#IsHide' + (i + 1)).prop("checked", true);
+            }
+            form.render('checkbox');
+        });
+
+        //鍏ㄦ竻
+        form.on('submit(ClearBill)', function (data) {//鎻愪氦
+            for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                table.cache["mainTable"][i].IsHide = false;
+                $('#IsHide' + (i + 1)).attr("checked", false);
+            }
+            form.render('checkbox');
+        });
+
+        //閫�鍑�
+        form.on('submit(Cancel)', function () {
+            Pub_Close(1);
+        })
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        //鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            set_InitGrid();
+            get_Display();
+        }
+
+        //#region 鏌ヨ
+        function get_Display() {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                type: "GET",
+                data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        option.data = data1.data;
+                        table.render(option);
+                        layer.close(ajaxLoad);
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //琛ㄦ牸鏁版嵁
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                //, toolbar: '#toolbarDemo'
+                , height: 690
+                , cellMinWidth: 90
+                , limit: 500
+                , loading: false
+                , cols: [[
+                    { field: 'ColumnName', title: '鍒楀悕', width: 100 }
+                    , { file: 'IsHide', title: '鏄惁闅愯棌', width: 100, templet: '#IsHide' }
+                    , { field: 'Alignment', title: '瀵归綈鏂瑰紡', width: 100, templet: '#Alignment' }
+                ]]
+            };
+            option.data = [{ "ColumnName": "111", "IsHide": false, "Alignment": "L" }, { "ColumnName": "222", "IsHide": false, "Alignment": "R" }];
+            table.render(option);
+        }
+
+        //淇濆瓨HMaker
+        function set_AddNew(data) {
+
+            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;
+                    num.push(table.cache["mainTable"][i])
+                }
+            }
+
+            var sMainStr = JSON.stringify(data.field);
+            var sSubStr = JSON.stringify(num);
+            var HModName = "1";//妯″潡鍚嶇О
+            var OperationType = "1";
+            var sMainSub = sMainStr + ';' + sSubStr + ';' + HModName + ';' + OperationType + ";" + 2;//sessionStorage["HUserName"]
+
+            var index = layer.load();
+            $.ajax({
+                type: "POST",
+                url: GetWEBURL() + "/Xt_grdAlignment_WMES/AddgrdAlignmentWMES",
+                async: true,
+                data: { "sMainSub": sMainSub },
+                dataType: "json",
+                success: function (data) {
+                    if (data.count == 1) {
+                        layer.close(index);
+                        layer.msg("鎻愪氦鎴愬姛");
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
+
+        //鑾峰彇鍙傛暟
+        function getUrlVars() {
+            var vars = [], hash;
+            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+            for (var i = 0; i < hashes.length; i++) {
+                hash = hashes[i].split('=');
+                vars.push(hash[0]);
+                vars[hash[0]] = hash[1];
+            }
+            return vars;
+        }
+
+
+
+        //#endregion
+
+    });
+
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
index 38a3fc1..48eb1e5 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
@@ -55,6 +55,7 @@
                     <div style="padding: 10px; ">
                         <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
                         <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">闅愯棌鍒楄缃�</button>
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
                         <div class="layui-tab-content">
@@ -606,6 +607,11 @@
                 });
             });
 
+            //闅愯棌鍒楄缃�
+            form.on('submit(HideColumn)', function (data) {
+                get_HideColumn();
+            });
+
             //#endregion
 
             //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -647,7 +653,6 @@
             //澶氶��  鍒锋柊琛ㄦ牸
             function checkRefresh() {
                 for (var i = 1; i <= option.data.length; i++) {
-                    console.log(JSON.stringify(option.data[i - 1]))
                     //寤惰繜鍘熷洜
                     $('#HLaterReason' + i + '').find("option[value='" + option.data[i - 1].HLaterReason + "']").attr("selected", true);
                     //鐗╂枡灞炴��
@@ -747,6 +752,32 @@
                 })
             }
 
+            //闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "甯佸埆鍒楄〃"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ["../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName="+1, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鎸夐挳涓�  鐨勫洖璋�
+                        var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                        if (checkStatus.data.length != 1) {
+                            return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
             //琛屽揩鎹烽敭
             function set_GridCellCheck(obj) {
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 3395e94..0b1ad99 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -489,7 +489,7 @@
                         $.ajax({
                             type: "GET",
                             url: GetWEBURL() + "/Sc_ProcessExchangeBill/DeltetProcessExchangeBillByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
+                            data: { "HInterID": HInterID, "HPRDORGID": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

--
Gitblit v1.9.1