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

YL

2021-12-06 0245c27e507885cfee9d081f3bd22e4b858244ac

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

@@ -303,6 +303,12 @@
                                                <input type="text" class="layui-input" name="HProdWeight" id="HProdWeight" style="background-color:#efefef4d;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">穴数</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCaveQty" id="HCaveQty" style="background-color:#efefef4d;">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
@@ -467,6 +473,24 @@
            form.on('submit(btnSave)', function (data) {//提交
                set_btnSave(data);
            })

            //自动计算剩余寿命
            $("#HUseLife").blur(function () {
                var beginlife = $("#HDesignLife").val();
                var userlife = $("#HUseLife").val();
                var result = beginlife - userlife;
                if (result > 0) {
                    $("#HLeaveLife").val(result)
                }
            });
            $("#HDesignLife").blur(function () {
                var beginlife = $("#HDesignLife").val();
                var userlife = $("#HUseLife").val();
                var result = beginlife - userlife;
                if (result > 0) {
                    $("#HLeaveLife").val(result)
                }
            });

            //对应Erp物料
            form.on('submit(btnHMaterList)', function () {
@@ -1008,6 +1032,7 @@
                        $("#HDesignLife").val(d.data[0].初始设计寿命);
                        $("#HUseLife").val(d.data[0].使用寿命);
                        $("#HLeaveLife").val(d.data[0].剩余寿命);
                        $("#HCaveQty").val(d.data[0].穴数);
                        $("#HProdQty").val(d.data[0].已生产数量);
                        $("#HProdWeight").val(d.data[0].已生产重量);
                        $("#HMouldDotCheckRuleInterName").val(d.data[0].点检规程单号);
@@ -1165,6 +1190,10 @@
                layer.msg("默认仓库不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HCaveQty").val() == '' || $("#HCaveQty").val() == null) {
                layer.msg("穴数不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            } 
            //if ($("#HMouldOWNER").val() == '' || $("#HMouldOWNER").val() == null) {
            //    layer.msg("货主类型不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //    return Result = false;