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

yangle

2024-01-31 54ddbb9eba145dfdcee0c3d28bdd1a91aec34122

 WebTM/views/Éú²ú¹ÜÀí/Èռƻ®±¨±í/MaterialShorAnalysisReport.html

@@ -51,7 +51,7 @@
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">重置</button>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;">
                                       

                                    </div>
                                </div>
                            </div>
@@ -128,6 +128,11 @@
        });
        //#endregion

        //双击表格事件
        table.on('rowDouble(mainTable)', function (obj) {
            btnrowDouble(obj.data);
        })

        //#endregion

        //#region æœ¬é¡µé¢è¢«è°ƒç”¨çš„所有方法
@@ -151,13 +156,13 @@
        function set_InitGrid() {
            var columns = [];

            columns.push({ type: 'checkbox', fixed: 'left' });
            columns.push({ field: 'HOrgName', title: '采购组织', sort: true});
            columns.push({ field: 'FNUMBER', title: '物料编码', sort: true});
            columns.push({ field: 'HMaterName', title: '物料名称', sort: true});
            columns.push({ field: 'HMaterModel', title: '物料规格', sort: true});
            columns.push({ field: 'CountHQty', title: '合计', sort: true});
            columns.push({ field: 'FBASEQTY', title: '即时库存数量', sort: true});
            columns.push({ field: 'HOrgName', title: '采购组织', sort: true });
            columns.push({ field: 'FNUMBER', title: '物料编码', sort: true });
            columns.push({ field: 'HMaterName', title: '物料名称', sort: true });
            columns.push({ field: 'HMaterModel', title: '物料规格', sort: true });
            columns.push({ field: '在途数量', title: '在途数量' });
            columns.push({ field: 'CountHQty', title: '合计', sort: true });
            columns.push({ field: 'FBASEQTY', title: '即时库存数量', sort: true });
            //获取两个月期之间的相差
            var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//开始时间
            var time2 = Date.parse(new Date($("#HENDDATE").val()));//结束时间
@@ -211,7 +216,7 @@
                                if (NumCount > parseFloat(item[dateNowTime])) {
                                    NumCount -= parseFloat(item[dateNowTime]);
                                } else {
                                    var num = 6;//即时库存与日期挨着  ä»Žå³æ—¶åº“存开始算
                                    var num = 7;//即时库存与日期挨着  ä»Žå³æ—¶åº“存开始算
                                    tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']");
                                    rq = tr.children()[num + 1 + i];
                                    rq.style.color = '#f66161';//然后变色
@@ -227,6 +232,21 @@
        }
        //#endregion

        //双击跳转齐套分析明细表
        function btnrowDouble(obj) {

            var HMaterID = obj["物料ID"];

            layer.open({
                type: 2 //类型
                , skin: 'layui-layer-rim'//加上边框
                , maxmin: true //设置最大最小按钮是否显示
                , area: ['90%', '90%']//大小
                , title: '齐套物料分析明细表'//标题
                , shift: 2//弹出动画
                , content: ['../../生产管理/齐套分析/JIT_CompleteMaterlDetailList.html?OperationType=1&HMaterID=' + HMaterID, 'yes']
            })
        }

        //获取组织
        function Organ() {