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

zrg

2024-03-06 adba8ededa57c9aa38ed4299d01a85695871adcb

 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛ¶©µ¥±ä¸üµ¥/Xs_SeOrderChangeBill.html

@@ -687,7 +687,7 @@
                        , { field: 'HSourceBillNo', title: '源单单号', hide: true, style: 'background-color: #f9f9f9;' }     //f7
                        , { field: 'HSourceBillType', title: '源单类型', hide: true, style: 'background-color: #f9f9f9;' }     //f7

                       /* , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 70 }*/
                        , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 70 }
                    ]]
                }

@@ -894,7 +894,7 @@
                                        "HTaxPrice_Old": dealDoubleToFixed(result.data[i]["含税单价"], 3),
                                        "HTaxPrice_New": dealDoubleToFixed(result.data[i]["含税单价"] ,3),
                                        "HDate_Old": formatDate(result.data[i]["交货日期"]),
                                        "HDate_New": formatDate(result.data[i]["交货日期"]),
                                        "HDate_New": new Date(result.data[i]["交货日期"]).getTime() < new Date().getTime() ? Format(new Date(),"yyyy-MM-dd"):formatDate(result.data[i]["交货日期"]),
                                        "HRemark": "",
                                        "HSourceInterID": result.data[i]["hmainid"],
                                        "HSourceEntryID": result.data[i]["hsubid"],
@@ -1104,10 +1104,12 @@
                if (OperationType == 1 || OperationType == 2 || OperationType==4) {
                    refSav = "Add";
                    data.field.HChangeDate = new Date();
                    data.field.HSTOCKORGID = data.field.HOrgID;
                }
                if (OperationType == 3) {
                    refSav = "Update";
                    data.field.HChangeDate = new Date();
                    data.field.HSTOCKORGID = data.field.HOrgID;
                }

                //若为编辑-保存，则更新修改人和修改时间
@@ -1485,9 +1487,9 @@
                if (obj.event === 'del') {
                    layer.confirm('真的删除行么', function (index) {
                        console.log("索引为:" + rowIndex);
                        if (rowIndex === '0') {
                            layer.msg('首行无法删除！！！');
                        } else {
                        //if (rowIndex === '0') {
                        //    layer.msg('首行无法删除！！！');
                        //} else {
                            //obj.del();
                            //layer.close(index);
                            var oldData = table.cache["mainTable"];
@@ -1495,7 +1497,7 @@
                            option.data = oldData;
                            table.render(option);
                            layer.close(index);
                        }
                        /*}*/
                    });
                }
            }