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

yusijie

2024-05-31 2be9019a81fa951dbeed12a9d9b27aa10feff4f3

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

@@ -58,7 +58,7 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;">保养周期</label>
                                                <label class="layui-form-label" style="width: 85px;">保养周期<label style="color:red"> * </label></label>
                                                <div class="layui-input-block" style="margin-left: 120px;">
                                                    <input type="text" class="layui-input" name="HCheckCycle" lay-verify="HCheckCycle" id="HCheckCycle">
                                                </div>
@@ -81,7 +81,7 @@
                                        </div>
                                        <div class="layui-row" style="margin-top:10px;">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">设备</label>
                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">设备<label style="color:red"> * </label></label>
                                                <div class="layui-input-block" style="margin-left: 77px;">
                                                    <input type="text" class="layui-input" lay-verify="HEquipName" name="HEquipName" id="HEquipName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                    <input type="hidden" name="HEquipID" id="HEquipID" lay-verify="HEquipID" value="0">
@@ -589,6 +589,7 @@
                    , { field: 'HPlanDate', title: '计划日期' }
                    , { field: 'HPlanBeginTime', title: '计划开始时间点' }
                    , { field: 'HPlanEndTime', title: '计划结束时间点' }
                    , { field: 'HSafeEndTime', title: '安全结束时间点' }
                    , { field: 'HRelationFlag', title: '关联标记' }
                    , { field: 'DiffDate', title: '相差间隔' }
                ];
@@ -648,7 +649,7 @@
                table.render(option1);

                set_EditGrid_Plan(linterid);  //编辑获取表体--点检计划
                option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HRelationFlag": "未点检", "DiffDate": 0 }];
                option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "","HRelationFlag": "未点检", "DiffDate": 0 }];
                table.render(option_plan);
            }
            //编辑获取表头
@@ -789,7 +790,7 @@
                            for (let i = 0; i < data.length; i++) {
                                rowdata.push(
                                    {
                                        "HPlanDate": Pub_Format(data[i].计划日期, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].计划开始时间点, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].计划结束时间点, "yyyy-MM-dd hh:mm:ss")
                                        "HPlanDate": Pub_Format(data[i].计划日期, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].计划开始时间点, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].计划结束时间点, "yyyy-MM-dd hh:mm:ss"), "HSafeEndTime": Pub_Format(data[i].安全结束时间点, "yyyy-MM-dd hh:mm:ss")
                                        , "HRelationFlag": data[i].关联标记, "DiffDate": data[i].相差间隔
                                    }
                                )
@@ -937,7 +938,7 @@
                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('请选择数据');
                                    }                                   
                                    }
                                    if (checkStatus.data.length === 1) {
                                        //同步更新表格和缓存对应的值
                                        obj.update({