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

王 垚

2021-11-05 22c4e6c779a10dc8fb7ce73887ea3d8eb98eb519

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

@@ -226,7 +226,7 @@

            var option;
            var sBillType = "3910";
            var TabRow = { "HRepairID1": 0, "HRepairCode": "", "HRepairName": "", "HManagerID1": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" };
            //var TabRow = { "HRepairID1": 0, "HRepairCode": "", "HRepairName": "", "HManagerID1": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" };
            //#endregion

            //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -252,7 +252,7 @@
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;;
                var NewRow = TabRow;
                var NewRow = { "HRepairID1": 0, "HRepairCode": "", "HRepairName": "", "HManagerID1": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" };
                switch (obj.event) {
                    //增加一行
                    case 'btn-AddLine': set_AddLine(NewRow);
@@ -565,7 +565,7 @@
            function set_AddFNew() {
                //获取最大单据号
                get_MAXNum();
                option.data = [TabRow];
                option.data = [{ "HRepairID1": 0, "HRepairCode": "", "HRepairName": "", "HManagerID1": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" }];
                table.render(option);
            }

@@ -593,7 +593,7 @@
            function set_EditFromGrid() {
                set_EditForm(linterid);  //编辑获取表头
                set_EditGrid(linterid);  //编辑获取表体
                option.data = [TabRow];
                option.data = [{ "HRepairID1": 0, "HRepairCode": "", "HRepairName": "", "HManagerID1": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" }];
                table.render(option);
            }

@@ -842,7 +842,7 @@
                if ($("#HRepairName").val() == '') {
                    layer.msg("维修项目没有选择", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                } 
                //数字正则(包含小数)
                var reg = /^\d+(\.\d+)?$/;
                if (reg.test($("#HPlanTimes").val()) == false || $("#HPlanTimes").val() == '') {