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

yangle

2024-06-06 bd170f98bd06076af6af91ca29a67b3cc4db6790

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

@@ -335,7 +335,7 @@
            $("#HDeptName").val(sessionStorage["HDept"]);               //部门
            $("#HEmpID").val(sessionStorage["HKeeperID"]);              //验收人ID
            $("#HEmpName").val(sessionStorage["HKeeper"]);            //验收人
            $("#HManagerID").val(sessionStorage["HManagerID"]);         //责任人ID
            $("#HManagerID").val(sessionStorage["HManagerID"] == null ? 0 : sessionStorage["HManagerID"]);         //责任人ID
            $("#HManagerName").val(sessionStorage["HManagerName"]);     //责任人
            $("#HMaker").val(sessionStorage["HUserName"]);     //创建人
            //模治具条码是否扫描标记
@@ -353,50 +353,7 @@
            form.on('submit(QueDin)', function (data) {
                GetMeesageByBarCode();
            });

            //条形码回车方法
            $('#HBarCode').on('keydown', function (event) {
                var HBarCode = $('#HBarCode').val();
                if (event.keyCode == 13) {
                    if (!HBarCode) {
                        layer.msg("条形码不能为空！")
                        return;
                    }
                    var index = layer.load();
                    $.ajax({
                        url: GetWEBURL() + "/Sb_PDA_EqpRepairWorkBill/txtHBarCode_KeyDown",
                        type: "GET",
                        data: { "HBarCode": HBarCode },
                        success: function (result) {
                            if (result.count == 1) {
                                var data = result.data[0];
                                form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                    "HEquipID": data.HInterID,
                                    "HBarName": data.HName,
                                    "HBarSpec": data.HModel,
                                    "HBarModel": data.HModel2,
                                    "HQty": "1"
                                });
                                $("#HBarCode").attr("readonly", "readonly");//条形码只读
                                $("#HBarCode").css("background-color", "#efefef4d");

                                HProcExchBillNoFlag = true;
                                layer.close(index);
                            }
                            else {
                                layer.close(index);
                                layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        },
                        error: function (err) {
                            layer.close(index);
                            layer.msg("接口请求失败！" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    });
                }
            });


            
            //退出-关闭页面方法
            $('#Cancel').on('click', function () {
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
@@ -425,12 +382,11 @@
                                $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
                            }
                            else {
                                layer.close(index);
                                $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//保存按钮启用
                                layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        },
                        error: function (err) {
                            layer.close(index);
                            layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    });
@@ -440,34 +396,37 @@

            //新增
            form.on('submit(Add)', function (data) {
                $('#Saver').addClass("buttom_box_little");
                $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
                $("#HBarCode").removeAttr("readonly");//条形码清除只读
                $("#HBarCode").removeAttr("background-color");//条形码清除背景色
                layer.confirm('新增后页面数据将消失？', { icon: 3, title: '提示' }, function (index) {
                    $('#Saver').addClass("buttom_box_little");
                    $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
                    $("#HBarCode").removeAttr("readonly");//条形码清除只读
                    $("#HBarCode").removeAttr("background-color");//条形码清除背景色

                // æ¸…空表单 ï¼ˆâ€œformData”是表单的id）
                $("#formData")[0].reset();
                layui.form.render();
                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" }];
                table.render(option);
                    // æ¸…空表单 ï¼ˆâ€œformData”是表单的id）
                    $("#formData")[0].reset();
                    layui.form.render();
                    option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" }];
                    table.render(option);

                $("#HBarCode").focus();
                //获取最大单据号
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '3911' },
                    success: function (d) {
                        //console.log(d.data);
                        $("#HInterID").val("0");
                        $("#HBillNo").val(d.data[0].HBillNo);
                    }
                });
                $("#HConkBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //维修开始时间
                $("#HRepairEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));    //维修结束时间
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //单据日期
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //创建日期
                $("#HMaker").val(sessionStorage["HUserName"]);     //创建人
                    $("#HBarCode").focus();
                    //获取最大单据号
                    $.ajax({
                        url: GetWEBURL() + "/Web/GetMAXNum",
                        type: "GET",
                        data: { "HBillType": '3911' },
                        success: function (d) {
                            //console.log(d.data);
                            $("#HInterID").val("0");
                            $("#HBillNo").val(d.data[0].HBillNo);
                        }
                    });
                    $("#HConkBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //维修开始时间
                    $("#HRepairEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));    //维修结束时间
                    $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //单据日期
                    $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //创建日期
                    $("#HMaker").val(sessionStorage["HUserName"]);     //创建人
                    layer.close(index);
                });  
            })

             //#region é€€å‡ºæŒ‰é’®
@@ -891,16 +850,16 @@
                }
                var index = layer.load();
                $.ajax({
                    url: GetWEBURL() + "/Sb_PDA_EqpRepairWorkBill/txtHBarCode_KeyDown",
                    url: GetWEBURL() + "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_List",
                    type: "GET",
                    data: { "HBarCode": HBarCode },
                    success: function (result) {
                        if (result.count == 1) {
                            var data = result.data[0];
                            $("#HEquipID").val(data.HInterID);
                            $("#HBarName").val(data.HName);
                            $("#HBarSpec").val(data.HModel);
                            $("#HBarModel").val(data.HModel2);
                            $("#HEquipID").val(data.hmainid);
                            $("#HBarName").val(data.设备名称);
                            $("#HBarSpec").val(data.设备规格);
                            $("#HBarModel").val(data.设备型号);
                            $("#HQty").val(1);
                            $("#HBarCode").attr("readonly", "readonly");//条形码只读
                            $("#HBarCode").css("background-color", "#efefef4d");
@@ -909,11 +868,13 @@
                            layer.close(index);
                        }
                        else {
                            $("#HBarCode").val("");
                            layer.close(index);
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    },
                    error: function (err) {
                        $("#HBarCode").val("");
                        layer.close(index);
                        layer.msg("接口请求失败！" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }