From 267621872fb97d8bd6e9d58b406071499e948c24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= Date: Tue, 9 Aug 2022 00:05:05 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF=E9=87=8C=E5=8A=A0?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=BC=96=E5=8F=B7=EF=BC=8C=E6=96=B9=E4=BE=BF?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=A4=9A=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B?= =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E4=BB=A5=E8=8E=B7=E5=8F=96=E5=88=B0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E8=B4=AD=E4=B9=B0=E5=95=86=E5=93=81=E5=BA=8F?= =?UTF-8?q?=E5=88=97=EF=BC=8C=E5=8E=BB=E7=9B=B4=E6=8E=A5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=95=86=E5=93=81=E4=BF=A1=E6=81=AF=E3=80=82=20=E3=80=90?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=AF=E6=8C=89=E5=BA=8F=E5=88=97=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=9A=84=E7=AD=9B=E9=80=89=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Good/CoreCmsGoodsController.cs | 3 +++ .../Controllers/Order/CoreCmsOrderController.cs | 8 ++++---- CoreCms.Net.Web.Admin/wwwroot/views/good/goods/index.html | 5 +++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsController.cs b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsController.cs index 52953052..c71c313b 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsController.cs @@ -230,6 +230,9 @@ namespace CoreCms.Net.Web.Admin.Controllers }; //查询筛选 + //商品序列 + var id = Request.Form["id"].FirstOrDefault().ObjectToInt(0); + if (id > 0) @where = @where.And(p => p.id == id); //商品编码 nvarchar var bn = Request.Form["bn"].FirstOrDefault(); if (!string.IsNullOrEmpty(bn)) @where = @where.And(p => p.bn.Contains(bn)); diff --git a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs index 7b9fcd60..fc185d3b 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs @@ -930,7 +930,7 @@ namespace CoreCms.Net.Web.Admin.Controllers items.Add(new CellValueItem() { name = "支付方式", width = 12 }); items.Add(new CellValueItem() { name = "支付时间", width = 20 }); - items.Add(new CellValueItem() { name = "货品名称", width = 40 }); + items.Add(new CellValueItem() { name = "货品名称", width = 50 }); items.Add(new CellValueItem() { name = "数量", width = 12 }); items.Add(new CellValueItem() { name = "单价", width = 12 }); items.Add(new CellValueItem() { name = "优惠", width = 12 }); @@ -1021,7 +1021,7 @@ namespace CoreCms.Net.Web.Admin.Controllers rowTemp.CreateCell(10).SetCellValue(order.paymentTime.ToString()); - rowTemp.CreateCell(11).SetCellValue(!string.IsNullOrEmpty(t.addon) ? t.addon : t.name); + rowTemp.CreateCell(11).SetCellValue(!string.IsNullOrEmpty(t.addon) ? "【" + t.goodsId + "】" + t.addon : "【" + t.goodsId + "】" + t.name); rowTemp.CreateCell(12).SetCellValue(t.nums); rowTemp.CreateCell(13).SetCellValue(t.price + "元"); rowTemp.CreateCell(14).SetCellValue(t.promotionAmount + "元"); @@ -1335,7 +1335,7 @@ namespace CoreCms.Net.Web.Admin.Controllers items.Add(new CellValueItem() { name = "支付方式", width = 12 }); items.Add(new CellValueItem() { name = "支付时间", width = 20 }); - items.Add(new CellValueItem() { name = "货品名称", width = 40 }); + items.Add(new CellValueItem() { name = "货品名称", width = 50 }); items.Add(new CellValueItem() { name = "数量", width = 12 }); items.Add(new CellValueItem() { name = "单价", width = 12 }); items.Add(new CellValueItem() { name = "优惠", width = 12 }); @@ -1426,7 +1426,7 @@ namespace CoreCms.Net.Web.Admin.Controllers rowTemp.CreateCell(10).SetCellValue(order.paymentTime.ToString()); - rowTemp.CreateCell(11).SetCellValue(!string.IsNullOrEmpty(t.addon) ? t.addon : t.name); + rowTemp.CreateCell(11).SetCellValue(!string.IsNullOrEmpty(t.addon) ? "【" + t.goodsId + "】" + t.addon : "【" + t.goodsId + "】" + t.name); rowTemp.CreateCell(12).SetCellValue(t.nums); rowTemp.CreateCell(13).SetCellValue(t.price + "元"); rowTemp.CreateCell(14).SetCellValue(t.promotionAmount + "元"); diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/index.html index 208e62a5..481bac89 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/index.html @@ -53,6 +53,11 @@