1

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) {

TradeManage/DingDan/DD_OrderListForTM2.aspx

@@ -11,6 +11,14 @@
     <link rel="stylesheet" type="text/css" href="../themes/icon.css" />
     <link rel="stylesheet" type="text/css" href="../themes/New.css?a=1" />
     <link rel="stylesheet" type="text/css" href="../themes/DataGrid.css" />
+    <style>
+        .otherPirce{
+            color: red;
+        }
+        .otherPirce[otherPirce=""] {
+            display:none;
+        }
+    </style>
     <script src="../Scripts/MicrosoftAjax.js" type="text/javascript"></script>
     <script src="../Scripts/jquery.min.js" type="text/javascript"></script>
     <script src="../Scripts/jquery.easyui.min.js" type="text/javascript"></script>
@@ -1201,7 +1209,7 @@
             Array.add(datagrid1.Columns, col);
             col = new nblf.ui.DataGridColumn();
             col.HeaderText = "订单金额";
-            col.CellTemplate = "<span>{Bind TotalPrice}{Bind MoneyCode}</span>";
+            col.CellTemplate = `<span>{Bind TotalPrice}<span class="otherPirce" otherPirce="otherPirce">{Bind otherPirce}</span>{Bind MoneyCode}</span>`;
             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)

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));
               }
             
             });

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) {