diff --git a/TradeManageNew/DingDan/DD_OrderGoodsMateForTM.aspx b/TradeManageNew/DingDan/DD_OrderGoodsMateForTM.aspx index 8f8519a..263d8a3 100644 --- a/TradeManageNew/DingDan/DD_OrderGoodsMateForTM.aspx +++ b/TradeManageNew/DingDan/DD_OrderGoodsMateForTM.aspx @@ -1068,10 +1068,14 @@ 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 + data.d.forEach(it => { + if (it.InName == "领星同步") { + it.SKU = `
${it.Weight2}kg;长:${it.Long}cm;宽:${it.Width}cm;高:${it.Height}cm
+
${Number((it.Weight2 * 2.20462262185).toFixed(2))}lb; + 长:${Number((it.Long * 0.39).toFixed(2))}in; + 宽:${Number((it.Width * 0.39).toFixed(2)) }in; + 高:${Number((it.Height * 0.39).toFixed(2)) }in; +
` } }) datagrid4.DataBind(data.d);