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

wtt

2025-06-20 da19f4f42dddbff9e32e463b142b3ed263d79921

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

@@ -633,7 +633,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true
                    , content: ['../基础资料/生产基础资料/Gy_ShiftsList.html', 'yes']
                    , content: ['../Baseset/基础资料/Gy_Shifts.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调
@@ -856,10 +856,12 @@
                            layer.msg("明细记录第" + (i + 1) + "行,负责人代码信息为空!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return false;
                        }
                        else {
                            return true;
                        }
                        if (sSubStr[i].HDotCheckResult != true) {
                            layer.msg("明细记录第" + (i + 1) + "行,结果信息为勾选!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return false;
                        }                       
                    }
                    return true;
                }
                else {
                    return true;
@@ -930,6 +932,9 @@
                            option.data = rowdata;
                            table.render(option);
                        }
                        else {
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    }
                })
            }