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

wtt

2024-09-23 367e466bba2cec76c91cd10e8fd0423981388932

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_MaterialTechParamBillMain.html

@@ -413,27 +413,27 @@
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
            }
            //else if (OperationType == 2) {

            //    RoadBillMain(linterid);
            //    $.ajax({
            //        url: GetWEBURL() + "/Web/GetMAXNum",
            //        type: "GET",
            //        async: false,
            //        data: { "HBillType": '3301' },
            //        success: function (d) {
            //            $("#HInterID").val(d.data[0].HInterID);
            //            $("#HBillNo").val(d.data[0].HBillNo);
            //            $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
            //        }
            //    });
            //}
            else if (OperationType == 2) {
                //初始化表格
                get_InitGrid();
                RoadBillMain(linterid);
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    async: false,
                    data: { "HBillType": '3334' },
                    success: function (d) {
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                    }
                });
            }
            else if (OperationType == 3) {

                //禁用按钮
                var num = 1;
                HfBtn(num);
                debugger;
                //初始化表格
                get_InitGrid();

@@ -1313,8 +1313,8 @@
                            var tableSub = result.data[1];
                            //主表
                            form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HInterID": tableMain[0]["HInterID"]
                                , "HBillNo": tableMain[0]["单据号"]
                                "HInterID": OperationType == 2 ? "" : tableMain[0]["HInterID"]
                                , "HBillNo": OperationType == 2 ? "" : tableMain[0]["单据号"]
                                , "HDate": Format(new Date(tableMain[0]["日期"]), "yyyy-MM-dd")
                                , "HMaterID": tableMain[0]["HMaterID"]
                                , "HMaterNumber": tableMain[0]["物料代码"]