diff --git a/TradeManageNew/DingDan/DT_OrderReturn.aspx b/TradeManageNew/DingDan/DT_OrderReturn.aspx
index bd61010..f280f14 100644
--- a/TradeManageNew/DingDan/DT_OrderReturn.aspx
+++ b/TradeManageNew/DingDan/DT_OrderReturn.aspx
@@ -324,13 +324,16 @@
col.CellFormatter = function (value) {
switch (value) {
case "1": return "Restock";
- case "4": return "Sale";
+ case "4": return "Sale";
case "2": return "CTN change";
case "3": return "Scrap";
- case "5": return "Claim";
- default: return "";
+ case "5": return "Claim";
+ case "6": return `Empty box`;
+ case "7": return `Different item`;
+ case "8": return `No item`;
+ default: return "";
}
- };
+ };
Array.add(datagrid1.Columns, col);
col = new nblf.ui.DataGridColumn();
col.HeaderText = "Return PostionCode";
@@ -406,7 +409,6 @@
var param = new Object();
param.ShopId = $("#select_shop").val();
- param.InType = "0";
param.ScanState = ScanState;// $("#select_scanstate").val();
param.OrderCode = $("#txt_OrderCode").val();
param.SKU = $("#txt_SKU").val();
@@ -426,6 +428,7 @@
param.trackcz = $("#select_tracking").val();
param.changestate = $("#select_changestate").val();
param.warehouse = $("#select_warehouse").val();
+ param.InType = $("#select_InType").val();
param.PageSize = datagrid1.Get_PageSize();
param.PageIndex = datagrid1.Get_PageIndex();
@@ -739,9 +742,6 @@
|
|
-
- |
-
@@ -775,10 +775,21 @@
-
- | |
-
- |
+
+ InType: |
+
+
+ |
WareHouse: |
|
+
+
+ |
+
+
+ |
+
diff --git a/TradeManageNew/DingDan/DT_SecondHand2.aspx b/TradeManageNew/DingDan/DT_SecondHand2.aspx
index 9ddf444..ea95b31 100644
--- a/TradeManageNew/DingDan/DT_SecondHand2.aspx
+++ b/TradeManageNew/DingDan/DT_SecondHand2.aspx
@@ -79,10 +79,42 @@ DingDan/DD_OrderListForTM2.aspx
justify-self: flex-start;
align-items: flex-start;
}
+
+ @media print {
+ @page {
+ margin: 0;
+ }
+ body * {
+ visibility: hidden;
+ }
+ #printArea, #printArea * {
+ visibility: visible;
+ width: 100% !important;
+ height:unset !important;
+ max-width: 100vw;
+ max-height: 100vh;
+ aspect-ratio: 900 / 660;
+ object-fit: cover;
+ }
+ #printArea {
+ position: absolute;
+ left: 0;
+ bottom: 0;
+ right: 0;
+ top: 0;
+ max-width: 100vw;
+ max-height: 100vh;
+ overflow: hidden;
+ page-break-after: avoid;
+ display:flex;
+ justify-content:center;
+ }
+ }
+
@@ -145,6 +177,26 @@ DingDan/DD_OrderListForTM2.aspx
num = num - 1;
$("#a_select").html("已选中" + num + "条");
});
+
+
+ $("#" + datagrid1.TableID + " [CommandName='cmdImg']").live("click", function () {
+ var RowIndex = $(this).parentsUntil("tr").parent().attr("index");
+ var model = datagrid1.Get_Model(RowIndex);
+ $("#img_1").attr("src", model.ImageUrls[0]);
+ $("#div_img").empty();
+ model.ImageUrls.forEach(pic=>{
+ $("#div_img").append("![](../" + pic + ")
");
+ })
+ $.fancybox({
+ 'width': '40%',
+ 'height': '40%',
+ 'autoScale': false,
+ 'transitionIn': 'elastic',
+ 'transitionOut': 'elastic',
+ 'href': '#test3',
+ 'onComplete': function () {}
+ });
+ });
});
// 初始化DataGrid
@@ -172,7 +224,7 @@ DingDan/DD_OrderListForTM2.aspx
col = new nblf.ui.DataGridColumn();
col.HeaderText = "Photo";
- col.CellTemplate = "
";
+ col.CellTemplate = "";
Array.add(datagrid1.Columns, col);
var col = new nblf.ui.DataGridColumn();
@@ -256,7 +308,7 @@ DingDan/DD_OrderListForTM2.aspx
col.Width = "100px";
col.CellTemplate = "{Bind orginData}";
col.CellFormatter = function (data) {
- var OptionStr = "";
+ var OptionStr = "";
var status = data.Status
switch (status) {
case 1:
@@ -322,6 +374,7 @@ DingDan/DD_OrderListForTM2.aspx
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] : ""
@@ -442,6 +495,27 @@ DingDan/DD_OrderListForTM2.aspx
}
//#endregion
+ //#region 打印条码图片
+ async function PrintBarcode(obj) {
+ var rowindex = $(obj).parent().parent().attr("index");
+ var model = datagrid1.Get_Model(rowindex);
+ model.date = formatDate(model.CreationTime)
+ console.log(model)
+ const canvas = await generateImage(model);
+ document.getElementById('printArea').appendChild(canvas);
+ window.print()
+ document.getElementById('printArea').removeChild(canvas);
+ //$(canvas).print()
+
+ //SelectList = [obj]
+ //var printedIds = SelectList.map(it => it.Id)
+ //var uploadIds = SelectList.filter(it => it.Status == 1).map(it => it.Id)
+ //BatChangeIsPrinted(printedIds);
+ //generateAndDownload(SelectList)
+ //BatUploadGoods(uploadIds);
+ }
+ //#endregion
+
//#region 批量修改打印状态
function BatChangeIsPrinted(Ids) {
var param = {
@@ -516,57 +590,48 @@ DingDan/DD_OrderListForTM2.aspx
}
// 生成条码图片
async function generateImage(item) {
- // 创建画布
+ // 创建画布 - 使用A4横向比例
const canvas = document.createElement('canvas');
- canvas.width = 900;
- canvas.height = 660;
+ canvas.width = 1000;
+ canvas.height = 707;
const ctx = canvas.getContext('2d');
// 填充白色背景
ctx.fillStyle = 'white';
ctx.fillRect(0, 0, canvas.width, canvas.height);
- // 添加SKU
+ // 添加SKU到左上角
ctx.fillStyle = 'black';
- ctx.font = '48px SimHei';
- ctx.fillText(item.SkuCode, 30, 60);
+ ctx.font = '56px SimHei';
+ ctx.fillText(item.SkuCode, 50, 80);
- // 添加日期，右对齐
- ctx.font = '40px SimHei';
- const dateWidth = ctx.measureText(item.date).width; // 测量文本宽度
- ctx.fillText(item.date, canvas.width - 30 - dateWidth, 60); // 从右边缘减去文本宽度和边距
+ // 添加更大更粗的BarCode文字在正中央
+ ctx.font = 'bold 200px SimHei';
+ const codeText = item.BarCode;
+ const codeWidth = ctx.measureText(codeText).width;
+ const centerX = (canvas.width - codeWidth) / 2;
+ const centerY = (canvas.height + 100) / 2;
+ ctx.fillText(codeText, centerX, centerY);
- // 生成条形码
+ // 生成缩小的条形码
const barcodeCanvas = document.createElement('canvas');
JsBarcode(barcodeCanvas, item.BarCode, {
format: "CODE128",
- width: 6,
- height: 300,
- displayValue: true,
- fontSize: 48,
+ width: 3,
+ height: 100,
+ displayValue: false,
+ fontSize: 20,
fontOptions: "bold",
- textMargin: 10,
+ textMargin: 0,
font: "SimHei"
});
- // 将条形码绘制到主画布
- ctx.drawImage(barcodeCanvas, 150, 120);
+ // 将条形码绘制到右下角
+ ctx.drawImage(barcodeCanvas, canvas.width - barcodeCanvas.width - 50, canvas.height - 180);
- // 添加物流跟踪号
- ctx.font = '40px SimHei';
- ctx.fillText(`${item.TrackingCode}`, 30, 560);
-
- // 添加分割线
- ctx.beginPath();
- ctx.moveTo(30, 580);
- ctx.lineTo(870, 580);
- ctx.strokeStyle = 'black';
- ctx.lineWidth = 3;
- ctx.stroke();
-
- // 添加提示文字
- ctx.font = '35px Arial';
- ctx.fillText('Notice: This product cannot be returned or exchanged', 30, 630);
+ // 添加物流追踪号在左下角
+ ctx.font = '56px SimHei';
+ ctx.fillText(item.TrackingCode, 50, canvas.height - 75);
return canvas;
}
@@ -832,6 +897,25 @@ DingDan/DD_OrderListForTM2.aspx
+
+
+
+
+
+
+ ![]()
+ |
+
+
+ |
+ 图片：
+ |
+ |
+
+
+