From c322913e18c73f07aa9e47486b0e9a3b871ee30f Mon Sep 17 00:00:00 2001 From: fxc <541723947@qq.com> Date: Tue, 11 Feb 2025 15:36:30 +0800 Subject: [PATCH 1/2] 111 --- TradeManage/HuoWu/HW_GoodsDetailList2.aspx | 14 +- .../HuoWu/HW_GoodsDetailList2TemuSku.aspx | 215 ++++++++++++++++++ .../HuoWu/HW_GoodsDetailList2TemuSku.aspx.cs | 17 ++ ...W_GoodsDetailList2TemuSku.aspx.designer.cs | 17 ++ TradeManageNew/DingDan/DT_SecondHand2.aspx | 6 +- .../DingDan/DT_SecondHand2.aspx.designer.cs | 9 - 6 files changed, 262 insertions(+), 16 deletions(-) create mode 100644 TradeManage/HuoWu/HW_GoodsDetailList2TemuSku.aspx create mode 100644 TradeManage/HuoWu/HW_GoodsDetailList2TemuSku.aspx.cs create mode 100644 TradeManage/HuoWu/HW_GoodsDetailList2TemuSku.aspx.designer.cs diff --git a/TradeManage/HuoWu/HW_GoodsDetailList2.aspx b/TradeManage/HuoWu/HW_GoodsDetailList2.aspx index 6b56459..2890a57 100644 --- a/TradeManage/HuoWu/HW_GoodsDetailList2.aspx +++ b/TradeManage/HuoWu/HW_GoodsDetailList2.aspx @@ -1462,6 +1462,7 @@ datagrid4.add_PageIndexChanged(function () { GetXPData(); }); } + function GetXPData() { var param = new Object(); @@ -2026,7 +2027,6 @@ }); } - //#endregion //#endregion //取消采购计划 @@ -2058,6 +2058,12 @@ } }); } + //#endregion + + + function showTemuSku() { + window.open('/Huowu/HW_GoodsDetailList2TemuSku.aspx', '_blank') + } @@ -3100,7 +3106,11 @@ -    + +    +    +    + <%-- diff --git a/TradeManage/HuoWu/HW_GoodsDetailList2TemuSku.aspx b/TradeManage/HuoWu/HW_GoodsDetailList2TemuSku.aspx new file mode 100644 index 0000000..206012c --- /dev/null +++ b/TradeManage/HuoWu/HW_GoodsDetailList2TemuSku.aspx @@ -0,0 +1,215 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HW_GoodsDetailList2TemuSku.aspx.cs" Inherits="TradeManage.HuoWu.HW_GoodsDetailList2TemuSku" %> + + + + + + TemuSKU + + + + + + + + + + + + + + + + + + + + + + + + + +
+ TemuSKU +
+ + + + + +
+
+
+ + + + + + + + + diff --git a/TradeManage/HuoWu/HW_GoodsDetailList2TemuSku.aspx.cs b/TradeManage/HuoWu/HW_GoodsDetailList2TemuSku.aspx.cs new file mode 100644 index 0000000..6395da4 --- /dev/null +++ b/TradeManage/HuoWu/HW_GoodsDetailList2TemuSku.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace TradeManage.HuoWu +{ + public partial class HW_GoodsDetailList2TemuSku : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/TradeManage/HuoWu/HW_GoodsDetailList2TemuSku.aspx.designer.cs b/TradeManage/HuoWu/HW_GoodsDetailList2TemuSku.aspx.designer.cs new file mode 100644 index 0000000..a48fba2 --- /dev/null +++ b/TradeManage/HuoWu/HW_GoodsDetailList2TemuSku.aspx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace TradeManage.HuoWu +{ + + + public partial class HW_GoodsDetailList2TemuSku + { + } +} diff --git a/TradeManageNew/DingDan/DT_SecondHand2.aspx b/TradeManageNew/DingDan/DT_SecondHand2.aspx index 8659555..83f813d 100644 --- a/TradeManageNew/DingDan/DT_SecondHand2.aspx +++ b/TradeManageNew/DingDan/DT_SecondHand2.aspx @@ -1,6 +1,4 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DT_OrderReturn.aspx.cs" Inherits="TradeManageNew.DingDan.DT_OrderReturn" %> - -DingDan/DD_OrderListForTM2.aspx +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DT_SecondHand2.aspx.cs" Inherits="TradeManageNew.DingDan.DT_SecondHand2" %> @@ -114,8 +112,6 @@ DingDan/DD_OrderListForTM2.aspx - - diff --git a/TradeManageNew/DingDan/DT_SecondHand2.aspx.designer.cs b/TradeManageNew/DingDan/DT_SecondHand2.aspx.designer.cs index fef794e..33a5b4d 100644 --- a/TradeManageNew/DingDan/DT_SecondHand2.aspx.designer.cs +++ b/TradeManageNew/DingDan/DT_SecondHand2.aspx.designer.cs @@ -13,14 +13,5 @@ namespace TradeManageNew.DingDan public partial class DT_SecondHand2 { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; } } From cce87edd2ceace10affb2a9525a8a0292499cef8 Mon Sep 17 00:00:00 2001 From: fxc <541723947@qq.com> Date: Tue, 11 Feb 2025 16:49:39 +0800 Subject: [PATCH 2/2] 11 --- .../HuoWu/HW_GoodsDetailList2TemuSku.aspx | 56 ++++++------------- 1 file changed, 18 insertions(+), 38 deletions(-) diff --git a/TradeManage/HuoWu/HW_GoodsDetailList2TemuSku.aspx b/TradeManage/HuoWu/HW_GoodsDetailList2TemuSku.aspx index 206012c..c1d61d7 100644 --- a/TradeManage/HuoWu/HW_GoodsDetailList2TemuSku.aspx +++ b/TradeManage/HuoWu/HW_GoodsDetailList2TemuSku.aspx @@ -45,7 +45,7 @@ WindowLoadModel.Load(); ajaxInit(WindowLoadModel); CreateDataGrid(); - // ReadData(); + ReadData(); }); // 初始化DataGrid @@ -54,12 +54,12 @@ col = new nblf.ui.DataGridColumn(); col.HeaderText = "SKU"; - col.CellTemplate = "{Bind SKU}"; + col.CellTemplate = "{Bind GoodsCode}"; Array.add(datagrid1.Columns, col); col = new nblf.ui.DataGridColumn(); col.HeaderText = "分配的运营"; - col.CellTemplate = "{Bind SKU}"; + col.CellTemplate = "{Bind Name}"; Array.add(datagrid1.Columns, col); col = new nblf.ui.DataGridColumn(); @@ -69,62 +69,62 @@ col = new nblf.ui.DataGridColumn(); col.HeaderText = "售价"; - col.CellTemplate = "{Bind SKU}"; + col.CellTemplate = "{Bind JYPrice}"; Array.add(datagrid1.Columns, col); col = new nblf.ui.DataGridColumn(); col.HeaderText = "毛利"; - col.CellTemplate = "{Bind SKU}"; + col.CellTemplate = "{Bind GrossProfit}"; Array.add(datagrid1.Columns, col); col = new nblf.ui.DataGridColumn(); col.HeaderText = "前1天单量"; - col.CellTemplate = "{Bind SKU}"; + col.CellTemplate = "{Bind SaleNum1}"; Array.add(datagrid1.Columns, col); col = new nblf.ui.DataGridColumn(); col.HeaderText = "前2天单量"; - col.CellTemplate = "{Bind SKU}"; + col.CellTemplate = "{Bind SaleNum2}"; Array.add(datagrid1.Columns, col); col = new nblf.ui.DataGridColumn(); col.HeaderText = "前3天单量"; - col.CellTemplate = "{Bind SKU}"; + col.CellTemplate = "{Bind SaleNum3}"; Array.add(datagrid1.Columns, col); col = new nblf.ui.DataGridColumn(); col.HeaderText = "前7天单量"; - col.CellTemplate = "{Bind SKU}"; + col.CellTemplate = "{Bind SaleNum7}"; Array.add(datagrid1.Columns, col); col = new nblf.ui.DataGridColumn(); col.HeaderText = "前14天单量"; - col.CellTemplate = "{Bind SKU}"; + col.CellTemplate = "{Bind SaleNum14}"; Array.add(datagrid1.Columns, col); col = new nblf.ui.DataGridColumn(); col.HeaderText = "前一个月天单量"; - col.CellTemplate = "{Bind SKU}"; + col.CellTemplate = "{Bind SaleNum30}"; Array.add(datagrid1.Columns, col); col = new nblf.ui.DataGridColumn(); col.HeaderText = "总单量"; - col.CellTemplate = "{Bind SKU}"; + col.CellTemplate = "{Bind GoodsHJNum}"; Array.add(datagrid1.Columns, col); col = new nblf.ui.DataGridColumn(); col.HeaderText = "西仓库存"; - col.CellTemplate = "{Bind SKU}"; + col.CellTemplate = "{Bind LeftNumW}"; Array.add(datagrid1.Columns, col); col = new nblf.ui.DataGridColumn(); col.HeaderText = "东仓库存"; - col.CellTemplate = "{Bind SKU}"; + col.CellTemplate = "{Bind LeftNumE}"; Array.add(datagrid1.Columns, col); col = new nblf.ui.DataGridColumn(); col.HeaderText = "库龄"; - col.CellTemplate = "{Bind SKU}"; + col.CellTemplate = "{Bind PositionAge}"; Array.add(datagrid1.Columns, col); datagrid1.SetPageSize(50); @@ -152,40 +152,20 @@ // 读取数据 //#region 读取数据 function ReadData() { - var IsPrinted = $('#select_IsPrinted').val() == "-1" ? - null : $('#select_IsPrinted').val() == "1" ? - true : false - var Status = $('#select_Status').val() == "-1" ? - null : $('#select_Status').val() var param = { - PageIndex: datagrid1.Get_PageIndex(), PageSize: datagrid1.Get_PageSize(), - Code: $('#txt_SKU').val() || '', //SKU编码 - BarCode: $('#txt_BarCode').val() || '', //条码 - WarehousePositionCode: $('#txt_PositionCode').val() || '', //库位编码 - IsPrinted: IsPrinted, //是否已打印 - Status: Status, //状态 - }; + PageIndex: datagrid1.Get_PageIndex(), + } WindowLoadModel.Show(); $.ajax({ - url: "../DD_OrderServiceNew.asmx/OrderUsedSalePlatformPage", + url: "../OuterService/ShageService.ashx", data: Sys.Serialization.JavaScriptSerializer.serialize(param), success: function (data) { WindowLoadModel.Hide(); data.d.DataSource = data.d.DataSource ? data.d.DataSource : [] - data.d.DataSource.forEach(it => { - it.orginData = JSON.parse(JSON.stringify(it)) - it.firstImg = it.ImageUrls && it.ImageUrls.length ? it.ImageUrls[0] : "" - }) datagrid1.Set_RowCount(data.d.RowCount); datagrid1.DataBind(data.d.DataSource); - $("#a_select").html(""); - $("a[iul]").each(function () { - var iul = $(this).attr("iul"); - if (iul == "") - $(this).hide(); - }); } }); }