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

yangle

2024-05-31 84e2581a6a21bcdd261975c9c9432b0e789f4af9

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

@@ -83,7 +83,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;width:185px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -162,6 +162,16 @@
                                            <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="HEquipModel" lay-verify="HEquipModel" id="HEquipModel" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">工序</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
@@ -409,6 +419,12 @@
            });
            //#endregion

            //#region é€‰æ‹©å·¥åºæŒ‰é’®
            form.on('submit(btnSearchHProc)', function () {
                get_Process();
            });
            //#endregion

            //#region é€‰æ‹©è´Ÿè´£äººæŒ‰é’®
            form.on('submit(btnSearchHEmp)', function () {
                get_checkSearchHEmp();
@@ -475,7 +491,7 @@

                //新增行表格数据
                var NewRow = {
                    "HMouldID": "",
                    "HMouldID": 0,
                    "HMouldNumber": "",
                    "HMouldName": "",
                    "HMouldType": "",
@@ -616,6 +632,40 @@

                        $("#HDeptID").val(checkStatus.data[0].HItemID);//部门id
                        $("#HDeptName").val(checkStatus.data[0].部门名称);//部门名称

                        layer.close(layer.index);
                    }
                    , btn2: function (index, layero) {
                    },
                    end: function () {

                    }
                });
            }
            //#endregion

            //#region å·¥åºé€‰æ‹©é¡µé¢
            function get_Process() {
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '工序列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../基础资料/生产基础资料/Gy_Process.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index];
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }

                        $("#HProcID").val(checkStatus.data[0].HItemID);//部门id
                        $("#HProcName").val(checkStatus.data[0].工序名称);//部门名称

                        layer.close(layer.index);
                    }
@@ -975,6 +1025,8 @@
                                , "HEmpName": tableMain[0]["负责人"]
                                , "HRemark": tableMain[0]["表头备注"]
                                , "HOrgID": tableMain[0].HOrgID
                                , "HProcID": tableMain[0].HProcID
                                , "HProcName": tableMain[0].工序名称



@@ -1097,6 +1149,28 @@
                    return Result = false;
                }

                var sSubTable = table.cache['mainTable'];
                if (sSubTable.length < 1) {
                    layer.msg("明细信息不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
                for (var i = 0; i < sSubTable.length; i++) {
                    if (!sSubTable[i].HMouldID) {
                        var indexRow = i + 1;
                        layer.msg("第" + indexRow + "行，器具编码不能为空！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return Result = false;
                    }
                    if (!sSubTable[i].HMouldQty) {
                        var indexRow = i + 1;
                        layer.msg("第" + indexRow + "行，模穴数不能为空！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return Result = false;
                    }
                    if (!sSubTable[i].HRate) {
                        var indexRow = i + 1;
                        layer.msg("第" + indexRow + "行，占比不能为空！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return Result = false;
                    }
                }

                return Result;
            }