yusijie
2024-12-24 312af946504a6aad9ca5738e4570703e68fbe546
齐套分析报表添加列设置,过滤条件,
4个文件已修改
1个文件已添加
605 ■■■■■ 已修改文件
WebTM/WebTM.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/通用基础资料/Gy_CommonBaseDataCheck.html 228 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/日计划报表/ReportMOMaterReadysBillList.html 366 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm_TK.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -445,6 +445,7 @@
    <Content Include="views\基础资料\生产基础资料\Gy_WorkShiftList.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_WorkShiftEdit.html" />
    <Content Include="views\基础资料\通用基础资料\Gy_CommonBaseData.html" />
    <Content Include="views\基础资料\通用基础资料\Gy_CommonBaseDataCheck.html" />
    <Content Include="views\基础资料\通用基础资料\Gy_GeneralLookDown.html" />
    <Content Include="views\基础资料\隐藏列设置\Gy_GridView_Hide_New.html" />
    <Content Include="views\工资管理\定额申请\Pay_ProcPriceRequestBillCheckQuery.html" />
WebTM/layuiadmin/Scripts/webConfig.js
@@ -9,7 +9,7 @@
    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/"; */  //余思杰本地配置
    var WEBURL = "http://localhost:8082/LuBaoAPI/";  //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //奥邦
    //var WEBURL = "http://10.1.4.155/API/";            //江丰客户NEW
WebTM/views/»ù´¡×ÊÁÏ/ͨÓûù´¡×ÊÁÏ/Gy_CommonBaseDataCheck.html
New file
@@ -0,0 +1,228 @@
<!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">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></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>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <style>
        /* å½“鼠标悬浮在表格的奇数行上时改变背景色 */
        .layui-table tbody tr:nth-child(odd):hover {
            background-color: #ceedfa; /* æ›´æ”¹ä¸ºä½ æƒ³è¦çš„颜色 */
        }
        /* å½“鼠标悬浮在表格的偶数行上时改变背景色 */
        .layui-table tbody tr:nth-child(even):hover {
            background-color: #ceedfa; /* æ›´æ”¹ä¸ºä½ æƒ³è¦çš„颜色 */
        }
    </style>
</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>-->
                        <!--</div>
                        </div>-->
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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
            var option = [];
            var sWhere = "";
            //#endregion
            //#region è§¦å‘事件
            //#region ç‚¹å‡»è¿”回行的数据
            table.on('RowDouble(mainTable)', function (obj) {
                parent.childData = obj.data;
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            })
            //#endregion
            //#endregion
            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„æ–¹æ³•
            //#region åˆå§‹åŒ–界面
            function set_ClearBill(sql,tableView) {
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sql, tableView);
            }
            //#endregion
            //#region åˆå§‹åŒ–表格方法
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    //, toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , cellMinWidth: 90
                    //, page: true
                    , limit: 10
                    , limits: [5, 10, 15, 20]
                    //, totalRow: true
                    , cols: [[
                        { field: '代码', title: '代码', width: 150, sort: true }
                        , { field: '名称', title: '名称', width: 150, sort: true }
                    ]]
                    , data: []
                    , done: function (res, curr, count) {
                        // è®¾ç½®è¡Œæ ·å¼
                        var style = 'background-color: #ceedfa;'; // æŒ‡å®šçš„背景色
                        // å‡è®¾æˆ‘们要设置第三行的背景色
                        var targetIndex = rowIndex; // è¡Œå·ç´¢å¼•,从0开始计数
                        $('tr[data-index=' + targetIndex + ']').attr('style', style);
                        //设置滚动条位置
                        if (option.data.length > 0) {
                            // è¡¨æ ¼æ¸²æŸ“完毕后的回调
                            var parentObject = document.getElementById('mainTable').nextElementSibling.childNodes[0].childNodes[1].childNodes[0].childNodes[0];
                            if (parentObject.childNodes.length > 0) {
                                var rowObject = parentObject.childNodes[0];
                                var rowHeight = rowObject.offsetHeight; // èŽ·å–è¡Œé«˜
                                var rowPosition = rowHeight * rowIndex;
                                $('.layui-table-body').scrollTop(rowPosition);
                            }
                        }
                    }
                };
            }
            //#endregion
            //#region æŸ¥è¯¢
            function get_Display(sql, tableView) {
                $.ajax({
                    url: GetWEBURL() + '/Gy_GetBaseData/Gy_GetBaseData',
                    type: "GET",
                    data: { "sql": sql, "tableView": tableView, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //判断是否是纯英文
                            var patrn = new RegExp("[\u4E00-\u9FA5]+");
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                if (!patrn.test(data[i].name)) {
                                    col.push({ field: data[i].name, title: data[i].name, hide: true }); //隐藏列
                                }
                                else {
                                    switch (data[i].Type) {
                                        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: 120 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                    }
                                }
                            }
                            option.cols = [col];
                            option.data = data1.data;
                            table.render(option);
                        } else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //#endregion
            //#region ä¸ºwindow对象声明并定义getData方法,用于通过window对象调用layui.use内部定义的方法
            //#region æ ¹æ®çˆ¶é¡µé¢ä¼ é€’的参数,查询数据并渲染表格
            window.getData = function (sql,tableView) {
                set_ClearBill(sql, tableView);
            }
            //#endregion
            //#region æ ¹æ®çˆ¶é¡µé¢ä¼ é€’的索引,渲染行背景,实现选中功能
            window.setSelectedRow = function (currRowIndex) {
                rowIndex += currRowIndex;
                if (rowIndex >= option.data.length) {
                    rowIndex = option.data.length - 1;
                    parent.currRowIndex = rowIndex + 1;
                } else if (rowIndex < -1) {
                    rowIndex = -1;
                    parent.currRowIndex = rowIndex + 1;
                }
                table.render(option);
                rowIndex = -1;
            }
            //#endregion
            //#region æ ¹æ®çˆ¶é¡µé¢ä¼ é€’的索引,返回选中行数据到父页面
            window.getSelectedData = function (currRowIndex) {
                parent.childData = option.data[currRowIndex - 1];
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            }
            //#endregion
            //#endregion
        });
            //#endregion
            //以上是layui模块
        //#region æ–‡æœ¬æ¡†è¾“入搜索相关数据-变量
        parent.childPage = window;                                                      //子窗口对象 èµ‹ç»™ çˆ¶çª—口
        var rowIndex = -1;                                                               //用于定位 å½“前选中的数据的位置
        //#endregion
    </script>
</body>
</html>
WebTM/views/Éú²ú¹ÜÀí/Èռƻ®±¨±í/ReportMOMaterReadysBillList.html
@@ -27,14 +27,6 @@
                                    </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: 185px;">
                                        <select name="HORGID" id="HORGID" lay-verify="HORGID">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                                <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;">
                                        <input type="hidden" class="layui-input" lay-verify="HMATERIALID" name="HMATERIALID" id="HMATERIALID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -48,17 +40,38 @@
                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">生产车间</label>
                                    <div class="layui-input-block" style="margin-left: 77px;">
                                        <input type="hidden" class="layui-input" lay-verify="HDeptID" name="HDeptID" id="HDeptID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                        <input type="text" class="layui-input" lay-verify="DeptNAME" name="DeptNAME" id="DeptNAME" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                        <input type="text" class="layui-input" lay-verify="DeptNAME" name="DeptNAME" id="DeptNAME" value="" style="width: 60%;display: inline-block;">
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID" style="padding: 0 10px;float: right;margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    </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="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 58px;width:160px;">
                                    </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: 58px;width:160px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">查询</button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">重置</button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnExport" id="btnExport">导出</button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="bthHideColumn" id="bthHideColumn">列设置</button>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin: 10px 0 10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">组织</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                                <select name="HORGID" id="HORGID" lay-verify="HORGID">
                                                    <!--动态渲染组织-->
                                                </select>
                                            </div>
                                        </div>
                                        <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;">
@@ -79,6 +92,12 @@
                                            <label class="layui-form-label" style="width: 85px;">生产订单号</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMOBILLNO" id="HMOBILLNO">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">物料属性</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterAtt" id="HMaterAtt">
                                            </div>
                                        </div>
                                        <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
@@ -181,10 +200,17 @@
    var treeCkData = { id: 0 };
    var TagId = "";
    var TagParentId = "";
    //#region æ–‡æœ¬æ¡†è¾“入搜索相关数据-变量
    var childPage = null;                       //获取子窗口对象,用于操作子窗口的变量和方法
    var currRowIndex = 0;                       //用于定位子窗口当前选中的行
    var childData = null;                       //用于获取子窗口返回的数据
    //#endregion
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index', //主入口模块
        index: 'lib/index', //主入口模块
    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util','soulTable'], function () {
        //#region å…¬ç”¨å˜é‡
        var $ = layui.$
@@ -202,6 +228,8 @@
        var sWhere = "";
        var option = [];
        var ins;                        //用于导出excel
        var HModName = "ReportMOMaterReadysBillList";
        var titleData = [];
        //#endregion
        //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -249,12 +277,146 @@
        });
        //#endregion
        //#region åˆ—设置按钮
        form.on('submit(bthHideColumn)', function (data) {
            get_HideColumn();
        });
        //#endregion
        //#region æ–‡æœ¬æ¡†ç›‘听
        $(document).ready(function () {
            //#region æ ¹æ®ç‰©æ–™ä»£ç èŽ·å–ç‰©æ–™åŸºç¡€èµ„æ–™ç­›é€‰å¼¹çª—
            //根据元素ID对元素进行监听=============================================================================
            $("#DeptNAME").on('keydown', function (data) {
                //================================================================================================
                var errKeys = ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"];
                if ($.inArray(event.key, errKeys) == -1) {              //如果按下的键位不是 æ–¹å‘键,则刷新弹窗中的数据
                    if (childPage == null) {                            //判断当前子窗口是否已经打开,若未打卡,则打开页面,并获取子窗口的对象
                        var offset = $(this).offset();                  //获取触发事件的元素的位置,用于定位子窗口打开的位置
                        var innerHeight = window.innerHeight;
                        var top = offset.top + 0.05 * innerHeight;
                        var left = offset.left;
                        if (top + 0.05 * innerHeight + 0.3 * innerHeight > innerHeight) {
                            top = top - 0.3 * innerHeight - 0.05 * innerHeight;
                        }
                        layer.open({
                            type: 2                                                                                     //弹窗类型
                            , skin: 'layui-layer-rim'                                                                   //加上边框
                            , area: ['25%', '30%']                                                                      //大小
                            , shadeClose: true                                                                          //点击遮罩时关闭弹窗
                            , offset: [top, left]
                            , title: false                                                                              //不显示标题栏
                            //, title: '项目费用列表'                                                                     //标题
                            , shift: 2                                                                                  //弹出动画
                            , closeBtn: 0                                                                               //禁用关闭按钮
                            , content: ["../../基础资料/通用基础资料/Gy_CommonBaseDataCheck.html?OperationType=2", "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('请选择数据');
                                }
                                var HIDValue = "";
                                var HNameValue = "";
                                for (var i = 0; i < checkStatus.data.length; i++) {
                                    HIDValue += checkStatus.data[i].HItemID + ",";
                                    HNameValue += checkStatus.data[i].部门名称 + ",";
                                }
                                //去除末尾逗号
                                HIDValue = HIDValue.substring(0, HIDValue.length - 1);
                                HNameValue = HNameValue.substring(0, HNameValue.length - 1);
                                $("#HDeptID").val(HIDValue);
                                $("#DeptNAME").val(HNameValue);
                                //获取数据
                                layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                            }
                            , btn2: function (index, layero) { }
                            , success: function (layero, index) {
                                setTimeout(function () {
                                    //修改,根据文本框数据,编写查询语句================================================================================================
                                    var value = $("#DeptNAME").val().replace(/'/g, "");                                  //获取文本框最新值
                                    currRowIndex = 0;
                                    var tableView = "h_v_Gy_DepartmentList";
                                    var childSWhere = "select top(10) HItemID,部门代码,部门名称 from " + tableView + " where 1=1 and ç»„织名称 = '" + sessionStorage["Organization"] + "' and (部门代码 like '%" + value + "%' or éƒ¨é—¨åç§° like '%" + value + "%') order by éƒ¨é—¨ä»£ç  desc";
                                    childPage.getData(childSWhere, tableView);
                                    //===================================================================================================================================
                                }, 200);
                            }
                            , end: function () {
                                childPage = null;
                                currRowIndex = 0;
                                if (childData != null) {
                                    //根据弹窗返回数据设置文本框数据=================================================================================================
                                    //获取数据
                                    $("#HDeptID").val(childData.HItemID);//车间id
                                    $("#DeptNAME").val(childData.部门名称);//车间名称
                                    //===============================================================================================================================
                                    childData = null;
                                }
                            }
                        });
                    } else {
                        setTimeout(function () {
                            //修改,根据文本框数据,编写查询语句================================================================================================
                            var value = $("#DeptNAME").val().replace(/'/g, "");                                  //获取文本框最新值
                            currRowIndex = 0;
                            var tableView = "h_v_Gy_DepartmentList";
                            var childSWhere = "select top(10) HItemID,部门代码,部门名称 from " + tableView + " where 1=1 and ç»„织名称 = '" + sessionStorage["Organization"] + "' and (部门代码 like '%" + value + "%' or éƒ¨é—¨åç§° like '%" + value + "%') order by éƒ¨é—¨ä»£ç  desc";
                            childPage.getData(childSWhere, tableView);
                            //=================================================================================================================================
                        }, 200);
                    }
                } else {                                                    //如果按下的键位是 æ–¹å‘键,则调整窗口中 é€‰ä¸­è¡Œ çš„位置
                    if (event.key == "ArrowUp") {
                        currRowIndex--;
                        childPage.setSelectedRow(currRowIndex);
                    } else if (event.key == "ArrowDown") {
                        currRowIndex++;
                        childPage.setSelectedRow(currRowIndex);
                    } else if (event.key == "Enter") {
                        //手动失焦
                        var element = document.getElementById("HMaterNumber");
                        element.blur();
                        childPage.getSelectedData(currRowIndex);
                        if (childData != null) {
                            //根据弹窗返回数据设置文本框数据=================================================================================================
                            //获取数据
                            $("#HDeptID").val(childData.HItemID);//车间id
                            $("#DeptNAME").val(childData.部门名称);//车间名称
                            //===============================================================================================================================
                            childData = null;
                        }
                        childPage = null;
                        currRowIndex = 0;
                        childData = null;
                    }
                }
            });
            //#endregion
        });
        //#endregion
        //#endregion
        //#region æœ¬é¡µé¢è¢«è°ƒç”¨çš„æ‰€æœ‰æ–¹æ³•
        //#region åˆå§‹åŒ–界面
        function set_ClearBill() {
            //初始化日期
            $("#HBeginDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//提料日期
            $("#HEndDate").val(Format(new Date($("#HBeginDate").val()).setDate(new Date($("#HBeginDate").val()).getDate() + 7), "yyyy-MM-dd"));//至
            //生产组织加载
            Organ();
            //初始化表格
@@ -269,9 +431,10 @@
        function set_InitGrid() {
            option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                , toolbar: '#toolbarDemo'
                , id: 'mainTable'
                , height: 'full-50'
                , page: true
                , page: false
                , cellMinWidth: 90
                , totalRow: true
                , limit: 1000
@@ -297,6 +460,7 @@
                    , { field: '物料编码', title: '物料编码', sort: true }
                    , { field: '物料名称', title: '物料名称', sort: true }
                    , { field: '物料规格型号', title: '物料规格型号', sort: true }
                    , { field: '物料属性', title: '物料属性', sort: true }
                    , { field: '计划发料数量', title: '计划发料数量', sort: true, totalRow: true }
                    , { field: '齐套数量', title: '齐套数量', sort: true, totalRow: true}
                    , { field: '缺料数量', title: '缺料数量', sort: true, totalRow: true }
@@ -343,6 +507,9 @@
                    if (result.count == 1) {
                        option.data = result.data;
                        table.render(option);
                        //刷新表格数据
                        DisPlay_HideColumn();
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
@@ -367,7 +534,10 @@
            var HSCZYID = $("#HSCZYID").val();//生产资源
            var HXQD = $("#HXQD").val();//需求单号
            var HMOBILLNO = $("#HMOBILLNO").val();//生产订单号
            var HBeginDate = $("#HBeginDate").val();//提料日期
            var HEndDate = $("#HEndDate").val();//至
            var HMaterAtt = $("#HMaterAtt").val();//物料属性
            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
            var ColContent = $("#ColContent").val();
@@ -442,6 +612,16 @@
                }
                sWhere += " and " + ColName2 + " " + com2;
            }
            if (HBeginDate > HEndDate) {
                layer.close(ajaxLoad);
                return layer.msg("开始日期不能小于结束日期!");
            }
            if (HBeginDate != null && HEndDate != null) {
                sWhere += " and HDate between ''" + HBeginDate + "'' and ''" + HEndDate + "'' ";
            }
            sWhere = {
                HORGID: HORGID
                , HMATERIALID: HMATERIALID
@@ -449,8 +629,11 @@
                , HSCZYID: HSCZYID
                , HXQD: HXQD
                , HMOBILLNO: HMOBILLNO
                , HBeginDate: HBeginDate
                , HEndDate: HEndDate
                , HMaterAtt: HMaterAtt
            }
            $.ajax({
                url: GetWEBURL() + '/JIT_Complete/ReportMOMaterReadysBillList',
                type: "GET",
@@ -460,6 +643,10 @@
                        data = result.data;
                        option.data = data;
                        //刷新表格数据
                        DisPlay_HideColumn();
                        ins = table.render(option);
                        data.forEach((item) => {
@@ -504,6 +691,9 @@
            var HSCZYID = $("#HSCZYID").val();//生产资源
            var HXQD = $("#HXQD").val();//需求单号
            var HMOBILLNO = $("#HMOBILLNO").val();//生产订单号
            var HBeginDate = $("#HBeginDate").val();//提料日期
            var HEndDate = $("#HEndDate").val();//至
            var HMaterAtt = $("#HMaterAtt").val();//物料属性
            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
@@ -579,6 +769,15 @@
                }
                sWhere += " and " + ColName2 + " " + com2;
            }
            if (HBeginDate > HEndDate) {
                return layer.msg("开始日期不能小于结束日期!");
            }
            if (HBeginDate != null && HEndDate != null) {
                sWhere += " and HDate between ''" + HBeginDate + "'' and ''" + HEndDate + "'' ";
            }
            sWhere = {
                HORGID: HORGID
                , HMATERIALID: HMATERIALID
@@ -586,6 +785,9 @@
                , HSCZYID: HSCZYID
                , HXQD: HXQD
                , HMOBILLNO: HMOBILLNO
                , HBeginDate: HBeginDate
                , HEndDate: HEndDate
                , HMaterAtt: HMaterAtt
            }
            get_Display(JSON.stringify(sWhere));
            sWhere = "";//调用接口后清空sWhere缓存
@@ -612,6 +814,9 @@
            $("#ColContent2").val("");
            $("#ColName2").val("0");
            $("#Comparator2").val("0");
            $("#HBeginDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//提料日期
            $("#HEndDate").val(Format(new Date($("#HBeginDate").val()).setDate(new Date($("#HBeginDate").val()).getDate() + 7), "yyyy-MM-dd"));//至
            $("#HMaterAtt").val("");
            form.render('select');
            sWhere = "";
        }
@@ -709,6 +914,139 @@
            form.render('select');
        }
        //#region éšè—åˆ—设置
        function get_HideColumn() {
            var colName = "";
            var contentUrl = "";
            for (var i = 1; i < option.cols[0].length; i++) {
                colName += option.cols[0][i]["field"] + ",";
            }
            var urlStr = window.document.location.pathname;//获取文件路径
            var urlLen = urlStr.split('/');
            for (var i = 0; i < urlLen.length - 4; i++) {
                contentUrl += "../";
            }
            colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
            contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;
            layer.open({
                type: 2
                , skin: "layui-layer-rim" //加上边框
                , title: "隐藏列设置"  //标题
                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                , shift: 2 //弹出动画
                , area: ["50%", "90%"] //窗体大小
                , maxmin: true //设置最大最小按钮是否显示
                , content: [contentUrl, "yes"]
                , btn: ["确定", "取消"]
                , btn1: function (index, laero) {
                    //刷新表格数据
                    DisPlay_HideColumn();
                    //更新表格缓存的数据
                    layer.close(index);//关闭弹窗
                }
            })
        }
        //#endregion
        //#region æ˜¾ç¤ºåˆ—数据
        function DisPlay_HideColumn() {
            $.ajax({
                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                type: "GET",
                data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.data.length != 0) {
                        titleData = [];
                        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";
                                    }
                                }
                            }
                        }
                        table.render(option);
                    } else {
                        table.render(option);
                    }
                }, error: function () {
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            })
        }
            //#endregion
        //#endregion
        //以上是layui模块
    });
WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/JIT_DayPlanPlatForm_TK.html
@@ -12,6 +12,7 @@
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/modules//tableFilter2.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -347,7 +348,8 @@
            , laydate = layui.laydate
            , excel = layui.excel
            , soulTable = layui.soulTable
            , element = layui.element;
            , element = layui.element
            , tableFilter = layui.tableFilter;
        var ins;
        var sWhere = "";
        var sWhere_ICMO = "";
@@ -1133,7 +1135,7 @@
                    //for (var i = 0; i < HBackgroundColorIndex.length;i++) {
                    //    $("tr[data-index='" + i + "']").attr({ "style": "background:#F74848;color:black;" });
                    //}
                    //}
                }
            }
        }
@@ -1176,8 +1178,10 @@
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        ins = table.render(option);
                        var HinterID_S = [];
                        for (var i = 0; i < data1.data.length; i++) {
                            HinterID_S.push(data1.data[i]["hmainid"]);