diff --git a/TradeManage/HuoWu/HW_GoodsAddForTM.aspx b/TradeManage/HuoWu/HW_GoodsAddForTM.aspx index 95783a2..5a58c36 100644 --- a/TradeManage/HuoWu/HW_GoodsAddForTM.aspx +++ b/TradeManage/HuoWu/HW_GoodsAddForTM.aspx @@ -262,7 +262,14 @@ }); - + $("#" + datagrid4.TableID + " a[CommandName='cmdTemu']").live("click", function () { + var RowIndex = $(this).parentsUntil("tr").parent().attr("index"); + var model = datagrid1.Get_Model(RowIndex); + window.open("TemuOrderGoodsFee.aspx?SKU1=" + model.SKU1); + + + + }); $("#a_jj").bind("click", function () { @@ -2872,12 +2879,19 @@ function selectE(p,c) { col.CellTemplate = ""; Array.add(datagrid1.Columns, col); + col = new nblf.ui.DataGridColumn(); col.HeaderText = "编号"; col.CellTemplate = "{Bind TypeCode}"; Array.add(datagrid1.Columns, col); + col = new nblf.ui.DataGridColumn(); + col.HeaderText = "Temu利润"; + + col.CellTemplate = "Temu利润"; + Array.add(datagrid1.Columns, col); + col = new nblf.ui.DataGridColumn(); col.HeaderText = "描述"; // col.Width = "100px"; diff --git a/TradeManage/bin/TradeManage.dll b/TradeManage/bin/TradeManage.dll index 878bb32..942bc86 100644 Binary files a/TradeManage/bin/TradeManage.dll and b/TradeManage/bin/TradeManage.dll differ diff --git a/TradeManage/bin/TradeManage.pdb b/TradeManage/bin/TradeManage.pdb index 193f96e..eec8bdd 100644 Binary files a/TradeManage/bin/TradeManage.pdb and b/TradeManage/bin/TradeManage.pdb differ diff --git a/TradeManage/bin/TradeManageNew.dll b/TradeManage/bin/TradeManageNew.dll index d26a6b3..94725c1 100644 Binary files a/TradeManage/bin/TradeManageNew.dll and b/TradeManage/bin/TradeManageNew.dll differ diff --git a/TradeManage/bin/TradeManageNew.dll.config b/TradeManage/bin/TradeManageNew.dll.config index 66850e4..4b0b07e 100644 --- a/TradeManage/bin/TradeManageNew.dll.config +++ b/TradeManage/bin/TradeManageNew.dll.config @@ -63,11 +63,11 @@ - + - + diff --git a/TradeManage/bin/TradeManageNew.pdb b/TradeManage/bin/TradeManageNew.pdb index bad2b02..ad2be9b 100644 Binary files a/TradeManage/bin/TradeManageNew.pdb and b/TradeManage/bin/TradeManageNew.pdb differ diff --git a/TradeManage/obj/Debug/TradeManage.dll b/TradeManage/obj/Debug/TradeManage.dll index 878bb32..942bc86 100644 Binary files a/TradeManage/obj/Debug/TradeManage.dll and b/TradeManage/obj/Debug/TradeManage.dll differ diff --git a/TradeManage/obj/Debug/TradeManage.pdb b/TradeManage/obj/Debug/TradeManage.pdb index 193f96e..eec8bdd 100644 Binary files a/TradeManage/obj/Debug/TradeManage.pdb and b/TradeManage/obj/Debug/TradeManage.pdb differ diff --git a/TradeManageNew/Huowu/TemuOrderGoodsFee.aspx b/TradeManageNew/Huowu/TemuOrderGoodsFee.aspx index cddec49..61ae3d9 100644 --- a/TradeManageNew/Huowu/TemuOrderGoodsFee.aspx +++ b/TradeManageNew/Huowu/TemuOrderGoodsFee.aspx @@ -34,11 +34,16 @@ var datagrid1 = new nblf.ui.DataGrid("DataGrid1"); var WindowLoadModel = new WindowLoad(); - var DId = 0; + $(document).ready(function () { WindowLoadModel.ApplicationPath = "../"; WindowLoadModel.Load(); ajaxInit(WindowLoadModel); + var sku = $.url.param("SKU"); + $("#txt_Name").val(sku); + if (sku == undefined) { + $("#txt_Name").val(""); + } CreateDataGrid(); ReadData(); diff --git a/TradeManageNew/bin/TradeManageNew.dll b/TradeManageNew/bin/TradeManageNew.dll index d5c2d2b..94725c1 100644 Binary files a/TradeManageNew/bin/TradeManageNew.dll and b/TradeManageNew/bin/TradeManageNew.dll differ diff --git a/TradeManageNew/bin/TradeManageNew.pdb b/TradeManageNew/bin/TradeManageNew.pdb index cba6964..ad2be9b 100644 Binary files a/TradeManageNew/bin/TradeManageNew.pdb and b/TradeManageNew/bin/TradeManageNew.pdb differ diff --git a/TradeManageNew/obj/Debug/TradeManageNew.dll b/TradeManageNew/obj/Debug/TradeManageNew.dll index d5c2d2b..94725c1 100644 Binary files a/TradeManageNew/obj/Debug/TradeManageNew.dll and b/TradeManageNew/obj/Debug/TradeManageNew.dll differ diff --git a/TradeManageNew/obj/Debug/TradeManageNew.pdb b/TradeManageNew/obj/Debug/TradeManageNew.pdb index cba6964..ad2be9b 100644 Binary files a/TradeManageNew/obj/Debug/TradeManageNew.pdb and b/TradeManageNew/obj/Debug/TradeManageNew.pdb differ