投产计划查询报表不显示生产订单结案状态的数据，列表增加个状态的过滤框，默认开工 车间仓库对照表 多选

yangle

2023-05-30 7ec20d7301fbe11cf1471cf7c6b9c267d6bb403e

投产计划查询报表不显示生产订单结案状态的数据，列表增加个状态的过滤框，默认开工
车间仓库对照表 多选

 WebTM/views/Éú²ú¹ÜÀí/Èռƻ®»ù´¡×ÊÁÏ/Gy_WorkWarehouseBill_Add.html

@@ -313,9 +313,10 @@
                        if (rowIndex === '0') {
                            layer.msg('首行无法删除！！！');
                        } else {
                            obj.del();
                            option.data = table.cache["mainTable"];//将数据绑定到data上
                            table.reload(option);
                            var oldData = table.cache["mainTable"];
                            oldData.splice(obj.tr.data('index'), 1)
                            option.data = oldData;//将数据绑定到data上
                            table.render(option);
                            layer.close(index);
                        }
                    });
@@ -368,23 +369,53 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ["../../Baseset/基础资料/Gy_WarehouseList.html", "yes"]
                                , content: ["../../基础资料/公用基础资料/Gy_Warehouse.html", "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("请选择一条数据");
                                    if (checkStatus.data.length == 0) {
                                        return layer.msg("请选择数据");
                                    }
                                    //获取数据
                                    var NumData = checkStatus.data;
                                    //获取当前位置所在行数
                                    var NowNum = obj.tr.data('index') + 1;

                                    //判断选择的数据总数 æ˜¯å¦å¤§äºŽè¡¨æ ¼çŽ°æœ‰çš„数据
                                    if (NumData.length > option.data.length - (NowNum - 1)) {
                                        //获取表格剩余行数量
                                        var num = NumData.length - option.data.length + (NowNum - 1);
                                        //循环赋值  åœ¨å·²æœ‰çš„表格赋值
                                        var j = 0;
                                        for (var i = (NowNum - 1); i < option.data.length; i++) {
                                            option.data[i]["HWHID"] = NumData[j]["HItemID"];
                                            option.data[i]["HWHNumber"] = NumData[j]["仓库代码"];
                                            option.data[i]["HWHName"] = NumData[j]["仓库名称"];
                                            j++;
                                    }

                                    //更新表格缓存的数据
                                    obj.update({
                                        "HWHID": checkStatus.data[0].HItemID
                                        , "HWHNumber": checkStatus.data[0].HNumber
                                        , "HWHName": checkStatus.data[0].HName
                                        //在下方添加新的表格数据
                                        for (var i = 0; i < num; i++) {
                                            option.data.push({
                                                "HWorkShopID": "", "HWorkShopNumber": "", "HWorkShopName": "", "HWHID": NumData[j]["HWHID"], "HWHNumber": NumData[j]["仓库代码"], "HWHName": NumData[j]["仓库名称"], "HRemark": ""
                                    })
                                            j++;
                                        }
                                    } else {
                                        //循环赋值  åœ¨å·²æœ‰çš„表格赋值
                                        var j = 0;
                                        for (var i = (NowNum - 1); i < (NowNum - 1) + NumData.length; i++) {
                                            option.data[i]["HWHID"] = NumData[j]["HItemID"];
                                            option.data[i]["HWHNumber"] = NumData[j]["仓库代码"];
                                            option.data[i]["HWHName"] = NumData[j]["仓库名称"];
                                            j++;
                                        }
                                    }
                                    table.render(option);

                                    layer.close(index);//关闭弹窗
                                }
                            })
@@ -473,6 +504,21 @@
                    layer.msg("组织没有选择");
                    return false;
                }

                for (var i = 0; i < option.data.length; i++) {
                    //生产车间
                    if (option.data[i]["HWorkShopID"] == "") {
                        layer.msg("第" + (i + 1) + "行:生产车间不能为空!");
                        return false;
                    }

                    //仓库
                    if (option.data[i]["HWHID"] == "0") {
                        layer.msg("第" + (i + 1) + "行:仓库不能为空!");
                        return false;
                    }
                }

                return true;
            }


 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/ProductionPlanReportList.html

@@ -43,6 +43,7 @@
                                        </select>
                                    </div>
                                </div>
                                
                                <div class="layui-inline">
                                    <label class="layui-form-label">下达日期</label>
                                    <div class="layui-input-block">
@@ -101,6 +102,16 @@
                                            <label class="layui-form-label">批号</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" id="HICMOBillNo" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">生产订单状态</label>
                                            <div class="layui-input-block" style="margin-left: 120px;width: 184px;">
                                                <select name="HSTATUS" lay-verify="HSTATUS" id="HSTATUS">
                                                    <option value="0" >全部</option>
                                                    <option value="4" selected="selected">开工</option>
                                                    <option value="6">结案</option>
                                                </select>
                                            </div>
                                        </div>
                                    </div>
@@ -330,6 +341,7 @@
                var F_BSV_WYID = $("#F_BSV_WYID").val();//唯一ID
                var HMaterNumber = $("#HMaterNumber").val();//物料代码
                var HState = $("#HState").val();//状态
                var HSTATUS = $("#HSTATUS").val();//生产订单状态
                var HOrgID = sessionStorage["OrganizationID"];
                var checkWRuku = $("input[name='checkWRuku']").prop("checked");//复选框

@@ -350,6 +362,7 @@
                    , HBillNo: HBillNo
                    , IsTrue: checkWRuku
                    , HState: HState
                    , HSTATUS: HSTATUS
                }

                get_Display(JSON.stringify(sWhere));