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

zrg

2024-08-30 d9aa433581af4504e10da176bc3eecd7abf27707

 WebTM/views/Ó¦ÊÕ¹ÜÀí/±¨±í·ÖÎö/Xs_SeOrderBarCodeInAndOutStockDetailReport.html

@@ -35,40 +35,75 @@
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">销售订单号</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                    <div class="layui-input-block" style="margin-left: 120px;width:130px;">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HSeOrderBillNo" id="HSeOrderBillNo">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">是否出库</label>
                                </div>
                                <div class="layui-inline">
                                    <select name="HIsOutStock" id="HIsOutStock" class="ForFilteringSchemes" lay-filter="HIsOutStock">
                                        <option value="" selected="selected" style="width:10px;"></option>
                                        <option value="是" style="width:10px;">是</option>
                                        <option value="否" style="width:10px;">否</option>
                                    </select>
                                </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 class="layui-inline">
                                    <label class="layui-form-label">入库件数</label>
                                    <div class="layui-input-block" style="margin-left: 120px;width:60px;">
                                        <input type="text" class="layui-input" name="SumHPieceQty_inStock" id="SumHPieceQty_inStock" disabled="disabled">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">入库米数</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 100px;">
                                        <input type="text" class="layui-input" name="SumHQty_inStock" id="SumHQty_inStock" disabled="disabled">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">出库件数</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 60px;">
                                        <input type="text" class="layui-input" name="SumHPieceQty_outStock" id="SumHPieceQty_outStock" disabled="disabled">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">出库米数</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 100px;">
                                        <input type="text" class="layui-input" name="SumHQty_outStock" id="SumHQty_outStock" disabled="disabled">
                                    </div>
                                </div>

                                <!--显示当前过滤方案-->
                                <div class="layui-inline" style="margin-left:5px;">
                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
                                </div>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <!--<div class="layui-row" style="margin-top:10px;">-->
                                        <!--其他条件-->
                                        <!--<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 ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
                                            </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 ForFilteringSchemes" name="HProductName" id="HProductName">
                                            </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 ForFilteringSchemes" name="HProductModel" id="HProductModel">
                                            </div>
                                        </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 ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
                </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 ForFilteringSchemes" name="HProductName" id="HProductName">
                </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 ForFilteringSchemes" name="HProductModel" id="HProductModel">
                </div>
            </div>
        </div>-->

                                    <div class="layui-row" style="margin:10px 0px">
                                        <div class="layui-inline">
@@ -127,32 +162,32 @@
                                    </div>

                                    <!--<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>-->
            <div class="layui-inline">
                <label class="layui-form-label">过滤</label>
                <div class="layui-input-block">
                    <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                    </select>
                </div>
            </div>
            <div class="layui-inline">
                <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
                    <option value="0" selected="selected"></option>
                    <option value="=">=</option>
                    <option value=">=">>=</option>
                    <option value=">">></option>
                    <option value="<="><=</option>
                    <option value="<"><</option>
                    <option value="<>"><></option>
                    <option value="7">包含</option>
                    <option value="8">左包含</option>
                    <option value="9">右包含</option>
                    <option value="10">不包含</option>
                </select>
            </div>
            <div class="layui-inline">
                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
            </div>
        </div>-->
                                </div>
                            </div>
                        </div>
@@ -162,8 +197,8 @@
                                <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="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="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>保存方案</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>读取方案</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>保存方案</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>读取方案</button>-->
                            </div>
                        </script>
                    </form>
@@ -281,7 +316,7 @@
                get_FastQuery();
                DisPlay_HideColumn();
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
                //get_DefaultModule();
            }

            //列明显示下拉框
@@ -347,13 +382,31 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                            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>" });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                    }
                                }
                            }

                            var SumHPieceQty_inStock = 0;
                            var SumHQty_inStock = 0;
                            var SumHPieceQty_outStock = 0;
                            var SumHQty_outStock = 0;
                            var data_temp = data1.data[0];
                            for (var i = 0; i < data_temp.length; i++) {
                                SumHPieceQty_inStock++;
                                SumHQty_inStock += data_temp[i].入库米数;
                                if (data_temp[i].是否出库 == "是") {
                                    SumHPieceQty_outStock++;
                                    SumHQty_outStock += data_temp[i].入库米数;
                                }
                            }
                            $("#SumHPieceQty_inStock").val(SumHPieceQty_inStock);
                            $("#SumHQty_inStock").val(SumHQty_inStock.toFixed(1));
                            $("#SumHPieceQty_outStock").val(SumHPieceQty_outStock);
                            $("#SumHQty_outStock").val(SumHQty_outStock.toFixed(1));

                            option.data = data1.data[0];
                            option.cols = [col];
@@ -377,9 +430,14 @@
            //快速过滤
            function get_FastQuery() {
                var HSeOrderBillNo = $("#HSeOrderBillNo").val();          //销售订单单据号
                var HIsOutStock = $("#HIsOutStock").val();          //是否出库

                if (HSeOrderBillNo != "") {
                    sWhere += " and é”€å”®è®¢å•å·='" + HSeOrderBillNo + "' ";
                    sWhere += " and é”€å”®è®¢å•å· like '%" + HSeOrderBillNo + "%' ";
                }

                if (HIsOutStock != "") {
                    sWhere += " and æ˜¯å¦å‡ºåº“ like '%" + HIsOutStock + "%' ";
                }

                //任意字段条件过滤 æ¡ä»¶æå–