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

yusijie

2023-11-27 3ccf32f224519ba7e1f38b8d5b0f4d1e7a8cffaf

 WebTM/views/É豸¹ÜÀí/Sb_EquipMaintainBillEdit.html

@@ -324,8 +324,11 @@
                                option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HRemark": "" }];
                                table.render(option);
                                table.render(option1);
                                $("#HEquipMaintainRuleInterID").val(BYData[0].HInterID);
                                $("#HEquipMaintainRuleInterNo").val(BYData[0].HBillNo)
                                if (BYData.length != 0) {
                                    $("#HEquipMaintainRuleInterID").val(BYData[0].HInterID);
                                    $("#HEquipMaintainRuleInterNo").val(BYData[0].HBillNo)
                                }
                               
                                if (BYData.length != 0)  //表体数据为空时
                                {
                                    buttonArr = [];//清空数组
@@ -429,7 +432,7 @@
                                        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
                                            "HManagerName": BYData[i].HManagerName, "HClaim": BYData[i].HClaim, "HRemark": BYData[i].HRemark
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }
@@ -448,7 +451,7 @@
                                            "HMaterID": PJData[i].HMaterID, "HMaterNumber": PJData[i].HMaterNumber, "HMaterName": PJData[i].HMaterName,
                                            "HUnitID": PJData[i].HUnitID, "HUnitNumber": PJData[i].HUnitNumber,
                                            "HUnitName": PJData[i].HUnitName, "HQty": PJData[i].HQty,
                                            "HRemark": rowdate2[i].HRemark
                                            "HRemark": PJData[i].HRemark
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }
@@ -791,6 +794,8 @@
                                , "HPlanName": data.保养计划  
                                , "HPlanNo": data.保养计划编号                //
                                , "HRemark": data.表头备注                //备注
                                , "HEquipMaintainRuleInterID": data.HEquipMaintainRuleInterID                //备注
                                , "HEquipMaintainRuleInterNo": data.设备保养规程                //备注

                            });