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

YL

2021-12-06 0245c27e507885cfee9d081f3bd22e4b858244ac

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldMaintainBillList.html

@@ -321,7 +321,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../PublicPage/MouldInformation.html', 'yes'],
                    content: ['../模治具管理/Sc_MouldMaintainRuleBillList.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调
@@ -360,8 +360,12 @@
                                var PJData = result.list[1];//配件
                                var rowdate1 = layui.table.cache["mainTable"];
                                var rowdate2 = layui.table.cache["mainTable1"];
                                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
                                option2.data = [{ "HMaterID": 0, "HMaterNumber": " ", "HMaterName": " ", "HMaterSpec": " ", "HUnitID": "0", "HUnitNumber": " ", "HUnitName": " ", "HQty": "0", "HQtyMust": "0", "HManagerID": "0", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
                                table.render(option);
                                table.render(option2);

                                if (rowdate1.length == 0)  //表体数据为空时
                                if (BYData.length != 0)  //表体数据为空时
                                {
                                    buttonArr = [];//清空数组
                                    for (var i = 0; i < BYData.length; i++) {
@@ -376,44 +380,10 @@
                                        data: buttonArr    //将数据重新载入表格
                                    })
                                }
                                if (rowdate1.length > 0 && rowdate1.length <= BYData.length) //表体数据不为空,且表体数据行数小于等于选中带回数据行数
                                {
                                    buttonArr = [];//清空数组
                                    for (var i = 0; i < rowdate1.length; i++) {
                                        var checkrow = {
                                            "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
                                            "HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
                                            "HManagerName": BYData[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }
                                    //buttonArr.push(NewRow);  //在尾部加一行
                                    table.reload("mainTable", {
                                        data: buttonArr    //将数据重新载入表格
                                    })
                                }
                                if (rowdate1.length > 0 && rowdate1.length > BYData.length) //表体数据不为空,且表体数据行数大于选中带回数据行数
                                {
                                    console.log(checkStatus.data.length);
                                    buttonArr = [];//清空数组
                                    for (var i = 0; i < rowdate.length; i++) {
                                        var checkrow = {
                                            "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
                                            "HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
                                            "HManagerName": BYData[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }
                                    //buttonArr.push(NewRow);  //在尾部加一行
                                    table.reload("mainTable", {
                                        data: buttonArr    //将数据重新载入表格
                                    })
                                }
                                




                                if (rowdate2.length == 0)  //表体数据为空时
                                if (PJData.length != 0)  //表体数据为空时
                                {
                                    buttonArr = [];//清空数组
                                    for (var i = 0; i < PJData.length; i++) {
@@ -430,42 +400,7 @@
                                        data: buttonArr    //将数据重新载入表格
                                    })
                                }
                                if (rowdate2.length > 0 && rowdate2.length <= PJData.length) //表体数据不为空,且表体数据行数小于等于选中带回数据行数
                                {
                                    buttonArr = [];//清空数组
                                    for (var i = 0; i < rowdate2.length; i++) {
                                        var checkrow = {
                                            "HMaterID": PJData[i].HMaterID, "HMaterNumber": PJData[i].HMaterNumber, "HMaterName": PJData[i].HMaterName,
                                            "HMaterSpec": PJData[i].HMaterSpec, "HUnitID": PJData[i].HUnitID, "HUnitNumber": PJData[i].HUnitNumber,
                                            "HUnitName": PJData[i].HUnitName, "HQty": PJData[i].HQty, "HQtyMust": PJData[i].HQtyMust,
                                            "HManagerID": rowdate2[i].HManagerID, "HManagerNumber": rowdate2[i].HManagerNumber, "HManagerName": rowdate2[i].HManagerName,
                                            "HRemark": rowdate2[i].HRemark
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }
                                    //buttonArr.push(NewRow);  //在尾部加一行
                                    table.reload("mainTable1", {
                                        data: buttonArr    //将数据重新载入表格
                                    })
                                }
                                if (rowdate2.length > 0 && rowdate2.length > PJData.length) //表体数据不为空,且表体数据行数大于选中带回数据行数
                                {
                                    console.log(checkStatus.data.length);
                                    buttonArr = [];//清空数组
                                    for (var i = 0; i < rowdate.length; i++) {
                                        var checkrow = {
                                            "HMaterID": PJData[i].HMaterID, "HMaterNumber": PJData[i].HMaterNumber, "HMaterName": PJData[i].HMaterName,
                                            "HMaterSpec": PJData[i].HMaterSpec, "HUnitID": PJData[i].HUnitID, "HUnitNumber": PJData[i].HUnitNumber,
                                            "HUnitName": PJData[i].HUnitName, "HQty": PJData[i].HQty, "HQtyMust": PJData[i].HQtyMust,
                                            "HManagerID": rowdate2[i].HManagerID, "HManagerNumber": rowdate2[i].HManagerNumber, "HManagerName": rowdate2[i].HManagerName,
                                            "HRemark": rowdate2[i].HRemark
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }
                                    table.reload("mainTable1", {
                                        data: buttonArr    //将数据重新载入表格
                                    })
                                }
                               
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }