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

YL

2021-11-15 9d8975c6ed276fece7744349e98f4347df19087a

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

@@ -58,6 +58,15 @@
                                                <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 32px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">货主类型</label>
                                            <div class="layui-input-block">
                                                <select name="HMouldOWNER" lay-filter="HMouldOWNER" id="HMouldOWNER">
                                                    <option value="自费" selected="selected">自费</option>
                                                    <option value="客供">客供</option>
                                                </select>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
@@ -190,6 +199,12 @@
                                            <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="HMouldStatus" id="HMouldStatus" 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="HSaveLife" id="HSaveLife" style="background-color:#efefef4d;">
                                            </div>
                                        </div>
                                    </div>
@@ -861,6 +876,7 @@
                        $("#HInterID").val(d.data[0].hmainid);
                        $("#HBillNo").val(d.data[0].单据号);
                        $("#HDate").val(formatDate(d.data[0].日期));
                        $("#HMouldOWNER").val(d.data[0].货主类型);
                        $("#HMouldNo").val(d.data[0].模具编号);
                        $("#HName").val(d.data[0].模具名称);
                        $("#HModel").val(d.data[0].当前模具规格);
@@ -883,6 +899,7 @@
                        $("#HSupID").val(d.data[0].HSupID);
                        $("#HSupName").val(d.data[0].供应商);
                        $("#HMouldStatus").val(d.data[0].模具状态);
                        $("#HSaveLife").val(d.data[0].安全寿命);
                        $("#HWHID").val(d.data[0].HWhID);
                        $("#HWHName").val(d.data[0].默认仓库);
                        //$("#HRoutingID").val(d.data[0].HRoutingID);
@@ -1049,6 +1066,14 @@
                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;
            }
            if ($("#HSaveLife").val() == '' || $("#HSaveLife").val() == null) {
                layer.msg("安全寿命不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            
            return Result;
        }