From a1d776d2b8f428aae359ded0ecd52015c4dd2bba Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 18 十二月 2023 13:32:21 +0800
Subject: [PATCH] 单品过站优化

---
 WebTM/views/Baseset/SRM_OpenTmpList.html |  385 +++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 264 insertions(+), 121 deletions(-)

diff --git a/WebTM/views/Baseset/SRM_OpenTmpList.html b/WebTM/views/Baseset/SRM_OpenTmpList.html
index ec3986a..0e31bc1 100644
--- a/WebTM/views/Baseset/SRM_OpenTmpList.html
+++ b/WebTM/views/Baseset/SRM_OpenTmpList.html
@@ -22,7 +22,9 @@
                                 <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Del">鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Reload">鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Select">閫夋嫨</button>
+                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="ReportPrint">鎶ヨ〃鎵撳嵃</button>
                                 <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                                <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">闅愯棌鍒楄缃�</button>
                             </div>
                         </div>
                     </div>
@@ -45,27 +47,36 @@
     <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="../../../../Scripts/webConfig.js"></script>
+    <script src="../../layuiadmin/Scripts/webConfig.js"></script>
     <script>
         layui.use(['table', 'form', 'layer', 'element'], function () {
             var table = layui.table
-            , form = layui.form
-            , layer = layui.layer
-            , element = layui.element; //Tab鐨勫垏鎹㈠姛鑳斤紝鍒囨崲浜嬩欢鐩戝惉绛夛紝闇�瑕佷緷璧杄lement妯″潡
-            table.render({
+                , form = layui.form
+                , layer = layui.layer
+                , element = layui.element; //Tab鐨勫垏鎹㈠姛鑳斤紝鍒囨崲浜嬩欢鐩戝惉绛夛紝闇�瑕佷緷璧杄lement妯″潡
+
+            var option = [];
+            var HModName = "SRM_OpenTmpList";
+            option = {
                 elem: '#mainTable'
                 // , url: '/demo/table/user/'
-               , data: []
-              , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
-              , cols: [[
-                  { type: 'radio' }
-                , { field: 'HItemID', width: 150, title: 'ID', hide: true }
-                , { field: 'HNumber', width: 150, title: '妯″潡浠g爜' }
-                , { field: 'HName', width: 150, title: '妯″潡鍚嶇О', hide: true }
-                , { field: '妯℃澘鍚嶇О', width: 150, title: '妯℃澘鍚嶇О' }
-              ]]
-            });
+                , data: []
+                , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+                , height: 'full-10'
+                , loading: false
+                , cols: [[
+                    { type: 'radio' }
+                    , { field: 'HItemID', width: 150, title: 'ID', hide: true }
+                    , { field: 'HNumber', width: 150, title: '妯″潡浠g爜' }
+                    , { field: 'HName', width: 150, title: '妯″潡鍚嶇О', hide: true }
+                    , { field: '妯℃澘鍚嶇О', width: 150, title: '妯℃澘鍚嶇О' }
+                ]]
+                , page: true
+                , limits: [50, 500, 5000, 50000]
+                , limit: 50
+            };
 
+            DisPlay_HideColumn();
 
             table.on('row(mainTable)', function (obj) {////娉細test鏄痶able鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
                 obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');//閫変腑琛屾牱寮�
@@ -88,6 +99,7 @@
             var linterid = params[params[0]];
             var MyMsg = params[params[1]];
             var Type = params[params[2]];
+
             //var lentryid = params[params[1]];
             ///鍔犺浇鏄剧ず鏁版嵁
             function RoadList(Where) {
@@ -97,20 +109,18 @@
                 }
                 $.ajax({
                     type: "get",
-                    url: GetWEBURL() + "GetOpenTmpList_Json",
+                    url: GetWEBURL() + "/Open_PrintTem/GetOpenTmpList_Json",
                     async: true,
                     data: { "HNumber": Value },
                     //data: { "Value": Value },
                     success: function (result) {
                         ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
-                        table.reload('mainTable', {
-                            data: ajaxReturnData
-                            , height: 'full-10'
-                            , loading: false
-                            , done: function (index, res) {
+                        //table.reload('mainTable', {
+                        //    data: ajaxReturnData
 
-                            }
-                        });
+                        //});
+                        option.data = ajaxReturnData;
+                        table.render(option);
                     },
                     error: function (result) {
                         console.log(result);
@@ -124,33 +134,33 @@
                 element.tabDelete('tabDemo', '2'); //鍒犻櫎
                 element.tabAdd('tabDemo', {
                     title: '鏂板妯℃澘'
-                  , content: '<div class="layui-form-item">' +
-                      '<div class="layui-row">' +
-                      '<div class="layui-col">' +
-                      '<label class="layui-form-label"> 妯″潡鍚嶏細</label>' +
-                      '<div class="layui-input-inline">' +
-                      '<input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" readonly="readonly" autocomplete="off">' +
-                      '</div>' +
-                      '</div>' +
-                      '<div class="layui-row">' +
-                      '<div class="layui-col">' +
-                      '<label class="layui-form-label"> 妯℃澘鍚嶇О锛�</label>' +
-                      '<div class="layui-input-inline">' +
-                      '<input class="layui-input" name="HName" lay-verify="HName" id="HName" autocomplete="off">' +
-                      '</div>' +
-                      '</div>' +
-                      '</div>' +
-                      '<div class="layui-form-item">' +
-                      '<div class="layui-row">' +
-                      '<div class="layui-col">' +
-                      '<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Save">淇濆瓨</button>' +
-                      '<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Cancel">鍙栨秷</button>' +
-                      '</div>' +
-                      '</div>' +
-                      '</div>' +
-                      '</div>' +
-                      '</div>' //鏀寔浼犲叆(html浠g爜锛変笉鎸佹敮鐩存帴浼犲叆html椤甸潰
-                  , id: '2' //閫夐」鍗℃爣棰樼殑lay-id灞炴�у��
+                    , content: '<div class="layui-form-item">' +
+                        '<div class="layui-row">' +
+                        '<div class="layui-col">' +
+                        '<label class="layui-form-label"> 妯″潡鍚嶏細</label>' +
+                        '<div class="layui-input-inline">' +
+                        '<input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" readonly="readonly" autocomplete="off">' +
+                        '</div>' +
+                        '</div>' +
+                        '<div class="layui-row">' +
+                        '<div class="layui-col">' +
+                        '<label class="layui-form-label"> 妯℃澘鍚嶇О锛�</label>' +
+                        '<div class="layui-input-inline">' +
+                        '<input class="layui-input" name="HName" lay-verify="HName" id="HName" autocomplete="off">' +
+                        '</div>' +
+                        '</div>' +
+                        '</div>' +
+                        '<div class="layui-form-item">' +
+                        '<div class="layui-row">' +
+                        '<div class="layui-col">' +
+                        '<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Save">淇濆瓨</button>' +
+                        '<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Cancel">鍙栨秷</button>' +
+                        '</div>' +
+                        '</div>' +
+                        '</div>' +
+                        '</div>' +
+                        '</div>' //鏀寔浼犲叆(html浠g爜锛変笉鎸佹敮鐩存帴浼犲叆html椤甸潰
+                    , id: '2' //閫夐」鍗℃爣棰樼殑lay-id灞炴�у��
                 });
                 $("#HNumber").val(Type);
                 element.tabChange('tabDemo', '2');
@@ -158,33 +168,35 @@
 
             form.on('submit(Del)', function (data) {//鍒犻櫎
                 var checkStatus = table.checkStatus('mainTable')
-                 , data = checkStatus.data;
+                    , data = checkStatus.data;
                 var OpenTmp = data[0].HItemID;
                 $.ajax(
-                {
-                    type: "GET",
-                    url: GetWEBURL() + "DelOpenTmp", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                    async: true,
-                    data: { "HItemID": OpenTmp },
-                    dataType: "json",
-                    success: function (data) {
-                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            layer.msg(data.Message, { icon: 1 });
-                            RoadList(Type);
+                    {
+                        type: "GET",
+                        url: GetWEBURL() + "/Open_PrintTem/DelOpenTmp", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "HItemID": OpenTmp },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { icon: 1 });
+                                RoadList(Type);
+                            }
+                            else {
+                                layer.msg(data.Message, { icon: 5 });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+                            layer.msg("閿欒:" + err, { icon: 5 });
                         }
-                        else {
-                            layer.msg(data.Message, { icon: 5 });
-                        }
-                        layer.closeAll("loading");
-                    },
-                    error: function (err) {
-                        layer.msg("閿欒:" + err, { icon: 5 });
-                    }
-                });
+                    });
             });
+
             form.on('submit(Reload)', function (data) {//鍒锋柊
                 RoadList(Type);
             });
+
             form.on('submit(Save)', function (obj) {//淇濆瓨
                 var Tmp = obj.field;
                 if (Tmp.HName == '') {
@@ -195,85 +207,216 @@
                     return false;
                 }
                 $.ajax(
-                {
-                    type: "GET",
-                    url: GetWEBURL() + "SaveOpenTmp", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                    async: true,
-                    data: { "HNumber": Tmp.HNumber, "HName": Tmp.HName },
-                    dataType: "json",
-                    success: function (data) {
-                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            layer.msg(data.Message, { icon: 1 });
-                            RoadList(Type);
-                            element.tabChange('tabDemo', '1');
-                            element.tabDelete('tabDemo', '2'); //鍒犻櫎
+                    {
+                        type: "GET",
+                        url: GetWEBURL() + "/Open_PrintTem/SaveOpenTmp", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "HNumber": Tmp.HNumber, "HName": Tmp.HName },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { icon: 1 });
+                                RoadList(Type);
+                                element.tabChange('tabDemo', '1');
+                                element.tabDelete('tabDemo', '2'); //鍒犻櫎
 
+                            }
+                            else {
+                                layer.msg(data.Message, { icon: 5 });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+                            layer.msg("閿欒:" + err, { icon: 5 });
                         }
-                        else {
-                            layer.msg(data.Message, { icon: 5 });
-                        }
-                        layer.closeAll("loading");
-                    },
-                    error: function (err) {
-                        layer.msg("閿欒:" + err, { icon: 5 });
-                    }
-                });
+                    });
             });
+
             form.on('submit(Cancel)', function (data) {//鍙栨秷
                 element.tabChange('tabDemo', '1');
                 element.tabDelete('tabDemo', '2'); //鍒犻櫎
             });
-            form.on('submit(Select)', function (data) {//閫夋嫨
+
+            form.on('submit(Select)', function (data) {//鎶ヨ〃鎵撳嵃
                 var checkStatus = table.checkStatus('mainTable')
-                 , data = checkStatus.data;
-                var  OpenTmp = data[0].妯℃澘鍚嶇О;
+                    , data = checkStatus.data;
+                var OpenTmp = data[0].妯℃澘鍚嶇О;
+                console.log(linterid.toString());
                 //鎵撳紑鎵撳嵃妯℃澘
-                window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
+                window.open("../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
                 //鏍规嵁妯″潡鑾峰彇WEBAPI閾炬帴
                 var url = "";
-                switch (Type)
-                {
-                    case "HBarCodePrint":
-                        url = "UpdateBarcodePrintQty"
+                switch (Type) {
+                    case "HGy_BarCodeBill":  //HBarCodePrint
+                        url = "/Sc_BarCode/UpdateBarcodePrintQty"
                         break;
                     case "HPOInStockBill":
                         url = "UpdatePOInStockBillPrintQty"
                         break;
                 }
+
                 //鏇存柊鎵撳嵃鏁伴噺
-                $.ajax(
-                {
-                    type: "POST",
-                    url: GetWEBURL() + url, //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                    async: true,
-                    data: { "msg": MyMsg },
-                    dataType: "json",
-                    success: function (data) {
-                        //if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                        //    layer.msg(data.Message, { icon: 1 });
-                        //}
-                        //else {
-                        //    layer.msg(data.Message, { icon: 5 });
-                        //}
-                        layer.closeAll("loading");
-                    },
-                    error: function (err) {
-                        parent.f_alert("閿欒:" + err);
-                    }
-                });
-                
+                //$.ajax(
+                //    {
+                //        type: "POST",
+                //        url: GetWEBURL() + url, //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                //        async: true,
+                //        data: { "msg": MyMsg },
+                //        dataType: "json",
+                //        contentType: 'application/json',
+                //        success: function (data) {
+                //            layer.closeAll("loading");
+                //        },
+                //        error: function (err) {
+                //            parent.f_alert("閿欒:" + err);
+                //        }
+                //    });
+
+
                 //鍏抽棴褰撳墠绐楀彛
                 var index = parent.layer.getFrameIndex(window.name);
                 parent.layer.close(index);
             });
+
+            form.on('submit(ReportPrint)', function (data) {//閫夋嫨
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+
+                if (data.length == 0) {
+                    return layer.msg("璇烽�夋嫨妯$増!");
+                }
+                parent.ReportPrint(data);
+                //鍏抽棴褰撳墠绐楀彛
+                var index = parent.layer.getFrameIndex(window.name);
+                parent.layer.close(index);
+            })
+
+            //闅愯棌鍒楄缃�
+            form.on('submit(HideColumn)', function (data) {
+                get_HideColumn();
+            });
+
             form.on('submit(Exit)', function (data) {//閫�鍑�
                 var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
                 parent.layer.close(index); //鍐嶆墽琛屽叧闂�
             });
 
-            
 
 
+            //闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+
+            //鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    async: false,
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            var titleData = [""];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+
         });
     </script>
 

--
Gitblit v1.9.1