yusijie
2025-11-17 78fbcff2eabefedc9602424c77d96b97a5aa4cc6
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
2个文件已修改
1个文件已添加
530 ■■■■■ 已修改文件
WebTM/WebTM.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/库存查询/KF_ICInventory_Clear_PDA .html 527 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/用户管理/Xt_UserListEdit.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -336,6 +336,7 @@
    <Content Include="views\WMS扫码模块\客户条码扫描\Gy_getCusBarCodeBill_PDA.html" />
    <Content Include="views\WMS扫码模块\客户条码扫描\Gy_getCusBarCodeBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\小车锁定\Kf_TrolleyPositionBill_PDA.html" />
    <Content Include="views\WMS扫码模块\库存查询\KF_ICInventory_Clear_PDA .html" />
    <Content Include="views\WMS扫码模块\库存查询\KF_ICInventory_WorkShopByXJ_PDA.html" />
    <Content Include="views\WMS扫码模块\库存查询\KF_ICInventory_WorkShopByCLD_PDA.html" />
    <Content Include="views\WMS扫码模块\库存查询\KF_ICInventoryByWorkShop_PDA.html" />
WebTM/views/WMSɨÂëÄ£¿é/¿â´æ²éѯ/KF_ICInventory_Clear_PDA .html
New file
@@ -0,0 +1,527 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>车间上架库存查询</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <!--引用layui样式文件-->
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <!--引用layui js文件-->
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <style>
        .layui-col-xs8 {
            width: 55.666667%;
        }
    </style>
</head>
<body>
    <div class="layui-fluid" style="padding:0">
        <div class="layui-card" style="padding: 1px">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>车间上架库存查询</span>
                    </div>
                    <div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
                        <button type="button" lay-submit="" lay-filter="cmdSearch" class="layui-btn layui-btn-radius" id="cmdSearch">查询</button>
                        <button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn layui-btn-radius layui-btn-danger" id="cmdCancel">退出</button>
                    </div>
                    <div class="layui-collapse">
                        <div class="layui-colla-item">
                            <div class="layui-colla-title layui-inline">
                                <div class="layui-inline">
                                    <span>更多</span>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <div class="layui-col-xs2">
                                    <label class="layui-form-label" style="width:30px;padding-left:0px;">条码</label>
                                </div>
                                <div class="layui-col-xs10">
                                    <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                </div>
                            </div>
                            <div class="layui-colla-content" style="padding: 6px; margin-left: 6%;">
                                <div class="layui-row" style="margin-top:5px">
                                    <div class="layui-col-xs2">
                                        <label class="layui-form-label" style="width:30px;padding-left:0px;">仓库</label>
                                    </div>
                                    <div class="layui-col-xs10">
                                        <div class="layui-col-xs10">
                                            <input type="text" name="HWHName" id="HWHName" lay-verify="HWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                            <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs2">
                                            <button type="button" lay-submit="" lay-filter="HWHID-BT" class="layui-btn" id="HWHID-BT">...</button>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:5px">
                                    <div class="layui-col-xs2">
                                        <label class="layui-form-label" style="width:30px;padding-left:0px;">仓位</label>
                                    </div>
                                    <div class="layui-col-xs10">
                                        <div class="layui-col-xs10">
                                            <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                            <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs2">
                                            <button type="button" lay-submit="" lay-filter="HSpID-BT" class="layui-btn" id="HSpID-BT">...</button>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
                    <div class="layui-tab layui-col-xs12" lay-filter="tab-KF_ICInventoryByCLD_PDA">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1" style="padding:1px;">车间及时库存信息</li>
                        </ul>
                        <div class="layui-tab-content">
                            <!--车间及时库存信息-->
                            <div class="layui-tab-item layui-show">
                                <div class="layui-row">
                                    <div class="layui-col-xs12">
                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
                                        <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , laydate = layui.laydate
                , element = layui.element;
            var HStockOrgID = sessionStorage["OrganizationID"]  //组织ID
            var listOption = [];
            var columns = "";
            var HModName = "KF_ICInventory_WorkShopByCLD_PDA";
            var titleData = [];     //不需要显示的字段
            var params = get_UrlVars();
            var OperationType = params[params[0]] == null ? 1 : params[params[0]];  //1为直接模块打开  2为从其他模块跳转打开
            var HMaterNumber = params[params[1]];      //物料代码
            //#endregion
            //判断是否登录 æœªç™»å½•则跳到登录页
            if (sessionStorage.login != "login") {
                layer.confirm("登录失效,请重新登录!", {
                    icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
                }, function () { window.location.href = "../../user/login.html"; });
            }
            //#region åˆå§‹åŒ–界面
            set_ClearBill();
            function set_ClearBill() {
                set_InitGrid();     //初始化表格
                var data = [];
                listOption.cols = [[
                    { field: '数量', title: '数量', width: 100 }
                    , { field: '仓库', title: '仓库', width: 100 }
                    , { field: '仓位', title: '仓位', width: 100 }
                    , { field: '物料代码', title: '物料代码', width: 100 }
                    , { field: '物料名称', title: '物料名称', width: 100 }
                    , { field: '规格型号', title: '规格型号', width: 100 }
                    , { field: '批次', title: '批次', width: 100 }
                    , { field: '辅助属性', title: '辅助属性', width: 100 }
                    , { field: '生产日期', title: '生产日期', width: 100 }
                    , { field: '有效期至', title: '有效期至', width: 100 }
                    , { field: '组织', title: '组织', width: 100 }
                ]];
                listOption.data = data;
                table.render(listOption);
                if (OperationType == 2) {
                    //返回物料代码
                    $("#HBarCode").val(HMaterNumber);
                    //显示表体明细
                    DisBillEntryList();
                }
            }
            //初始化表格
            function set_InitGrid() {
                //条码信息
                listOption = {
                    elem: '#wl-table'
                    //, toolbar: '#toolbarDemo'
                    //, totalRow: true
                    , height: 'full-60'
                    , page: true
                    , cellMinWidth: 90
                    , limit: 50
                };
            }
            //#endregion
            //#region åŸºç¡€èµ„料选择
            //#region ä»“库
            //扫描仓库条码
            $('#HWHName').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    var HWHName = $('#HWHName').val()
                    if (HWHName == '') {
                        playSound();
                        $("#HWHID").val("0");
                        $("#HWHName").val("");
                        $("#HStockPlaceID").val("0");
                        $("#HStockPlaceName").val("");
                        $("#HStockPlaceName").removeAttr("disabled");
                        $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//按钮恢复正常状态
                        layer.msg("仓库条码为空!", {
                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示", btn: ['确认']
                        }, function () {
                            $("#HWHName").select();
                            $("#HWHName").focus();
                        });
                        return;
                    }
                    layer.load(3);
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/WEBSController/GetWarehouse_Json",
                        async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                        data: { "HBarCode": HWHName, "HStockOrgID": HStockOrgID },
                        success: function (result) {
                            if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                $("#HWHID").val(result.data[0].HItemID);
                                $("#HWHName").val(result.data[0].HName);
                                $("#HStockPlaceID").val("0");
                                $("#HStockPlaceName").val("");
                                if (result.data[0].HSPFlag == 0) {
                                    $("#HStockPlaceName").attr("disabled", "disabled");
                                    $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//按钮禁用
                                }
                                else {
                                    $("#HStockPlaceName").removeAttr("disabled");
                                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//按钮恢复正常状态
                                }
                                element.tabChange('tab-Kf_POStockInBill_PDA', '2');
                                //光标显示到条码上
                                $("#HBarCode").select();
                                $("#HBarCode").focus();
                            }
                            else {
                                playSound();
                                $("#HWHID").val("0");
                                $("#HWHName").val("");
                                $("#HStockPlaceID").val("0");
                                $("#HStockPlaceName").val("");
                                $("#HStockPlaceName").removeAttr("disabled");
                                $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//按钮恢复正常状态
                                layer.msg(result.Message, {
                                    icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示", btn: ['确认']
                                }, function () {
                                    $("#HWHName").select();
                                    $("#HWHName").focus();
                                });
                            }
                            layer.closeAll("loading");
                        },
                        complete: function (XHR, TS) { XHR = null }//回收资源
                    });
                }
            });
            //仓库按钮
            form.on('submit(HWHID-BT)', function () {
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '仓库列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockOrgID + '', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                })
            });
            //#endregion
            //#region ä»“位
            //扫描仓位条码
            $('#HStockPlaceName').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    //仓库文本框为空时,清空对应ID
                    if ($("#HWHName").val() == '') {
                        $("#HWHID").val("0");
                    }
                    var sHWHID = $("#HWHID").val()
                    var HStockPlaceName = $('#HStockPlaceName').val()
                    if (HStockPlaceName == '') {
                        playSound();
                        $("#HWHID").val("0");
                        $("#HWHName").val("");
                        $("#HStockPlaceID").val("0");
                        $("#HStockPlaceName").val("");
                        layer.msg("仓位条码为空!", {
                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示", btn: ['确认']
                        }, function () {
                            $("#HStockPlaceName").select();
                            $("#HStockPlaceName").focus();
                        });
                        return;
                    }
                    layer.load(3);
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/WEBSController/GetStockPlace_Json",
                        async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                        data: { "HBarCode": HStockPlaceName, "HWhID": sHWHID, "HStockOrgID": HStockOrgID },
                        success: function (result) {
                            if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                $("#HStockPlaceName").val(result.data[0].HName);
                                $("#HStockPlaceID").val(result.data[0].HItemID);
                                $("#HWHName").val(result.data[0].HWhName);
                                $("#HWHID").val(result.data[0].HWHID);
                                element.tabChange('tab-Kf_POStockInBill_PDA', '2');
                                //光标显示到条码上
                                $("#HBarCode").select();
                                $("#HBarCode").focus();
                            }
                            else {
                                playSound();
                                $("#HWHID").val("0");
                                $("#HWHName").val("");
                                $("#HStockPlaceID").val("0");
                                $("#HStockPlaceName").val("");
                                layer.msg(result.Message, {
                                    icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示", btn: ['确认']
                                }, function () {
                                    $("#HStockPlaceName").select();
                                    $("#HStockPlaceName").focus();
                                });
                            }
                            layer.closeAll("loading");
                        },
                        complete: function (XHR, TS) { XHR = null }//回收资源
                    });
                }
            });
            //仓位按钮
            form.on('submit(HSpID-BT)', function () {
                //仓库文本框为空时,清空对应ID
                if ($("#HWHName").val() == '') {
                    $("#HWHID").val("0");
                }
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '仓位列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_StockPlaceListNew.html?HWhID=' + $("#HWHID").val() + '&Type=HSpID&HOrgID=' + HStockOrgID + '', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                })
            });
            //#endregion
            //#endregion
            //#region æ‰«æç‰©æ–™æ¡ç 
            //扫描条码
            $('#HBarCode').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    DisBillEntryList();
                    layer.closeAll("loading");
                }
            });
            //#endregion
            //#region åŠŸèƒ½æŽ§ä»¶
            //#region æŸ¥è¯¢
            form.on('submit(cmdSearch)', function (data) {
                DisBillEntryList();
                layer.closeAll("loading");
            });
            function DisBillEntryList() {
                //仓库、仓位文本框为空时,清空对应ID
                if ($("#HWHName").val() == '') {
                    $("#HWHID").val("0");
                }
                if ($("#HStockPlaceName").val() == '') {
                    $("#HStockPlaceID").val("0");
                }
                var sHBarCode = $('#HBarCode').val()
                var sHWHID = $("#HWHID").val()
                var sHSPID = $("#HStockPlaceID").val()
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/KF_ICInventory_WorkShopByMaterID/GetWorkShopICInventory',
                    async: true,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                    data: { "HBarCode": sHBarCode, "sHWHID": sHWHID, "sHSPID": sHSPID, "HOWNERID": HStockOrgID, "sWhere": '' },
                    success: function (result) {
                        var data = [];
                        var col = [];
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            //给空的数组赋值
                            for (var key in result.list) {
                                //动态获取列表所有列名
                                data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
                                //获取不需要显示的列(H开头的列不显示)
                                var patrn = new RegExp(/^h/i);
                                if (patrn.test(result.list[key].ColmCols)) {
                                    titleData[key] = result.list[key].ColmCols;
                                }
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'radio' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            if (data[i].name == '仓库' || data[i].name == '批号') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 120 });
                                            } else if (data[i].name == '物料代码' || data[i].name == '物料名称' || data[i].name == '规格型号' || data[i].name == '组织' || data[i].name == '仓位代码' ) {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 180 });
                                            } else {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center' });
                                            }
                                    }
                                }
                            }
                            columns = col;
                            listOption.cols = [columns];
                            listOption.data = result.data;
                            //listOption.totalRow = true;
                            table.cache['wl-table'] = null;         //清空表格缓存数据
                            table.render(listOption);
                        }
                        else {
                            listOption.cols = [[
                                { field: '数量', title: '数量', width: 100 }
                                , { field: '仓库', title: '仓库', width: 100 }
                                , { field: '仓位', title: '仓位', width: 100 }
                                , { field: '物料代码', title: '物料代码', width: 100 }
                                , { field: '物料名称', title: '物料名称', width: 100 }
                                , { field: '规格型号', title: '规格型号', width: 100 }
                                , { field: '批次', title: '批次', width: 100 }
                                , { field: '辅助属性', title: '辅助属性', width: 100 }
                                , { field: '生产日期', title: '生产日期', width: 100 }
                                , { field: '有效期至', title: '有效期至', width: 100 }
                                , { field: '组织', title: '组织', width: 100 }
                            ]];
                            listOption.data = data;
                            //listOption.totalRow = true;
                            table.render(listOption);
                            //layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    },
                    complete: function (XHR, TS) { XHR = null }//回收资源
                });
            }
            //#endregion
            //#region é€€å‡º
            form.on('submit(cmdCancel)', function () {
                //layer.confirm('您确定要退出吗?', { icon: 3, title: '提示' }, function (index) {
                    if (OperationType == 2) {
                        var index = parent.layer.getFrameIndex(window.name);    //先得到当前iframe层的索引
                        //parent.location.reload();                               //刷新父页面,注意一定要在关闭当前iframe层之前执行刷新
                        parent.layer.close(index);                              //再执行关闭
                    }
                    else {
                        parent.location.href = "../../../views/index_Mobile.html";
                    }
                //});
            })
            //#endregion
            //#endregion
        });
        //以上为layui模块
        //此处方法涉及到被外部页面parent.方法名调用的必须放在Layui方法外部
        //点击按钮选择后   è¿”回仓库信息
        function GetHWHValue(obj) {
            if (obj.length > 0) {
                $("#HWHName").val(obj[0].HName);
                $("#HWHID").val(obj[0].HItemID);
                $("#HStockPlaceName").val("");
                $("#HStockPlaceID").val("0");
                if (obj[0].HSPFlag == 0) {
                    $("#HStockPlaceName").attr("disabled", "disabled");
                    $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//按钮禁用
                }
                else {
                    $("#HStockPlaceName").removeAttr("disabled");
                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//按钮恢复正常状态
                }
            }
        }
        //点击按钮选择后   è¿”回仓位信息
        function GetHSpValue(obj) {
            if (obj.length > 0) {
                $("#HStockPlaceName").val(obj[0].HName);
                $("#HStockPlaceID").val(obj[0].HItemID);
                $("#HWHName").val(obj[0].HWhName);
                $("#HWHID").val(obj[0].HWHID);
            }
        }
    </script>
</body>
</html>
WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Xt_UserListEdit.html
@@ -733,6 +733,8 @@
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        $("#HEmpName").val("");
                        $("#HEmpID").val(0);
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },