diff --git a/TradeManage/bin/TradeManageNew.dll b/TradeManage/bin/TradeManageNew.dll index 72c7e5f..94db7c3 100644 Binary files a/TradeManage/bin/TradeManageNew.dll and b/TradeManage/bin/TradeManageNew.dll differ diff --git a/TradeManageNew/HuoWuServiceNew.asmx.cs b/TradeManageNew/HuoWuServiceNew.asmx.cs index 6e021da..28836c2 100644 --- a/TradeManageNew/HuoWuServiceNew.asmx.cs +++ b/TradeManageNew/HuoWuServiceNew.asmx.cs @@ -7682,6 +7682,16 @@ namespace TradeManageNew } #endregion + + [WebMethod(EnableSession = true)] + public List GetTemuOrderFromSKU(string sku) + { + PagesNew.Login(this.Session); + var datas = DataNew.GetTemuOrderFromSKU(sku); + + return datas; + } + } } diff --git a/TradeManageNew/Huowu/HW_TemuGoodsFee.aspx b/TradeManageNew/Huowu/HW_TemuGoodsFee.aspx index 56f1b70..be82987 100644 --- a/TradeManageNew/Huowu/HW_TemuGoodsFee.aspx +++ b/TradeManageNew/Huowu/HW_TemuGoodsFee.aspx @@ -69,91 +69,12 @@ ReadShopList(snames); }); }); - function ReadGroup() { - if(UserId==1||UserId==51||UserId==53) - $("#select_groupname").append(""); - $.ajax({ - url: "../SysManageServiceNew.asmx/GetListUserInfoFromGroup", - // data: Sys.Serialization.JavaScriptSerializer.serialize(param), - async: false, - success: function (data) { - - - $(data.d).each(function () { - - $("#select_groupname").append(""); - - }); - - - } - }); - } - - function ReadUser() { - $("#select_name").empty(); - if(UserId==1||UserId==51||UserId==53) - $("#select_name").append(""); - var param = new Object(); - - - param.groupid = $("#select_groupname").val(); - $.ajax({ - url: "../SysManageServiceNew.asmx/GetListUserInfoFromGroup3", - data: Sys.Serialization.JavaScriptSerializer.serialize(param), - async: false, - success: function (data) { - - - $(data.d).each(function () { - //if(UserId!=1&&UserId!=51&&this.UserId==UserId&&UserId!=53) - // $("#select_name").append(""); - // else - // if(UserId==1||UserId==51||UserId==53) - $("#select_name").append(""); - - }); - if(UserId!=1&&UserId!=51&&UserId!=53) - $("#select_name").val(UserId); - - } - }); - } - - - //#region 读取分类 + + - function ReadShopList(ShopNames) { - $("#div_shopnames").empty(); - var param = new Object(); - - - param.ShopNames = ShopNames; - - - $.ajax({ - url: "../HuoWuServiceNew.asmx/GetZTShopList", - data: Sys.Serialization.JavaScriptSerializer.serialize(param), - async: true, - success: function (data) { - - if (data.d != null) { - - $(data.d).each(function () { - if (this.IsCheck == true) - $("#div_shopnames").append(""+this.ShopName); - else - $("#div_shopnames").append(""+this.ShopName); - }); - - } - } - }); - } - //#endregion - + function GetImage(Ids) { @@ -200,118 +121,76 @@ function CreateDataGrid() { Array.clear(datagrid1.Columns); var col = new nblf.ui.DataGridColumn(); - col.HeaderText = "缩略图"; - col.CellTemplate = ""; + col.HeaderText = "SKU"; + col.CellTemplate = "{Bind SKU1}"; Array.add(datagrid1.Columns, col); col = new nblf.ui.DataGridColumn(); - col.HeaderText = "货物SKU"; + col.HeaderText = "店铺"; col.Width = "150px"; col.Align = "left"; - col.CellTemplate = "{Bind SKU1}"; + col.CellTemplate = "{Bind ShopName}"; Array.add(datagrid1.Columns, col); col = new nblf.ui.DataGridColumn(); - col.HeaderText = "人员"; - col.CellTemplate = "
{Bind mname}
"; + col.HeaderText = "订单号"; + col.CellTemplate = "{Bind PlatOrderCode}"; // col.SortExpression = "b.GoodsInNum"; Array.add(datagrid1.Columns, col); col = new nblf.ui.DataGridColumn(); - col.HeaderText = "组长"; - col.CellTemplate = "
{Bind groupname}
"; + col.HeaderText = "订单日期"; + col.CellTemplate = "
{Bind InDate}
"; // col.SortExpression = "b.GoodsInNum"; Array.add(datagrid1.Columns, col); col = new nblf.ui.DataGridColumn(); - col.HeaderText = "最长出单周期(天)"; - col.CellTemplate = "{Bind OutDays2}"; + col.HeaderText = "订单金额$"; + col.CellTemplate = "{Bind TotalPrice}"; // col.SortExpression = "b.GoodsInNum"; Array.add(datagrid1.Columns, col); col = new nblf.ui.DataGridColumn(); - col.HeaderText = "前期定价$"; - col.CellTemplate = "{Bind Price}"; + col.HeaderText = "佣金$"; + col.CellTemplate = "{Bind yj}"; // col.SortExpression = "InPrice"; Array.add(datagrid1.Columns, col); - col = new nblf.ui.DataGridColumn(); - col.HeaderText = "稳定定价"; - col.CellTemplate = "{Bind Price2}"; - // col.SortExpression = "b.GoodsInNum"; - Array.add(datagrid1.Columns, col); - col = new nblf.ui.DataGridColumn(); - col.HeaderText = "第一名销量"; - col.CellTemplate = "{Bind Num}"; - // col.SortExpression = "b.GoodsInNum"; - Array.add(datagrid1.Columns, col); - col = new nblf.ui.DataGridColumn(); - col.HeaderText = "定价$"; - col.CellTemplate = "{Bind Price3}"; - // col.SortExpression = "b.GoodsInNum"; - Array.add(datagrid1.Columns, col); - col = new nblf.ui.DataGridColumn(); - col.HeaderText = "目标销量"; - col.CellTemplate = "{Bind Num2}"; - // col.SortExpression = "b.GoodsInNum"; - Array.add(datagrid1.Columns, col); - - col = new nblf.ui.DataGridColumn(); - col.HeaderText = "定价$"; - col.CellTemplate = "{Bind Price4}"; - - - Array.add(datagrid1.Columns, col); - - col = new nblf.ui.DataGridColumn(); - col.HeaderText = "重推店铺"; - col.CellTemplate = "
{Bind ShopNames}
"; - col.Width = "150px"; - Array.add(datagrid1.Columns, col); - col = new nblf.ui.DataGridColumn(); - col.HeaderText = "计划"; - col.CellTemplate = "
{Bind PlanInfo}
"; - col.Width = "150px"; - Array.add(datagrid1.Columns, col); - col = new nblf.ui.DataGridColumn(); - col.HeaderText = "要求"; - col.CellTemplate = "
{Bind AdviseInfo}
"; - col.Width = "150px"; - Array.add(datagrid1.Columns, col); - - col = new nblf.ui.DataGridColumn(); - col.HeaderText = "备注"; - col.CellTemplate = "
{Bind Remark}
"; - col.Width = "150px"; - Array.add(datagrid1.Columns, col); - - col = new nblf.ui.DataGridColumn(); - col.HeaderText = "周销量 | 金额"; - col.CellTemplate = "{Bind GoodsWeekHJNum}|{Bind GoodsWeekHJPrice}"; - // col.SortExpression = "b.GoodsInNum"; - Array.add(datagrid1.Columns, col); - col = new nblf.ui.DataGridColumn(); - col.HeaderText = "月销量|金额"; - col.CellTemplate = "{Bind GoodsHJNum2}|{Bind GoodsMonthHJPrice}"; - // col.SortExpression = "b.GoodsInNum"; - Array.add(datagrid1.Columns, col); - col = new nblf.ui.DataGridColumn(); - col.HeaderText = "未出单天数(天)"; - col.CellTemplate = "{Bind NoOutDays}"; - // col.SortExpression = "b.GoodsInNum"; + col = new nblf.ui.DataGridColumn(); + col.HeaderText = "运费$"; + col.CellTemplate = "{Bind sjyf}"; + // col.SortExpression = "InPrice"; + Array.add(datagrid1.Columns, col); + col = new nblf.ui.DataGridColumn(); + col.HeaderText = "货物成本$"; + col.CellTemplate = "{Bind cb}"; + // col.SortExpression = "InPrice"; + Array.add(datagrid1.Columns, col); + col = new nblf.ui.DataGridColumn(); + col.HeaderText = "货物税费$"; + col.CellTemplate = "{Bind hwsf}"; + // col.SortExpression = "InPrice"; + Array.add(datagrid1.Columns, col); + col = new nblf.ui.DataGridColumn(); + col.HeaderText = "仓储费$"; + col.CellTemplate = "{Bind ck}"; + // col.SortExpression = "InPrice"; + Array.add(datagrid1.Columns, col); + col = new nblf.ui.DataGridColumn(); + col.HeaderText = "头程$"; + col.CellTemplate = "{Bind sjtc}"; + // col.SortExpression = "InPrice"; + Array.add(datagrid1.Columns, col); + col = new nblf.ui.DataGridColumn(); + col.HeaderText = "利润$"; + col.CellTemplate = "{Bind lr}"; + // col.SortExpression = "InPrice"; Array.add(datagrid1.Columns, col); - col = new nblf.ui.DataGridColumn(); - - col.HeaderText = "操作"; - col.Width = "80px"; - col.CellTemplate = "填写"; - Array.add(datagrid1.Columns, col); - datagrid1.SetPageSize(20); datagrid1.SetPageIndex(1); // datagrid1.SortExpression = "b.GoodsCode,b.Indate"; // datagrid1.ViewSortDirection = "ASC"; - datagrid1.IsFixHeader = true; - datagrid1.Height = $(document).height() - 230; - datagrid1.ShowIndexColumn = false; - datagrid1.AllowPaging = true; + datagrid1.IsFixHeader = false; + /* datagrid1.Height = $(document).height() - 230;*/ + datagrid1.ShowIndexColumn = true; + datagrid1.AllowPaging = false; datagrid1.Width = "100%"; //datagrid1.Sorting(function () { @@ -319,7 +198,7 @@ //}); datagrid1.SelectMode = nblf.ui.SelectMode.None; datagrid1.Init(); - datagrid1.add_PageIndexChanged(function () { ReadData(); }); + // datagrid1.add_PageIndexChanged(function () { ReadData(); }); } function AddTr() { @@ -350,333 +229,52 @@ function ReadData() { - $("#_fixTableHeader").show(); + var param = new Object(); - CreateWhere("SelectHtml", param); //读取查询条件 - param.PageSize = datagrid1.Get_PageSize(); - param.PageIndex = datagrid1.Get_PageIndex(); - param.cs += " and b.State=1 and d.deptid=1 and d.state=1 and a.SKU1 not like 's-%' "; - param.cs = Base64.encode(param.cs); + param.sku = $("#txt_Name").val(); WindowLoadModel.Show(); $.ajax({ - url: "../HuoWuServiceNew.asmx/GetListGoodsUserPlanCount", + url: "../HuoWuServiceNew.asmx/GetTemuOrderFromSKU", data: Sys.Serialization.JavaScriptSerializer.serialize(param), success: function (data) { WindowLoadModel.Hide(); - datagrid1.Set_RowCount(data.d.RowCount); - datagrid1.DataBind(data.d.DataSource); - AddTr(); - } - }); - } - //#endregion - //#region 删除 - function DelCol(obj) { - if (window.confirm('确定要删除吗？') == false) return; - var rowindex = $(obj).parent().parent().attr("index"); - var param = new Object(); - var model = datagrid1.Get_Model(rowindex); - param.GoodsId = model.GoodsId; - - $.ajax({ - url: "HuoWuService.asmx/DeleteGoodsInfo", - data: Sys.Serialization.JavaScriptSerializer.serialize(param), - dataType: "json", - success: function (data) { - if (data.d == 0) { - alert("删除成功"); - ReadData(); - } - else { - alert("该货物有库存或者有订单匹配或者有采购单匹配，无法删除"); - - } - } - }); - - - } - - function UpdateGoodsSafeNum() { - - datagrid2.UpdateDataSource(); - var param = new Object(); - - param.list = datagrid2.DataSource; - - $.ajax({ - url: "HuoWuService.asmx/UpdateGoodsSafeNum", - data: Sys.Serialization.JavaScriptSerializer.serialize(param), - dataType: "json", - success: function (data) { - - alert("备货成功"); - ReadData(); - - $.fancybox.close(); - } - }); - - - } - - - var Model = null; - function Save() { - - - var param = new Object(); - Model.DetailId = Model.Id; - Model.Id = 0; - if( $("#txt_OutDays2").val()!="") - Model.OutDays2 = $("#txt_OutDays2").val(); - if( $("#txt_Price").val()!="") - Model.Price = $("#txt_Price").val(); - if( $("#txt_Price2").val()!="") - Model.Price2 = $("#txt_Price2").val(); - if( $("#txt_Price3").val()!="") - Model.Price3 = $("#txt_Price3").val(); - if( $("#txt_Price4").val()!="") - Model.Price4 = $("#txt_Price4").val(); - if( $("#txt_Num").val()!="") - Model.Num = $("#txt_Num").val(); - if( $("#txt_Num2").val()!="") - Model.Num2 = $("#txt_Num2").val(); - Model.PlanInfo=$("#txt_PlanInfo").val(); - Model.AdviseInfo=$("#txt_AdviseInfo").val(); - Model.Remark = $("#txt_Remark").val(); - var snames = ""; - $("input[spid]").each(function () { - if ($(this).is(":checked") == true) - snames += $(this).attr("sname")+","; - }); - Model.ShopNames = snames; - param.Model =Model; - - $.ajax({ - url: "../HuoWuServiceNew.asmx/Save_GoodsUserPlanCount", - data: Sys.Serialization.JavaScriptSerializer.serialize(param), - dataType: "json", - success: function (data) { - - alert("保存成功"); - $.fancybox.close(); - ReadData(); - } - }); - - - } - function SaveXP() { - var list = datagrid4.GetSelectListModel(); - if (list == null || list.length == 0) { - alert("请选择一个货物"); - return; - } - if (list[0].IsAdd == 1) { - alert("该选品货物已经添加过编号，不能新增"); - return; - } - window.parent.addTab("货物编辑", "HuoWu/HW_GoodsAddForTM.aspx?Title=货物信息&GoodsId=0&XPId=" + list[0].Id + "&LinkUrl=" + list[0].LinkUrl, true); - } - - function DeleteXP() { - var list = datagrid4.GetSelectListModel(); - if (list == null || list.length == 0) { - alert("请选择一个货物"); - return; - } - - if (window.confirm('确定要删除该记录吗？') == false) return; - - var param = new Object(); - param.Id = list[0].Id; - $.ajax({ - url: "../BaseData.asmx/DeleteXP", - data: Sys.Serialization.JavaScriptSerializer.serialize(param), - dataType: "json", - success: function (data) { - - alert("删除成功"); - ReadData(); - + datagrid1.DataBind(data.d); + } }); } - - function SyncPrice() { - var price = 0; - $("input[ColName='Price']").each(function () { - if (price == 0 && $(this).val() != "") - price = $(this).val(); - - - - }); - if (price > 0) - $("input[ColName='Price']").val(price); - } - - //#endregion +
- 货物SKU
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 最长出单周期： - - 天 - -
- 前期定价： - - $ - - 稳定定价： - - $ -
- 第一名销量： - - - - 定价： - - $ -
- 目标销量： - - - - 定价： - - $ -
- 重推店铺： - -
-
- 计划： - - - -
- 要求： - - - -
- 备注： - - - -
- -
-
- -
+ Temu订单分析 + - - - - + + + - - - - - - - + + + + - - -
+ SKU: - - - - - 分组/人员： - - - 组 - -
- 未出单天数： - - -   - -   -  
+ 总数量： 已售数量： 剩余数量： 总利润： +
+
+ overflow: auto;height:500px">