From d89f6ffb3ed87afb85d37e0c66eecb56ef18a545 Mon Sep 17 00:00:00 2001 From: zhougf Date: Sat, 27 Sep 2025 23:51:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(PrintConfig):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A8=A1=E6=9D=BF=E8=AE=BE=E8=AE=A1=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E7=9B=B8=E5=85=B3=E8=A7=86?= =?UTF-8?q?=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除TestData字段的Required验证 - 将Template字段从textbox改为textarea以支持多行输入 - 添加打印模板设计界面,支持拖拽元素和自定义纸张 - 新增GetTemplateByName接口用于获取模板 - 优化视图布局,统一使用单列显示 --- .../Controllers/PrintConfigController.cs | 8 + .../Configs/Views/Container/Index.cshtml | 18 ++ .../Configs/Views/PrintConfig/Create.cshtml | 181 +++++++++++++++++- .../Configs/Views/PrintConfig/Design.cshtml | 2 +- .../Configs/Views/PrintConfig/Edit.cshtml | 4 +- .../Configs/Views/PrintConfig/Index.cshtml | 2 +- HHWMS.Web/Models/Configs/PrintConfig.cs | 1 - 7 files changed, 208 insertions(+), 8 deletions(-) diff --git a/HHWMS.Web/Areas/Configs/Controllers/PrintConfigController.cs b/HHWMS.Web/Areas/Configs/Controllers/PrintConfigController.cs index 03a1e42..0f46b2d 100644 --- a/HHWMS.Web/Areas/Configs/Controllers/PrintConfigController.cs +++ b/HHWMS.Web/Areas/Configs/Controllers/PrintConfigController.cs @@ -7,6 +7,7 @@ using WalkingTec.Mvvm.Core.Extensions; using HHWMS.Web; using System.DirectoryServices.Protocols; using System.Web; +using HHWMS.Web.Models; namespace HHWMS.Web.Controllers { @@ -236,5 +237,12 @@ namespace HHWMS.Web.Controllers var vm = Wtm.CreateVM(id); return PartialView(vm); } + + [ActionDescription("Sys.Search")] + public IActionResult GetTemplateByName(string name) + { + var template = _unitWork.FindSingle(x => x.Name == name).Template; + return JsonMore(template); + } } } diff --git a/HHWMS.Web/Areas/Configs/Views/Container/Index.cshtml b/HHWMS.Web/Areas/Configs/Views/Container/Index.cshtml index cff1814..25de020 100644 --- a/HHWMS.Web/Areas/Configs/Views/Container/Index.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Container/Index.cshtml @@ -19,6 +19,24 @@ + + + +
+
+ +
+
+ + +
+
+ +
+
+ +
+ +
+ +
+ +
+ +
+ + +
+
+
+
+ + diff --git a/HHWMS.Web/Areas/Configs/Views/PrintConfig/Design.cshtml b/HHWMS.Web/Areas/Configs/Views/PrintConfig/Design.cshtml index e391de7..f5d89eb 100644 --- a/HHWMS.Web/Areas/Configs/Views/PrintConfig/Design.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/PrintConfig/Design.cshtml @@ -2,7 +2,7 @@ @inject IStringLocalizer Localizer; - + diff --git a/HHWMS.Web/Areas/Configs/Views/PrintConfig/Edit.cshtml b/HHWMS.Web/Areas/Configs/Views/PrintConfig/Edit.cshtml index 3e52b71..d792128 100644 --- a/HHWMS.Web/Areas/Configs/Views/PrintConfig/Edit.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/PrintConfig/Edit.cshtml @@ -2,9 +2,9 @@ @inject IStringLocalizer Localizer; - + - + diff --git a/HHWMS.Web/Areas/Configs/Views/PrintConfig/Index.cshtml b/HHWMS.Web/Areas/Configs/Views/PrintConfig/Index.cshtml index d563b0d..0b3abc7 100644 --- a/HHWMS.Web/Areas/Configs/Views/PrintConfig/Index.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/PrintConfig/Index.cshtml @@ -6,7 +6,7 @@ - +