Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

wtt

2026-02-03 7cb06e1b369e7d79b314a8a3573b215aa078c4c5

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_WarehouseListNew.html

@@ -29,7 +29,7 @@
            </div>
        </div>
    </div>
    <table class="layui-hide" id="mainTable"></table>
    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
    <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>
@@ -48,11 +48,12 @@
        var params = getUrlVars();
        var Type = params[params[0]];
        var HOtherOrgID = params[params[1]];
        var HWarehouseType = params[params[2]] == null ? 1 : params[params[2]];  //仓库类型（1全部仓库、2模具仓库）

        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
            , form = layui.form
            , layer = layui.layer;
                , form = layui.form
                , layer = layui.layer;

            form.on('submit(HQuery)', function () {//选择仓库
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
@@ -61,11 +62,14 @@
            form.on('submit(FH)', function () {//选择仓库
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                var checkStatus = table.checkStatus('mainTable')
                 , data = checkStatus.data;
                    , data = checkStatus.data;
                //parent.GetHWHValue(data);
                switch (Type) {
                    case "HWHID":  //返回调入仓库
                        parent.GetHWHValue(data);
                        break;
                    case "HWHID_2":  //返回调入仓库
                        parent.GetHWHValue_2(data);
                        break;
                    case "HSCWHID":  //返回调出仓库
                        parent.GetHSCWHNAMEValue(data);
@@ -81,24 +85,59 @@
            table.render({
                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: '仓库代码' }
                , { field: 'HName', width: 150, title: '仓库名称', sort: true }
              ]]
                , data: []
                , cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 æ–°å¢ž
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HItemID', width: 150, title: '仓库ID', hide: true }
                    , { field: 'HNumber', width: 150, title: '仓库代码' }
                    , { field: 'HName', width: 150, title: '仓库名称', sort: true }
                ]]
                , page: true
                , limits: [50, 500, 5000, 50000],
                limit: 50
            });

            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
                $(".layui-table-body tr ").attr({ "style": "background:" });    //其他tr恢复原样
                obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');   //选中行样式
                obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");   //选中radio样式
                $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //改变当前tr背景颜色和字体颜色
            })
            //#endregion

            //#region åŒå‡»è¿”回数据
            table.on('rowDouble(mainTable)', function (obj) {
                var data = [];
                data.push(obj.data);
                switch (Type) {
                    case "HWHID":  //返回调入仓库
                        parent.GetHWHValue(data);
                        break;
                    case "HWHID_2":  //返回调入仓库
                        parent.GetHWHValue_2(data);
                        break;
                    case "HSCWHID":  //返回调出仓库
                        parent.GetHSCWHNAMEValue(data);
                        break;
                    case "HFIFOWHID":  //返回先进先出仓库
                        parent.GetHFIFOWHNAMEValue(data);
                        break;
                }
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });
            //#endregion

            ///加载显示数据
            function RoadQuery(Where, HOrgID) {
                var Value = Where;
                if (Value == null) {
                    Value = '';
                }
                Value = HWarehouseType + ';' + Value;
                //if (HOtherOrgID > 0) {
                //    Value = HOtherOrgID;
                //}
@@ -107,10 +146,9 @@
                }
                $.ajax({
                    type: "get",
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetWarehouseList_Json",
                    url: GetWEBURL() + "/Web/GetWarehouseList_Json_New",
                    url: GetWEBURL() + "/WEBSController/GetWarehouseList_Json",
                    async: true,
                    data: { "Warehouse": Value, "HOrgID": HOtherOrgID},
                    data: { "Warehouse": Value, "HStockOrgID": HOtherOrgID },
                    //data: { "Value": Value },
                    success: function (result) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;