合并

ch

2023-03-03 5216d4fd3f01e4dc9a77231e9ab7f118f189e5f3

 WebTM/views/»ù´¡×ÊÁÏ/²úÆ·»ù´¡×ÊÁÏ/Gy_StdMinPickQty.html

@@ -245,7 +245,7 @@
            var option = [];
            var HModName = "Gy_MateMould";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HItemID", "HMaterID", "HSupID", "HPackTypeID", "使用标记", "审核人", "审核日期", "制单人", "制单日期"];
            var titleData = ["HItemID", "HMaterIDCol", "HSupIDCol", "HPackTypeIDCol", "使用标记", "审核人", "审核日期", "制单人", "制单日期"];
            //当前日期
            var dt = new Date();

@@ -294,7 +294,8 @@
                //新增行表格数据
                var NewRow = {
                    "HMaterIDCol": "", "物料代码": "", "物料名称": "", "规格型号": "", "HSupIDCol": "",
                    "供应商代码": "", "供应商名称": "", "HPackTypeIDCol": "", "包装方式代码": "", "包装方式名称": ""
                    "供应商代码": "", "供应商名称": "", "HPackTypeIDCol": "", "包装方式代码": "", "包装方式名称": "",
                    "标准包装数量": "0", "外箱包装数量": "0", "开始日期": "", "结束日期": ""
                };
                switch (obj.event) {
                    case 'btn-AddLine':
@@ -318,8 +319,8 @@
                            NewRow.供应商代码 = $("#HSupNumber").val();
                            NewRow.供应商名称 = $("#HSupName").val();
                        }
                        NewRow.HBeginDateCol = Format(new Date(), "yyyy-MM-dd");
                        NewRow.HEndDateCol = "2100-01-01";
                        NewRow.开始日期 = Format(new Date(), "yyyy-MM-dd");
                        NewRow.结束日期 = Format(new Date(), "yyyy-MM-dd");
                        table.cache["mainTable"].push(NewRow);
                        option.data = table.cache["mainTable"];
                        table.render(option);
@@ -359,7 +360,7 @@
            //新增按钮
            form.on('submit(btn-AddNew)', function (data) {
                //window.location.reload();
                option.data = [{ HItemID: "0", HMaterIDCol: "0", HSupIDCol: "0", HBeginDateCol: dt, HEndDateCol: dt, HPackTypeIDCol: "0", åŒ…装方式代码: "", åŒ…装方式名称: "", HRemarkCol: "", ä¾›åº”商代码: "", ä¾›åº”商名称: "", ç‰©æ–™ä»£ç : "", ç‰©æ–™åç§°: "", è§„格型号: "", HMinQty: "0", HBagQty:"0" }];
                option.data = [{ HItemID: "0", HMaterIDCol: "0", HSupIDCol: "0", å¼€å§‹æ—¥æœŸ: dt, ç»“束日期: dt, HPackTypeIDCol: "0", åŒ…装方式代码: "", åŒ…装方式名称: "", HRemarkCol: "", ä¾›åº”商代码: "", ä¾›åº”商名称: "", ç‰©æ–™ä»£ç : "", ç‰©æ–™åç§°: "", è§„格型号: "", æ ‡å‡†åŒ…装数量: "0", å¤–箱包装数量:"0" }];
                table.render(option)

                $("#HMaker").val(sessionStorage["HUserName"]);
@@ -394,7 +395,7 @@
                        if (rowIndex === '0') {
                            layer.msg('首行无法删除！！！');
                        } else {
                            obj.del();
                            obj.del();                           
                            option.data = table.cache["mainTable"];//将数据绑定到data上
                            table.reload(option);
                            layer.close(index);
@@ -568,7 +569,15 @@
                }
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
                // æ›¿æ¢å­—符串
                var a = sSubStr.replace("开始日期", "HBeginDateCol");
                var b = a.replace("结束日期", "HEndDateCol");
                var c = b.replace("标准包装数量", "HMinQtyCol");
                var d = c.replace("外箱包装数量", "HBagQtyCol");
                var e = d.replace("备注", "HRemarkCol");
                var sSubStrRep = e.replaceAll(",[]", "")

                var sMainSub = sMainStr + ';' + sSubStrRep + ';' + OperationType + ";" + sessionStorage["HUserName"];
                var index = layer.load();
                $.ajax({
                    type: "POST",
@@ -784,7 +793,7 @@
                                    }
                                }
                            }

                            col.push({ fixed: 'right', title: '操作', toolbar: '#barDemo' });
                            //动态显示列名
                            option = {
                                elem: '#mainTable'