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

yxj

2024-10-10 9f1c2ac41687335fe2faa470cfb63ee3a8ecd821

 WebTM/views/ÖÊÁ¿¹ÜÀí/¼ìÑé·½°¸µ¥/QC_Add_CheckProject.html

@@ -284,6 +284,7 @@
                    , "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
                    , "HTargetValTxt": "", "HUpLimitTxt": "", "HDownLimitTxt": "", "HUpOffSetTxt": "", "HDownOffSetTxt": ""
                    , "HQualityStdName": "", "HInspectMethodName": "", "HInspectInstruMentName": "", "HInspectBasisName": "", "HSampleSchemeName": ""
                    , "HControlUpperLimit": 0, "HControlLowerLimit":0
                };
                switch (obj.event) {
                    //新增一行
@@ -534,7 +535,7 @@
                    Pub_Close(2);
                } else {
                    Pub_Close(1);
                }                
                }
                //var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                //parent.layer.close(index); //再执行关闭
            });
@@ -647,7 +648,11 @@
                                        }
                                        //将批量选择的数据写入数组（多选行）
                                        for (var i = 0; i < checkStatus.data.length; i++) {
                                            buttonArr.push({ "HPrjNo": i + 1, "HQCCheckItemID": checkStatus.data[i].HItemID, "HQCCheckItemNumber": checkStatus.data[i].代码, "HQCCheckItemName": checkStatus.data[i].名称, "HQCStd": "", "HQCStdMax": "", "HQCUnit": "", "HRemark": "" });
                                            buttonArr.push({
                                                "HPrjNo": i + 1, "HQCCheckItemID": checkStatus.data[i].HItemID, "HQCCheckItemNumber": checkStatus.data[i].代码, "HQCCheckItemName": checkStatus.data[i].名称, "HQCStd": "", "HQCStdMax": "", "HQCUnit": "", "HRemark": ""
                                                , "HTargetVal": 0, "HUpLimit": 0, "HDownLimit": 0, "HUpOffSet": 0, "HDownOffSet": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0, "HTargetValQ": 0, "HUpLimitQ": 0, "HDownLimitQ": 0, "HUpOffSetQ": 0
                                                , "HDownOffSetQ": 0
                                            });
                                        }

                                        table.reload("mainTable", {
@@ -927,6 +932,8 @@
                    , { field: 'HDownLimitTxt', title: '下限值文本', edit: 'text' }
                    , { field: 'HUpOffSetTxt', title: '上偏差文本', edit: 'text' }
                    , { field: 'HDownOffSetTxt', title: '下偏差文本', edit: 'text' }
                    , { field: 'HControlUpperLimit', title: '控制上限', edit: 'text' }
                    , { field: 'HControlLowerLimit', title: '控制下限', edit: 'text' }
                    , { field: 'HRemark', title: '备注', edit: 'text' }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                ];
@@ -943,7 +950,7 @@
                    , done: function (res, curr, count) {

                    }
                };               
                };
            }

            //保存
@@ -996,6 +1003,7 @@
                    , "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
                    , "HTargetValTxt": "", "HUpLimitTxt": "", "HDownLimitTxt": "", "HUpOffSetTxt": "", "HDownOffSetTxt": ""
                    , "HQualityStdName": "", "HInspectMethodName": "", "HInspectInstruMentName": "", "HInspectBasisName": "", "HSampleSchemeName": ""
                    , "HControlUpperLimit": 0, "HControlLowerLimit": 0
                }];
                table.render(option);
            }
@@ -1013,6 +1021,7 @@
                    , "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
                    , "HTargetValTxt": "", "HUpLimitTxt": "", "HDownLimitTxt": "", "HUpOffSetTxt": "", "HDownOffSetTxt": ""
                    , "HQualityStdName": "", "HInspectMethodName": "", "HInspectInstruMentName": "", "HInspectBasisName": "", "HSampleSchemeName": ""
                    , "HControlUpperLimit": 0, "HControlLowerLimit": 0
                }];
                table.render(option);
            }
@@ -1170,6 +1179,7 @@
                                    "HDownLimitTxt": data[i].下限值文本, "HUpOffSetTxt": data[i].上偏差文本, "HDownOffSetTxt": data[i].下偏差文本,
                                    "HQualityStdName": data[i].质量标准名称, "HInspectMethodName": data[i].检验方法名称, "HInspectInstruMentName": data[i].检验仪器名称,
                                    "HInspectBasisName": data[i].检验依据名称, "HSampleSchemeName": data[i].子抽样方案名称
                                    , "HControlUpperLimit": data[i].控制上限, "HControlLowerLimit": data[i].控制下限
                                });
                            }

@@ -1235,18 +1245,23 @@

            //增加一行
            function btnAddLine(NewRow) {
                //table.cache["mainTable"].push(NewRow);
                //option.data = table.cache["mainTable"];
                //table.render(option);
                var tableBak = table.cache["mainTable"]; //获取之前编辑过的表格数据
                buttonArr = [];//清空数组
                for (var i = 0; i < tableBak.length; i++) {
                    buttonArr.push(tableBak[i]);  //将之前的数据存储
                table.cache["mainTable"].push(NewRow);
                option.data = table.cache["mainTable"];
                table.render(option);
                for (var i = 1; i <= option.data.length; i++) {
                    $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
                    $('#HDefectLevel' + i + '').find("option[value='" + option.data[i - 1].HDefectLevel + "']").attr("selected", true);
                    $('#HStatus' + i + '').find("option[value='" + option.data[i - 1].HStatus + "']").attr("selected", true);

                    if (option.data[i - 1].HDestructInspect) {
                        $('#HDestructInspect' + i + '').attr("checked", true);
                    }
                    if (option.data[i - 1].HKeyInspect) {
                        $('#HKeyInspect' + i + '').attr("checked", true);
                    }                    
                }
                buttonArr.push(NewRow);  //在尾部加一行
                table.reload("mainTable", {
                    data: buttonArr    //将数据重新载入表格
                })
                form.render('select');
                form.render('checkbox');
            }

            //复制一行
@@ -1264,6 +1279,20 @@
                    table.cache["mainTable"].push(JSON.parse(copyrow));//将复制的行强转成json追加到表格上
                    option.data = table.cache["mainTable"];//将数据绑定到data上
                    table.render(option);//将数据渲染到表格上
                    for (var i = 1; i <= option.data.length; i++) {
                        $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
                        $('#HDefectLevel' + i + '').find("option[value='" + option.data[i - 1].HDefectLevel + "']").attr("selected", true);
                        $('#HStatus' + i + '').find("option[value='" + option.data[i - 1].HStatus + "']").attr("selected", true);

                        if (option.data[i - 1].HDestructInspect) {
                            $('#HDestructInspect' + i + '').attr("checked", true);
                        }
                        if (option.data[i - 1].HKeyInspect) {
                            $('#HKeyInspect' + i + '').attr("checked", true);
                        }       
                    }
                    form.render('select');
                    form.render('checkbox');
                }
            }