zrg
2024-11-01 158e131a569a6d6ec5d40cf9ae42c61eb29d3d7a
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
2个文件已添加
18个文件已修改
1432 ■■■■■ 已修改文件
WebTM/WebTM.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/基础资料/Gy_GetProductionTeamList.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/库存查询/KF_ICInventoryByCLD_PDA.html 527 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/采购入库/Kf_POStockInBill_PDA.html 101 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/home/console.html 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/home/console_Mobile.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index_Mobile.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工资管理/工资报表/Pay_PayWorkShopSumReport.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工资管理/工资报表/Pay_PaymentDayCheckReport.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工资管理/工资报表/Pay_PaymentEntryReport.html 598 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工资管理/工资报表/Pay_PaymentMonthSumReport.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工资管理/工资报表/Pay_PaymentPieceSumReport.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工资管理/工资报表/Pay_PaymentTimeSumReport.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillList.html 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillList.html 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBillCheckQuery.html 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/报表分析/Mes_OrderProcFlowAllReport_ICMO.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -284,6 +284,7 @@
    <Content Include="views\WMS扫码模块\客户条码扫描\Gy_getCusBarCodeBillList_BarCodeList.html" />
    <Content Include="views\WMS扫码模块\客户条码扫描\Gy_getCusBarCodeBill_PDA.html" />
    <Content Include="views\WMS扫码模块\客户条码扫描\Gy_getCusBarCodeBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\库存查询\KF_ICInventoryByCLD_PDA.html" />
    <Content Include="views\WMS扫码模块\扫码验证\Gy_BarCodeConfirmBill_PDA.html" />
    <Content Include="views\WMS扫码模块\扫码验证\Gy_BarCodeConfirmBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\扫码验证\Gy_BarCodeConfirmBillList.html" />
@@ -414,6 +415,7 @@
    <Content Include="views\基础资料\通用基础资料\Gy_CommonBaseData.html" />
    <Content Include="views\基础资料\隐藏列设置\Gy_GridView_Hide_New.html" />
    <Content Include="views\工资管理\定额申请\Pay_ProcPriceRequestBillCheckQuery.html" />
    <Content Include="views\工资管理\工资报表\Pay_PaymentEntryReport.html" />
    <Content Include="views\工资管理\工资报表\Pay_PayWorkShopSumReport.html" />
    <Content Include="views\工资管理\工资报表\Pay_PaymentDayCheckReport.html" />
    <Content Include="views\工资管理\工资报表\Pay_PaymentMonthSumReport.html" />
WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,11 +3,11 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    //var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    /*var WEBURL = "http://localhost:8082/API/";*/    //杜贺本地配置
    /*var WEBURL = "http://localhost/API/";*/    //潘浙游本地配置  
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
   /* var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置*/
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
    /*var WEBURL = "http://localhost:8082/LuBaoAPI/"; */  //余思杰本地配置
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_GetProductionTeamList.html
@@ -81,7 +81,6 @@
                }
                parent.layer.close(index);
            });
            RoadQuery($('#Value').val());
            table.render({
                elem: '#mainTable'
                // , url: '/demo/table/user/'
@@ -97,6 +96,8 @@
                , limits: [50, 500, 5000, 50000],
                limit: 50
            });
            RoadQuery($('#Value').val());
            ///加载显示数据
            function RoadQuery(Where) {
                var Value = " and HUSEORGID = " + sessionStorage["OrganizationID"] + "";
WebTM/views/WMSɨÂëÄ£¿é/¿â´æ²éѯ/KF_ICInventoryByCLD_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>ERP及时库存查询</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>ERP及时库存查询</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_ICInventoryByCLD_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: 't', 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: 't', 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: 't', 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: 't', 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_ICInventoryByMaterID/GetBillEntry_TmpList_Pack1',
                    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 == '仓库') {
                                                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 == '组织') {
                                                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: 't', 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/WMSɨÂëÄ£¿é/²É¹ºÈë¿â/Kf_POStockInBill_PDA.html
@@ -129,38 +129,6 @@
                                    <div class="layui-form-item" style="padding:0px;margin:0px">
                                        <div class="layui-row">
                                            <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>
                                    <div class="layui-form-item" style="padding:0px;margin:0px">
                                        <div class="layui-row">
                                            <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 class="layui-form-item" style="padding:0px;margin:0px">
                                        <div class="layui-row">
                                            <div class="layui-col-xs2">
                                                <label class="layui-form-label" style="width:30px;padding-left:0px;">保管</label>
                                            </div>
                                            <div class="layui-col-xs10">
@@ -236,6 +204,38 @@
                                </div>
                                <!--物料信息-->
                                <div class="layui-tab-item">
                                    <div class="layui-form-item" style="padding:0px;margin:0px">
                                        <div class="layui-row">
                                            <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>
                                    <div class="layui-form-item" style="padding:0px;margin:0px">
                                        <div class="layui-row">
                                            <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 class="layui-row">
                                        <div class="layui-col-xs12">
                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
@@ -547,6 +547,32 @@
                $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //改变当前tr背景颜色和字体颜色
            })
            //#endregion
            //#region  ç›‘听网格表体事件
            table.on('tool(wl-table)', function (obj) {
                var data = obj.data;
                //物料代码超链接
                if (obj.event == '物料代码') {                      //检查 obj.event æ˜¯å¦ç­‰äºŽå­—符串 '物料代码'。如果等于,则执行if循环
                    var HMaterNumber = data.物料代码.toString();    //声明变量HMaterNumber ä¸º data.物料代码
                    layer.open({                                    //使用 layer的open打开弹出 å±‚
                        type: 2                                     //表示弹出层的内容是一个 iframe
                        , area: ['100%', '100%']
                        , title: '及时库存信息'                     //设置弹出层的名字和变量
                        , closeBtn: 1                               //显示关闭按钮
                        , shade: 0.6                                //遮罩透明度
                        , maxmin: false                              //允许全屏最小化
                        , anim: 0                                   //0-6的动画形式,-1不开启
                        , content: '../../WMS扫码模块/库存查询/KF_ICInventoryByCLD_PDA.html?OperationType=2&HMaterNumber=' + HMaterNumber  //设置 iframe çš„ URL,URL ä¸­åŒ…含了查询参数,来调用所需要的值
                        , resize: false,                            //是否允许用户调整弹出大小
                        end: function () {  //当关闭时调用
                        }
                        , cancel: function () {  //点击取消时使用回调
                        }
                    })
                }
            });
             //#endregion
            //判断是否新增,获取最大单据号
            if (HInterID != 0) {
@@ -1687,8 +1713,13 @@
                            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 {
                                } else if (data[i].name == '物料代码') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, event: '物料代码', event: '物料代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.物料代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                } else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
@@ -1698,6 +1729,8 @@
                                        if (data[i].name == '数量' || data[i].name == '源单数量' || data[i].name == '条码个数') {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', totalRow: true });
                                        } else if (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' });
                                        }
WebTM/views/home/console.html
@@ -198,10 +198,10 @@
                            <div carousel-item="">
                                <ul class="layui-row layui-col-space10 layui-this">
                                    <li class="layui-col-xs6">
                                        <a href="javascript:void(0);">
                                        <a lay-href="../views/计划管理/工艺路线/Gy_RoutingBillCheckQuery.html">
                                            <!--<a lay-href="app/content/comment.html" class="layadmin-backlog-body">-->
                                            <h3>待审单据</h3>
                                            <p><cite>0</cite></p>
                                            <h3>工艺待审单据</h3>
                                            <p id="needCheckNumber"><cite>0</cite></p>
                                        </a>
                                    </li>
                                    <li class="layui-col-xs6">
@@ -288,6 +288,7 @@
                get_Display();
                get_Notices();
                getNeedCheckRouting();
            }
            //页面其它方法
@@ -449,6 +450,28 @@
                });
                layer.close(index);
            }
            function getNeedCheckRouting() {
                $.ajax({
                    url: GetWEBURL() + "/Gy_Routing/NeedChecklist",
                    type: "GET",
                    async: false,
                    data: { "user": sessionStorage["HUserName"], "userid": sessionStorage["Czybm"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            const uniqueHinterIDs = new Set(data1.data.map(item => item.hmainid));
                            const uniqueHinterIDCount = uniqueHinterIDs.size;
                            $("#needCheckNumber").text(uniqueHinterIDCount);
                            if (data1.data.length != 0) {
                                $("#needCheckNumber").css("color", "red");
                            }
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
        });
    </script>
</body>
WebTM/views/home/console_Mobile.html
@@ -107,9 +107,9 @@
                                        </li>
                                        <li class="layui-col-xs3">
                                            <a href="../仓存管理/条码库存/KF_ICInventoryByMaterID.html" target="main_self_frame">
                                            <a href="../WMS扫码模块/库存查询/KF_ICInventoryByCLD_PDA.html" target="main_self_frame">
                                                <i class="layui-icon layui-icon-find-fill"></i>
                                                <cite>库存查询</cite>
                                                <cite>ERP及时库存查询</cite>
                                            </a>
                                        </li>
                                        <li class="layui-col-xs3">
WebTM/views/index_Mobile.html
@@ -663,9 +663,9 @@
                          </a>
                      </dd>
                      <dd>
                          <a href="仓存管理/条码库存/KF_ICInventoryByMaterID.html" target="main_self_frame" style="color: aqua;">
                          <a href="WMS扫码模块/库存查询/KF_ICInventoryByCLD_PDA.html" target="main_self_frame" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              åº“存查询
                              ERP及时库存查询
                          </a>
                      </dd>
                      <dd>
WebTM/views/¹¤×ʹÜÀí/¹¤×ʱ¨±í/Pay_PayWorkShopSumReport.html
@@ -275,12 +275,12 @@
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-180'
                    , page: true
                    , height: 'full-80'
                    , page: false
                    , cellMinWidth: 90
                    , totalRow: true
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , limit: Number.MAX_VALUE
                    //, limits: [50, 500, 5000, 20000]
                    , done: function (res, curr, count) {
                        soulTable.render(this);
                    }
WebTM/views/¹¤×ʹÜÀí/¹¤×ʱ¨±í/Pay_PaymentDayCheckReport.html
@@ -324,12 +324,12 @@
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-180'
                    , page: true
                    , height: 'full-80'
                    , page: false
                    , cellMinWidth: 90
                    , totalRow: true
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , limit: Number.MAX_VALUE
                    //, limits: [50, 500, 5000, 20000]
                    , done: function (res, curr, count) {
                        soulTable.render(this);
                    }
WebTM/views/¹¤×ʹÜÀí/¹¤×ʱ¨±í/Pay_PaymentEntryReport.html
New file
@@ -0,0 +1,598 @@
<!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">
    <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>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <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>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <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">
                                    <label class="layui-form-label">生产车间</label>
                                    <div class="layui-input-block">
                                        <select name="HDeptID" id="HDeptID" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
                                            <!--动态渲染车间-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">班组<label style="color:red"></label></label>
                                    <div class="layui-input-inline">
                                        <input type="text" name="HGroupName" id="HGroupName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
                                        <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="0" style="float:left;width:150px;">
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" style="width:40px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                        </button>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">职员</label>
                                    <div class="layui-input-inline">
                                        <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="float:left;width:150px;" readonly>
                                        <input type="hidden" class="layui-input" name="HEmpID" id="HEmpID" value="0" style="float:left;width:150px;">
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                        </button>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" name="HBDate" id="HBDate" style="width:150px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" name="HEDate" id="HEDate" style="width:150px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , soulTable = layui.soulTable
            var ins;
            var sWhere = "";
            var option = [];
            var HModName = "Pay_PaymentEntryReport";
            var titleData = [];//不需要显示的字段 å¯æ‰©å±•
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            //初始化界面
            set_ClearBill();
            //#endregion
            //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });
            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                //清空过滤条件
                set_ClearQuery();
                get_FastQuery();
            });
            //#region é€‰æ‹©ç­ç»„按钮
            form.on('submit(HGroupList)', function () {
                get_checkGroup();
            });
            //#endregion
            //#region é€‰æ‹©èŒå‘˜
            form.on('submit(HEmpList)', function () {
                get_checkEmp()
            });
            //#endregion
            //#region å¤´å·¥å…·æ äº‹ä»¶
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);//获取选中行 æ•°æ®
                switch (obj.event) {
                    //列设置
                    case 'set_HideColumn':
                        get_HideColumn();
                        break;
                    case 'btn-reload':
                        get_FastQuery();
                        break;
                    //导出excel
                    case 'get_export':
                        get_Export();
                        break;
                    //退出
                    case 'btn-exit': Pub_Close(2);
                        break;
                    default:
                        break;
                }
            });
            //#endregion
            //#endregion
            //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
                get_Dept();
                //初始化表格
                set_InitGrid();
                $("#HBDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEDate").val(Format(new Date(), "yyyy-MM-dd"));
                //查询
                get_FastQuery(1);
            }
            //#endregion
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-80'
                    , page: true
                    , cellMinWidth: 90
                    , totalRow: true
                    , limit: 5000
                    , limits: [50, 500, 5000, 20000]
                    , done: function (res, curr, count) {
                        soulTable.render(this);
                    }
                    , cols: [[]]
                };
            }
            //生产车间
            function get_Dept() {
                //获取车间列
                var HDeptID = '<option value="0" style="color:red;" selected>全部车间</option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HDeptID += '<option  style="color:blue;"  value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
                            }
                            $("#HDeptID").append(HDeptID);
                            if (sessionStorage["HDeptID"] != "0") {
                                $("#HDeptID").val(sessionStorage["HDeptID"]);
                                //用户绑定的车间不存在,则默认显示全部车间
                                if ($("#HDeptID").val() == null || $("#HDeptID").val() == undefined) {
                                    $("#HDeptID").val(0);
                                }
                            }
                            //$("#HDeptName").val("0");
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {
                $("#HBDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//开始日期
                $("#HEDate").val(Format(new Date(), "yyyy-MM-dd"));//结束日期
                $("#HDeptID").val(0); //部门
                $("#HEmpID").val(0); //职员
                $("#HEmpName").val("");
                $("#HGroupID").val(0); //班组
                $("#HGroupName").val("");
                form.render('select');
                sWhere = "";
            }
            //#endregion
            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                var ajaxLoad = layer.load(0, { shade: false });
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Pay_PaymentEntryReport/list',
                    type: "GET",
                    data: { sWhere: sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];//列字段数据
                            var col = [];
                            var totalArray = [];
                            //给空的数组赋值
                            for (var key in data1.list) {//循序遍历数组
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//从每个对象中提取数据
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                            for (var i = 0; i < data.length; i++) {//遍历data数组重的数据
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {//检查data【i】.name是否在数组中  //计算列
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) { //计算列
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                } else if (data[i].name == '单据号') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号' });
                                } 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 == "行关闭日期" ? "行关闭人" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }
                            option.cols = [col]
                            option.data = data1.data;
                            table.render(option);
                            layer.close(ajaxLoad);
                            DisPlay_HideColumn();
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
                var HBDate = $("#HBDate").val();//开始时间
                var HEDate = $("#HEDate").val();//结束时间
                var HDeptID = $("#HDeptID").val();
                var HEmpID = $("#HEmpID").val();
                var HGroupID = $("#HGroupID").val();
                sWhere = "'" + HBDate + "','" + HEDate + "','" + HDeptID + "','" + HGroupID + "','" + HEmpID + "'";
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //#endregion
            //#region é€‰æ‹©èŒå‘˜
            function get_checkEmp() {
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '职员',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HEmpList', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HEmpID").val(checkStatus.data[0].HItemID);
                        $("#HEmpName").val(checkStatus.data[0].职员名称);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            }
            //#endregion
            //#region å¯¼å‡ºExecel
            function get_Export() {
                var ModRightNameCheck = "Pay_PaymentEntryReportExcel";
                //逻辑审核方法
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //方法所在页面和方法名
                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            var data = option.data
                            data.forEach((item) => {
                                for (let itemobj in item) {
                                    if (item[itemobj] == null) {
                                        item[itemobj] = "";
                                    }
                                    if (item[itemobj].length > 0) {  // å‡è®¾å­—段名为field
                                        item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                                    }
                                }
                            });
                            table.exportFile(ins.config.id, option.data, "xls");
                        } else {
                            layer.alert("当前模块没有导出权限!", { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //#region é€‰æ‹©ç­ç»„
            function get_checkGroup() {
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim"   //加上边框
                    , title: "班组列表"         //标题
                    , closeBtn: 1               //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2                  //弹出动画
                    , area: ["90%", "90%"]      //窗体大小
                    , maxmin: true              //设置最大最小按钮是否显示
                    , content: ['../../基础资料/工资基础资料/Gy_Group.html?Type=HGroup', '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("请选择一条数据");
                        }
                        $("#HGroupName").val(checkStatus.data[0].班组名称);
                        $("#HGroupID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //关闭弹窗  å®ƒèŽ·å–çš„å§‹ç»ˆæ˜¯æœ€æ–°å¼¹å‡ºçš„æŸä¸ªå±‚ï¼Œå€¼æ˜¯ç”±layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function () {
                    }
                })
            }
            //#endregion
            //#region éšè—åˆ—设置
            function get_HideColumn() {
                var colName = "";
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["field"] + ",";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "隐藏列设置"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["50%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: ['../../基础资料/隐藏列设置/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据
                        DisPlay_HideColumn();
                        //更新表格缓存的数据
                        layer.close(index);//关闭弹窗
                    }
                })
            }
            //#endregion
            //#region æ˜¾ç¤ºåˆ—数据
            function DisPlay_HideColumn() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    async: false,
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {
                            var dataCol = [];//数据库查询出的列数据
                            var newCols = [[]];//对应数据库列顺序col
                            newCols[0].push(option.cols[0][0]);//放入第一个checkbox
                            dataCol = data1.data[0].HGridString.split(',');
                            //列设置列数与页面列数是否一致
                            if (dataCol.length == option.cols[0].length - 1) {
                                //遍历寻找列设置对应列按顺序插入
                                for (var j = 0; j < option.cols[0].length - 1; j++) {
                                    for (var i = 0; i < option.cols[0].length - 1; i++) {
                                        var dataCols = dataCol[j].split('|');
                                        //选择与datacols相应列进行修改
                                        if (option.cols[0][i + 1]["field"] == dataCols[5]) {
                                            //隐藏列
                                            if (dataCols[1] == 1) {
                                                option.cols[0][i + 1]["hide"] = true;
                                            }
                                            //设置列宽
                                            if (dataCols[3] > 0) {
                                                option.cols[0][i + 1]["width"] = dataCols[3];
                                            }
                                            //设置内容字体大小
                                            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[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                                option.cols[0][i + 1]["hide"] = false;
                                            }
                                            //统计列
                                            if (dataCols[6] == 1) {
                                                option.cols[0][i + 1]["totalRow"] = true;
                                            }
                                            //字体所在位置(å·¦ å±…中 å³)
                                            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;
                                            }
                                            //设置表格title属性显示别名
                                            if (dataCols[4] != null && dataCols[4] != "") {
                                                option.cols[0][i + 1]["title"] = dataCols[4];
                                            }
                                            newCols[0].push(option.cols[0][i + 1]);
                                        }
                                    }
                                }
                                //遍历循环后判断对应列数是否一致
                                if (dataCol.length == newCols[0].length - 1) {
                                    option.cols = newCols;
                                    //取消冻结列
                                    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";
                                        }
                                    }
                                }
                            }
                            ins = table.render(option);
                        } else {
                            ins = table.render(option);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
            //#endregion
            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            //table.on('row(mainTable)', function (obj) {
            //    //选中行改变颜色
            //    var flag = !obj.tr.find(':checkbox:first').prop('checked');
            //    obj.tr.find(':checkbox').prop('checked', flag);
            //    if (flag) {
            //        obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
            //        $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
            //    } else {
            //        obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
            //        $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
            //    }
            //    //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据,前面的只是添加或删除选中未选中样式以及设置背景色,字体颜色
            //    layui.each(table.cache.mainTable, function (i, l) {
            //        if (obj.tr.index() == l.LAY_TABLE_INDEX) {
            //            l.LAY_CHECKED = flag;
            //        }
            //    });
            //})
            //#endregion
            //以上是layui模块
        });
        function GetHEmpListValue(obj) {  //返回职员
            $("#HEmpID").val(obj.HItemID);
            $("#HEmpName").val(obj.职员名称);
        }
        function GetHGroupValue(obj)  //返回班组
        {
            $("#HGroupName").val(obj[0].班组名称);
            $("#HGroupID").val(obj[0].HItemID);
        }
    </script>
</body>
</html>
WebTM/views/¹¤×ʹÜÀí/¹¤×ʱ¨±í/Pay_PaymentMonthSumReport.html
@@ -324,12 +324,12 @@
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-180'
                    , page: true
                    , height: 'full-80'
                    , page: false
                    , cellMinWidth: 90
                    , totalRow: true
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , limit: Number.MAX_VALUE
                    //, limits: [50, 500, 5000, 20000]
                    , done: function (res, curr, count) {
                        soulTable.render(this);
                    }
WebTM/views/¹¤×ʹÜÀí/¹¤×ʱ¨±í/Pay_PaymentPieceSumReport.html
@@ -227,12 +227,12 @@
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-180'
                    , page: true
                    , height: 'full-80'
                    , page: false
                    , cellMinWidth: 90
                    , totalRow: true
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , limit: Number.MAX_VALUE
                    //, limits: [50, 500, 5000, 20000]
                    , done: function (res, curr, count) {
                        soulTable.render(this);
                    }
WebTM/views/¹¤×ʹÜÀí/¹¤×ʱ¨±í/Pay_PaymentTimeSumReport.html
@@ -275,12 +275,12 @@
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-180'
                    , page: true
                    , height: 'full-80'
                    , page: false
                    , cellMinWidth: 90
                    , totalRow: true
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , limit: Number.MAX_VALUE
                    //, limits: [50, 500, 5000, 20000]
                    , done: function (res, curr, count) {
                        soulTable.render(this);
                    }
WebTM/views/¹¤×ʹÜÀí/¹¤×ʽáËãµ¥(¸öÈË)/Pay_SingleBalBillList.html
@@ -56,6 +56,18 @@
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">班组</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HGroupName" id="HGroupName">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">职员</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HEmpName" id="HEmpName">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
@@ -892,6 +904,8 @@
                $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//开始日期
                $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));;//结束日期
                $("#HBillNo").val("");//单据号
                $("#HGroupName").val("");
                $("#HEmpName").val("");
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
@@ -921,6 +935,8 @@
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
                var HGroupName = $("#HGroupName").val();//班组
                var HEmpName = $("#HEmpName").val();//职员
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
@@ -1004,6 +1020,12 @@
                if (HBillNo) {
                    sWhere += " and å•据号 like '%" + HBillNo + "%'";
                }
                if (HGroupName) {
                    sWhere += " and ç­ç»„ like '%" + HGroupName + "%'";
                }
                if (HEmpName) {
                    sWhere += " and èŒå‘˜åç§° like '%" + HEmpName + "%'";
                }
                get_DisplayPage(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
WebTM/views/¹¤×ʹÜÀí/¹¤×ʽáËãµ¥(¼¯Ìå)/Pay_GroupBalBillList.html
@@ -56,6 +56,18 @@
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">班组</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HGroupName" id="HGroupName">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">职员</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HEmpName" id="HEmpName">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
@@ -907,6 +919,8 @@
                $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//开始日期
                $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));;//结束日期
                $("#HBillNo").val("");//单据号
                $("#HGroupName").val("");
                $("#HEmpName").val("");
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
@@ -936,6 +950,8 @@
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
                var HGroupName = $("#HGroupName").val();//班组
                var HEmpName = $("#HEmpName").val();//职员
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
@@ -1019,6 +1035,12 @@
                if (HBillNo) {
                    sWhere += " and å•据号 like '%" + HBillNo + "%'";
                }
                if (HGroupName) {
                    sWhere += " and ç­ç»„ like '%" + HGroupName + "%'";
                }
                if (HEmpName) {
                    sWhere += " and èŒå‘˜åç§° like '%" + HEmpName + "%'";
                }
                get_DisplayPage(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_BarCodeBillList.html
@@ -321,7 +321,7 @@
                        $("#HSourceBillNo").val("");
                        $("#HMaterNumber").val("");
                        sWhere = "";
                        get_Display(sWhere);
                        get_DisplayPage(sWhere);
                        break;
                    //作废按钮
@@ -607,7 +607,8 @@
                            //do something
                            page = obj.curr;
                            size = obj.limit;
                            get_DisplayPage("");
                            // å‡è®¾æŒ‰é’®æœ‰ä¸€ä¸ªID为"myButton"
                            $("#btnSearch").trigger("click");
                        }
                    }
                }
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html
@@ -98,7 +98,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">工艺路线名称<label style="color:red"> * </label></label>
                                            <label class="layui-form-label" style="width: 90px;">工艺路线名称*</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HName" name="HName" id="HName">
                                            </div>
@@ -108,7 +108,7 @@
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">产品代码*</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                            <div class="layui-input-block" style="margin-left: 83px;">
                                                <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -133,7 +133,7 @@
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">计量单位*</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                            <div class="layui-input-block" style="margin-left: 83px;">
                                                <input type="text" class="layui-input" name="HUnitName" lay-verify="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnUnit" id="btnUnit" style="padding: 0 10px;float: right;margin-right: 3px;">
@@ -151,11 +151,19 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <div class="layui-input-block" style="margin-left: 96px;">
                                            <div class="layui-input-block" style="margin-left: 0px;">
                                                <input type="checkbox" name="checkboxHStandard" id="checkboxHStandard" lay-skin="primary" lay-filter="checkboxHStandard" checked title="是否默认工艺">
                                                <input type="hidden" value="true" name="HStandard" id="HStandard" lay-verify="HStandard">
                                                <!--<input type="checkbox" name="checkboxHUseFlag" id="checkboxHUseFlag" title="是否启用" lay-skin="primary" lay-filter="checkboxHUseFlag">
                                                <input type="hidden" value="false" name="HUseFlag" id="HUseFlag">-->
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">组织*</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
                                                    <!--动态渲染组织-->
                                                </select>
                                            </div>
                                        </div>
                                    </div>
@@ -173,13 +181,20 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">开始日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 80px;">
                                                <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 20px;">
                                            </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="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
                                            </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="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="请输入内容" onmouseover="this.title=this.value" style=" width: 500px;">
                                            </div>
                                        </div>
                                        <!--<div class="layui-inline">
@@ -248,26 +263,26 @@
                                        </div>-->
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                        <!--<div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">备注</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="请输入内容" onmouseover="this.title=this.value" style=" width: 500px;">
                                            </div>
                                        </div>
                                        </div>-->
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                        <!--<div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">组织*</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">-->
                                                    <!--动态渲染组织-->
                                                </select>
                                                <!--</select>
                                            </div>
                                        </div>
                                        </div>-->
                                    </div>
                                </div>
                            </div>
@@ -545,7 +560,7 @@
            //初始表格数据
            var rowdata = [{
                "HProcNo": "10", "HProcID_S": 0, "HProcType": "主工序", "HCenterID_S": 0, "HCenterID_SName": ""
                "HProcNo": "10", "HProcID_S": 0, "HProcType": "主工序", "HCenterID_S": 0, "HCenterID_SName": "","工序代码":""
                , "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
                , "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "工序": "","工段":""
                , "HProcID": 0, "工作中心代码": "", "HCenterID": 0, "工作中心": "", "HSupID": 0
@@ -573,12 +588,13 @@
                , limit: 500 //每页默认显示的数量
                , totalRow: true
                //, cellMinWidth: 120
                , height: 400
                , height: 450
                , cols: [[ //表头
                    { type: 'checkbox', totalRowText: '合计行' }
                    , { type: 'numbers', field: '序号', title: '序号', totalRow: true }
                    , { field: 'HProcNo', title: '流水号', edit: 'text' }
                     , { field: 'HProcID', title: '工序ID', hide: true }//, hide: true
                    , { field: 'HProcID', title: '工序ID', hide: true }//, hide: true
                    , { field: '工序代码', title: '工序代码'}
                    , { field: '工序', title: '工序', edit: 'text', event: "CheckHProcID" }//f7
                    , { field: 'HProcID_S', title: '工段ID', hide: true }//, hide: true
                    , { field: '工段', title: '工段', edit: 'text', event: "CheckHProcMulID" }//f7
@@ -1827,6 +1843,7 @@
                                        var j = 0;
                                        for (var i = (NowNum - 1); i < option.data.length; i++) {
                                            option.data[i]["工序"] = WorkCente[j]["工序名称"];
                                            option.data[i]["工序代码"] = ProcessNumber[j].substring(1, ProcessNumber[j].length - 1);
                                            option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
                                            option.data[i]["工作中心"] = WorkCente[j]["工作中心名称"];
                                            option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
@@ -1839,7 +1856,7 @@
                                        //在下方添加新的表格数据
                                        for (var i = 0; i < num; i++) {
                                            option.data.push({
                                                "HProcNo": (table.cache["mainTable"].length + i + 1) * 10, "HProcID_S": 0, "HProcType": "主工序", "HCenterID_S": 0, "HCenterID_SName": ""
                                                "HProcNo": (table.cache["mainTable"].length + i + 1) * 10, "HProcID_S": 0, "HProcType": "主工序", "HCenterID_S": 0, "HCenterID_SName": "", "工序代码": ProcessNumber[j].substring(1, ProcessNumber[j].length - 1)
                                                , "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
                                                , "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "工序": WorkCente[j]["工序名称"]
                                                , "HProcID": WorkCente[j]["HProcID"], "工作中心代码": WorkCente[j]["工作中心代码"], "HCenterID": WorkCente[j]["HCenterID"], "工作中心": WorkCente[j]["工作中心名称"], "HSupID": 0
@@ -1863,6 +1880,7 @@
                                        var j = 0;
                                        for (var i = (NowNum - 1); i < (NowNum - 1) + ProcessNumber.length; i++) {
                                            option.data[i]["工序"] = WorkCente[j]["工序名称"];
                                            option.data[i]["工序代码"] = ProcessNumber[j].substring(1, ProcessNumber[j].length - 1);
                                            option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
                                            option.data[i]["工作中心"] = WorkCente[j]["工作中心名称"];
                                            option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
@@ -1894,6 +1912,7 @@
                                        //更新表格缓存的数据
                                        obj.update({
                                            "工序": OptionData[0].工序名称
                                            , "工序代码": OptionData[0].工序代码
                                            , "HProcID": OptionData[0].HItemID
                                            , "工作中心": OptionData[0].工作中心
                                            , "HCenterID": OptionData[0].HWorkCenterID
@@ -2283,7 +2302,7 @@
                        for (var i = 0; i < d.data.length; i++) {
                            rowdata.push(
                                {
                                    "HProcNo": d.data[i].工序号, "HProcID_S": d.data[i].工段, "HProcType": d.data[i].工序类型, "HCenterID_S": d.data[i].HCenterID_S, "HCenterID_SName": d.data[i].产线中心
                                    "HProcNo": d.data[i].工序号, "HProcID_S": d.data[i].工段, "HProcType": d.data[i].工序类型, "HCenterID_S": d.data[i].HCenterID_S, "HCenterID_SName": d.data[i].产线中心, "工序代码": d.data[i].工序代码
                                    , "HWorkQty_S": d.data[i].产线产能, "HSubStdEmpQty_S": d.data[i].产线人数, "HMouldNo": d.data[i].模具编号, "HChangeMould": d.data[i].换模时间, "HPackStd": d.data[i].周转箱标准
                                    , "HPack": d.data[i].周转箱, "HPutArea": d.data[i].暂放区, "HMyWorkDays": d.data[i].生产周期, "HMyFixWorkDays": d.data[i].固定生产天数, "工序": d.data[i].工序, "工段": d.data[i].工段名称
                                    , "HProcID": d.data[i].HProcID, "工作中心代码": d.data[i].工作中心代码, "HCenterID": d.data[i].HCenterID, "工作中心": d.data[i].工作中心名称, "HSupID": d.data[i].HSupID
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillCheckQuery.html
@@ -88,12 +88,12 @@
                        <h1 style="text-align:center;margin-bottom:7px;margin-top:7px;"><b>工艺路线查询</b></h1>
                        <div class="layui-tab layui-tab-card" lay-filter="table">
                            <ul class="layui-tab-title">
                                <li class="layui-this">我创建的</li>
                                <li>需要我审核的</li>
                                <li>我创建的</li>
                                <li class="layui-this">需要我审核的</li>
                                <li>我已审核的</li>
                            </ul>
                            <div class="layui-tab-content" style="">
                                <div class="layui-tab-item layui-show">
                                <div class="layui-tab-item ">
                                    <script type="text/html" id="toolbarDemoSend">
                                        <div class="layui-btn-container">
                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
@@ -108,7 +108,7 @@
                                    </script>
                                    <table class="" id="mainTableSend" lay-filter="mainTableSend"></table>
                                </div>
                                <div class="layui-tab-item ">
                                <div class="layui-tab-item  layui-show">
                                    <script type="text/html" id="toolbarDemoNeedCheck">
                                        <div class="layui-btn-container">
                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
@@ -176,7 +176,7 @@
            //初始化表格
            set_InitGrid();
            //查询
            get_Display(1);
            get_Display(2);
            //get_Display(2);
            //get_Display(3);
            //#endregion
@@ -493,7 +493,7 @@
                var url = "";
                var user = sessionStorage["HUserName"];
                if (type == 1) {
                    var sWhere = "and åˆ¶å•人 = '" + user + "'"
                    var sWhere = "and åˆ¶å•人 = '" + user + "'" + " and å·¥åºä»£ç  != '9999' and HBillSubType<>'SUB'" + "and å®¡æ ¸äºº = ''"
                    url = '/LEMS/MES_Gy_RoutingBillList_Json';
                    userData = { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3301" };
                    
@@ -609,7 +609,7 @@
                                option = optionNeedCheck;
                            }
                            else if (type == 3) {
                                optionChecked.data = data1.data;
                                optionChecked.data = data1.data.slice(0, 1000);//获取前1000
                                //设置列表同一个单据只有第一条数据显示主表信息,其它记录只显示子表信息
                                //获取子表列数据
                                var colList = [];
WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Mes_OrderProcFlowAllReport_ICMO.html
@@ -50,12 +50,12 @@
                                        </button>
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                <div class="layui-inline">
                                    <label class="layui-form-label">部门名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" id="txtHDeptName" style="width:190px;">
                                    </div>
                                </div>-->
                                </div>
                                <div class="layui-inline">
                                    <div class="layui-input-block">
                                        <input type="checkbox" name="chkHShowUnFinish" id="chkHShowUnFinish" lay-skin="primary" lay-filter="chkHShowUnFinish" title="只显示未完工">
@@ -323,7 +323,7 @@
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }
                sWhere = "'" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" ;
                sWhere = "'" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" + ",'" + txtHDeptName + "'" ;
                get_Display(sWhere);
                //调用接口后清空sWhere缓存
                sWhere = "";