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

wtt

2024-12-27 669207dd46c8395a49698c00afbf89e4bfc8c87f

 WebTM/views/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBillSumSave.html

@@ -358,7 +358,9 @@
            //#region æ“ä½œæŒ‰é’®è§¦å‘事件
            //#region ä¿å­˜æäº¤
            form.on('submit(btnSave)', function (data) {//提交
                set_AddNew(data);
                if (AllowLoadData(data)) {
                    set_AddNew(data);
                }             
            });
            //#endregion

@@ -390,9 +392,11 @@
                    "HMaterName": $("#HMaterName").val(),
                    "HUnitID": $("#HUnitID").val(),
                    "HUnitName": $("#HUnitName").val(),
                    "HBadReasonID": "",
                    "HBadReasonNumber": "",
                    "HBadReasonID": "0",
                    "HBadReasonNumber": "",                  
                    "HBadReasonHName": "",
                    "HBadPhenomenaID": "0",
                    "HBadPhenomenaName": "",
                    "HEmpID": sessionStorage["HEmpID"],
                    "HCheckMan": $("#HMaker").val(),
                    "HGroupID": $("#HGroupID").val(),
@@ -543,6 +547,8 @@
                        , { field: 'HBadReasonID', title: '不良原因id', hide: true }
                        , { field: 'HBadReasonNumber', title: '不良原因代码', edit: 'text' , event: "HBadReasonNumber"}
                        , { field: 'HBadReasonHName', title: '不良原因', style: 'background-color: #f9f9f9;' }
                        , { field: 'HBadPhenomenaID', title: '不良现象id', hide: true }
                        , { field: 'HBadPhenomenaName', title: '不良现象', edit: 'text', event: "HBadPhenomenaName" }
                        , { field: 'HEmpID', title: '检验员id', hide: true }
                        , { field: 'HCheckMan', title: '检验员', event: "HCheckMan" }
                        , { field: 'HGroupID', title: '班组id', hide: true }
@@ -576,9 +582,11 @@
                        "HMaterName": $("#HMaterName").val(),
                        "HUnitID": $("#HUnitID").val(),
                        "HUnitName": $("#HUnitName").val(),
                        "HBadReasonID": "",
                        "HBadReasonID": "0",
                        "HBadReasonNumber": "",
                        "HBadReasonHName": "",
                        "HBadPhenomenaID": "0",
                        "HBadPhenomenaName": "",
                        "HEmpID": sessionStorage["HEmpID"],
                        "HCheckMan": $("#HMaker").val(),
                        "HGroupID": $("#HGroupID").val(),
@@ -606,6 +614,27 @@
            }
            //#endregion

            //#region æ•°æ®æ ¡éªŒ
            function AllowLoadData(data) {
                //数值格式校验工具
                var ref = /^\d+(\.\d+)?$/;          //非负数正则表达式
                var temp = "";
                             
                for (var i = 0; i < option.data.length; i++) {
                    //数量格式校验                  
                    if (option.data[i]["HBadReasonID"] == 0 || option.data[i]["HBadReasonID"] == undefined || option.data[i]["HBadReasonID"] == null) {
                        layer.msg("第" + (i + 1) + "行：不良原因不能为空！");
                        return false;
                    }
                    if (option.data[i]["HQty"] == 0 || option.data[i]["HQty"] == undefined || option.data[i]["HQty"] == null) {
                        layer.msg("第" + (i + 1) + "行：数量不能为0！");
                        return false;
                    }
                }
                //#endregion
                return true;
            }
            //#endregion
           

            //#region ä¿å­˜HMaker
@@ -618,7 +647,6 @@
                        num.push(table.cache["mainTable"][i])
                    }
                }


                //获取操作方式
                var refSav = "";
@@ -729,6 +757,34 @@
                                , btn2: function (index, layero) { }                                
                            })
                        }
                        if (obj.event == "HBadPhenomenaName") {
                            layer.open({
                                type: 2
                                , skin: "layui-layer-rim"                           //加上边框
                                , title: "不良原因"                             //标题
                                , closeBtn: 1                                       //窗体右上角关闭 çš„ æ ·å¼
                                , shift: 2                                          //弹出动画
                                , area: ["90%", "90%"]                              //窗体大小
                                , maxmin: true                                      //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_BadPhenomena.html', "yes"]
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
                                    var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                                    if (checkStatus.data.length != 1) {
                                        return layer.msg("请选择一条数据");
                                    }
                                    obj.update({
                                        "HBadPhenomenaID": checkStatus.data[0].HItemID
                                        , "HBadPhenomenaName": checkStatus.data[0].不良现象名称
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                , btn2: function (index, layero) { }
                            })
                        }
                        if (obj.event == "HCheckMan") {
                            layer.open({
                                type: 2//弹窗类型