diff --git a/TradeManage/DingDan/DD_OrderGoodsMateForTM.aspx b/TradeManage/DingDan/DD_OrderGoodsMateForTM.aspx index 30d78cc..765321d 100644 --- a/TradeManage/DingDan/DD_OrderGoodsMateForTM.aspx +++ b/TradeManage/DingDan/DD_OrderGoodsMateForTM.aspx @@ -1068,6 +1068,12 @@ data: Sys.Serialization.JavaScriptSerializer.serialize(param), success: function (data) { WindowLoadModel.Hide(); + data.d = data.d.map(it => { + return { + ...it, + SKU: it.InName == "领星同步" ? it.SKU.replace("磅", "kg").replace(/in/g, "cm") : it.SKU + } + }) datagrid4.DataBind(data.d); var num = 0; if (data.d != null) { diff --git a/TradeManage/DingDan/DD_OrderListForTM2.aspx b/TradeManage/DingDan/DD_OrderListForTM2.aspx index 2b02235..0fec332 100644 --- a/TradeManage/DingDan/DD_OrderListForTM2.aspx +++ b/TradeManage/DingDan/DD_OrderListForTM2.aspx @@ -11,6 +11,14 @@ + @@ -1201,7 +1209,7 @@ Array.add(datagrid1.Columns, col); col = new nblf.ui.DataGridColumn(); col.HeaderText = "订单金额"; - col.CellTemplate = "{Bind TotalPrice}{Bind MoneyCode}"; + col.CellTemplate = `{Bind TotalPrice}{Bind otherPirce}{Bind MoneyCode}`; col.SortExpression = "TotalPrice"; Array.add(datagrid1.Columns, col); col = new nblf.ui.DataGridColumn(); @@ -1437,6 +1445,12 @@ data: Sys.Serialization.JavaScriptSerializer.serialize(param), success: function (data) { WindowLoadModel.Hide(); + data.d.DataSource = data.d.DataSource.map(it => { + return { + ...it, + otherPirce: it.PlatId == 22 && it.TotalPrice<30 ? "+2.99" : "" + } + }) datagrid1.Set_RowCount(data.d.RowCount); datagrid1.DataBind(data.d.DataSource); if (param.IsDetail == 1) diff --git a/TradeManage/HuoWu/HW_GoodsAddForTM.aspx b/TradeManage/HuoWu/HW_GoodsAddForTM.aspx index ce4a9ab..95783a2 100644 --- a/TradeManage/HuoWu/HW_GoodsAddForTM.aspx +++ b/TradeManage/HuoWu/HW_GoodsAddForTM.aspx @@ -233,7 +233,7 @@ { var w=parseFloat($("#txtWeight3").val())*0.035274; $("#txtWeight22").val(w.toFixed(2)); - $("#txtWeight22").val((w/16).toFixed(2)); + $("#txtWeight23").val((w/16).toFixed(2)); } }); diff --git a/TradeManageNew/DingDan/DD_OrderGoodsMateForTM.aspx b/TradeManageNew/DingDan/DD_OrderGoodsMateForTM.aspx index fbe63c5..8f8519a 100644 --- a/TradeManageNew/DingDan/DD_OrderGoodsMateForTM.aspx +++ b/TradeManageNew/DingDan/DD_OrderGoodsMateForTM.aspx @@ -1068,6 +1068,12 @@ data: Sys.Serialization.JavaScriptSerializer.serialize(param), success: function (data) { WindowLoadModel.Hide(); + data.d = data.d.map(it => { + return { + ...it, + SKU: it.InName == "领星同步" ? it.SKU.replace("磅", "kg").replace(/in/g, "cm") : it.SKU + } + }) datagrid4.DataBind(data.d); var num = 0; if (data.d != null) {