diff --git a/TradeManageNew/DingDan/DT_SecondHand2.aspx b/TradeManageNew/DingDan/DT_SecondHand2.aspx index 83f813d..4640b9c 100644 --- a/TradeManageNew/DingDan/DT_SecondHand2.aspx +++ b/TradeManageNew/DingDan/DT_SecondHand2.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DT_SecondHand2.aspx.cs" Inherits="TradeManageNew.DingDan.DT_SecondHand2" %> +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DT_OrderReturn.aspx.cs" Inherits="TradeManageNew.DingDan.DT_OrderReturn" %> @@ -100,7 +100,10 @@ top: 0; max-width: 100vw; max-height: 100vh; + /* overflow: hidden; */ page-break-after: avoid; + /* display:flex; + justify-content:center; */ } #printArea *{ position: absolute; @@ -112,6 +115,8 @@ + + @@ -193,6 +198,26 @@ 'onComplete': function () {} }); }); + + + $("#" + datagrid1.TableID + " [CommandName='outboundImg']").live("click", function () { + var RowIndex = $(this).parentsUntil("tr").parent().attr("index"); + var model = datagrid1.Get_Model(RowIndex); + $("#img_1").attr("src", model.imgList[0]); + $("#div_img").empty(); + model.imgList.forEach(pic => { + $("#div_img").append(""); + }) + $.fancybox({ + 'width': '40%', + 'height': '40%', + 'autoScale': false, + 'transitionIn': 'elastic', + 'transitionOut': 'elastic', + 'href': '#test3', + 'onComplete': function () { } + }); + }); }); // 初始化DataGrid @@ -260,6 +285,10 @@ return "等待取货"; case 4: return "售卖完成"; + case 5: + return "使用配件"; + case 6: + return "现场出售"; default: return "-"; } @@ -268,6 +297,7 @@ var col = new nblf.ui.DataGridColumn(); col.HeaderText = "PublishMessage"; + col.Width = 200; col.CellTemplate = "{Bind PublishMessage}"; col.SortExpression = "c.PublishMessage"; Array.add(datagrid1.Columns, col); @@ -298,6 +328,26 @@ } Array.add(datagrid1.Columns, col); + var col = new nblf.ui.DataGridColumn(); + col.HeaderText = "Outbound TrackCode"; + col.CellTemplate = "{Bind outboundTrackCode}"; + col.SortExpression = "c.outboundTrackCode"; + Array.add(datagrid1.Columns, col); + + + col = new nblf.ui.DataGridColumn(); + col.HeaderText = "Outbound Photo"; + col.CellTemplate = `{Bind orginData}`; + col.CellFormatter = function (data) { + var imgList = data.imgList + if (imgList.length) { + return `` + } else { + return '' + } + } + Array.add(datagrid1.Columns, col); + //操作 col = new nblf.ui.DataGridColumn(); col.HeaderText = "操作"; @@ -368,15 +418,16 @@ $.ajax({ url: "../DD_OrderServiceNew.asmx/OrderUsedSalePlatformPage", data: Sys.Serialization.JavaScriptSerializer.serialize(param), - success: function (data) { + success: function (res) { WindowLoadModel.Hide(); - data.d.DataSource = data.d.DataSource ? data.d.DataSource : [] - data.d.DataSource.forEach(it=>{ - it.orginData = JSON.parse(JSON.stringify(it)) + data = res.d.DataSource ? res.d.DataSource : [] + data.forEach(it=>{ it.firstImg = it.ImageUrls && it.ImageUrls.length ? it.ImageUrls[0] : "" + it.imgList = it.imgList ? it.imgList.split(',') : [] + it.orginData = JSON.parse(JSON.stringify(it)) }) - datagrid1.Set_RowCount(data.d.RowCount); - datagrid1.DataBind(data.d.DataSource); + datagrid1.Set_RowCount(res.d.RowCount); + datagrid1.DataBind(data); $("#a_select").html(""); $("a[iul]").each(function () { var iul = $(this).attr("iul"); @@ -841,6 +892,8 @@ + + diff --git a/TradeManageNew/Huowu/HW_GoodsAddForTM.aspx b/TradeManageNew/Huowu/HW_GoodsAddForTM.aspx index 95783a2..632bce5 100644 --- a/TradeManageNew/Huowu/HW_GoodsAddForTM.aspx +++ b/TradeManageNew/Huowu/HW_GoodsAddForTM.aspx @@ -262,7 +262,14 @@ }); - + $("#" + datagrid1.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?SKU=" + 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/TradeManageNew/Huowu/HW_GoodsDetailList2TemuSku.aspx b/TradeManageNew/Huowu/HW_GoodsDetailList2TemuSku.aspx index 774bdc0..da8bf1c 100644 --- a/TradeManageNew/Huowu/HW_GoodsDetailList2TemuSku.aspx +++ b/TradeManageNew/Huowu/HW_GoodsDetailList2TemuSku.aspx @@ -294,7 +294,7 @@ var YYUserList = []; function GetYYUser() { var param = new Object(); - param.isShowAllGroup = 0; + param.isShowAllGroup = 1; $.ajax({ url: "../CangKuServerNew.asmx/GetList_YYUser", data: Sys.Serialization.JavaScriptSerializer.serialize(param), diff --git a/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx b/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx index b93c557..1a052fc 100644 --- a/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx +++ b/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx @@ -1,469 +1,566 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TemuShopGoodPriceNew.aspx.cs" Inherits="TradeManageNew.Huowu.TemuShopGoodPriceNew" %> - - - - - - - - Temu店铺商品活动 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
店铺SKU状态
- -
-
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
店铺SKUSPUID
基础价格
- -
-
-
- - - -
+ var error = CreateSaveModel("MainTable", Model); + if (error != "") { alert(error); return; } + Model.ShopId = $("#select_shops").val(); + error = datagrid2.UpdateDataSource(); + if (error != "") { alert(error); return; } + var param = new Object(); + param.Model = Model; + param.Model.ListModel = datagrid2.DataSource + WindowLoadModel.Show(); + if(EditType == 'edit'){ + $.ajax({ + url: "../DD_OrderServiceNew.asmx/update_TemuShopGoodActive", + data: Sys.Serialization.JavaScriptSerializer.serialize(param), + success: function (data) { + WindowLoadModel.Hide(); + ReadData(); + alert("保存成功"); + $.fancybox.close(); + } + }); + }else{ + $.ajax({ + url: "../DD_OrderServiceNew.asmx/Save_TemuShopGoodActive", + data: Sys.Serialization.JavaScriptSerializer.serialize(param), + success: function (data) { + WindowLoadModel.Hide(); + ReadData(); + alert("保存成功"); + $.fancybox.close(); + } + }); + } + } + //#endregion + //#region 显示弹出窗体 + function ShowFancybox(id) { + $.fancybox({ + 'scrolling': 'no', + 'autoScale': false, + 'transitionIn': 'elastic', + 'transitionOut': 'elastic', + 'href': '#' + id, + 'onClosed': function () { + } + }, 0); + } + //#endregion + + + //#region + function ajaxFileUpload() { + var filename = $("#fileToUpload").val(); + if (!filename.endsWith('.xls') && !filename.endsWith('.xlsx')) { alert("文件格式不正确"); return; } + $.ajaxFileUpload({ + url: '../GlobalAshx/AjaxFileUpdate.ashx?DirectoryName=ServerCookies', + secureuri: false, + fileElementId: 'fileToUpload', + dataType: 'json', + success: function (data, status) { + ImportGoods("ServerCookies/" + data.FileName); + }, + error: function (data, status, e) { + alert(e); + } + }); + } + //#endregion + + //#region + function ImportGoods(FileName) { + var param = new Object(); + param.filePath = FileName; + WindowLoadModel.Show(); + $.ajax({ + url: "../HuoWuServiceNew.asmx/ImportTemuHuoDongPrices", + data: Sys.Serialization.JavaScriptSerializer.serialize(param), + success: function (data) { + WindowLoadModel.Hide(); + if (data.d.Code == 0) { alert(data.d.Message); ReadData(); return; } + else { + ReadData(); + } + }, + error: function (xhr, status) { + if (status != "success") alert(xhr.responseText); + } + }); + } + //#endregion + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
店铺SKU状态
+ + + 导入数据： + + + + +
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
店铺SKUSKUID
基础价格
+ +
+
+
+ + + +
+ +
-
- - - + + \ No newline at end of file