From 0abcf7c45e79e4b8b31d8a66a6cce808d734e2be Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Tue, 1 Mar 2022 10:15:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=9B=E7=94=9F/=E4=BA=BA=E4=BA=8B=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=B7=BB=E5=8A=A0=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LR_Desktop/Views/EnrollTemplate/Form.cshtml     | 13 +++++++++----
 .../Areas/LR_Desktop/Views/EnrollTemplate/Index.js  |  1 +
 .../Views/EnrollTemplate/IndexPersonnel.js          |  1 +
 .../EnrollTemplate/EnrollTemplateEntity.cs          |  7 +++++++
 .../EnrollTemplate/EnrollTemplateService.cs         |  2 +-
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/EnrollTemplate/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/EnrollTemplate/Form.cshtml
index bb441cdba..cb1d4981a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/EnrollTemplate/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/EnrollTemplate/Form.cshtml	
@@ -3,17 +3,22 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item"  data-table="EnrollTemplate" >
+    <div class="col-xs-12 lr-form-item" data-table="EnrollTemplate">
         <div class="lr-form-item-title">模板名称<font face="宋体">*</font></div>
         <input id="Name" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="EnrollTemplate" >
+    <div class="col-xs-12 lr-form-item" data-table="EnrollTemplate">
         <div class="lr-form-item-title">模板上传</div>
-        <div id="Path"  ></div>
+        <div id="Path"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="EnrollTemplate" >
+    <div class="col-xs-12 lr-form-item" data-table="EnrollTemplate">
         <div class="lr-form-item-title">是否启用</div>
         <div id="Enabled"></div>
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="EnrollTemplate">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height: 100px;" ></textarea>
+    </div>
+    
 </div>
 @Html.AppendJsFile("/Areas/LR_Desktop/Views/EnrollTemplate/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/EnrollTemplate/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/EnrollTemplate/Index.js
index d3ce19bca..0767dcee8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/EnrollTemplate/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/EnrollTemplate/Index.js	
@@ -101,6 +101,7 @@ var bootstrap = function ($, learun) {
                             return cellvalue == 1 ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }
                     },
+                    { label: "备注", name: "Remark", width: 200, align: "left" },
                 ],
                 mainId: 'Id',
                 isPage: true
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/EnrollTemplate/IndexPersonnel.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/EnrollTemplate/IndexPersonnel.js
index 6cc623a2e..db3e212c1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/EnrollTemplate/IndexPersonnel.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/EnrollTemplate/IndexPersonnel.js	
@@ -101,6 +101,7 @@ var bootstrap = function ($, learun) {
                             return cellvalue == 1 ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }
                     },
+                    { label: "备注", name: "Remark", width: 200, align: "left" },
                 ],
                 mainId: 'Id',
                 isPage: true
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/EnrollTemplate/EnrollTemplateEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/EnrollTemplate/EnrollTemplateEntity.cs
index 40bfa64e7..54bffac85 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/EnrollTemplate/EnrollTemplateEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/EnrollTemplate/EnrollTemplateEntity.cs	
@@ -39,6 +39,13 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
         /// </summary>
         [Column("ENABLED")]
         public int? Enabled { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        
         /// <summary>
         /// 上传时间
         /// </summary>
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/EnrollTemplate/EnrollTemplateService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/EnrollTemplate/EnrollTemplateService.cs
index 87c251085..50dc1b302 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/EnrollTemplate/EnrollTemplateService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/EnrollTemplate/EnrollTemplateService.cs	
@@ -35,7 +35,7 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
                 strSql.Append(@"
                 t.Id,
                 t.Name,
-                t.Path,
+                t.Path,t.Remark,
                 t.Enabled,f.F_FileName
                 ");
                 strSql.Append("  FROM EnrollTemplate t ");