From 7f9f7b6de27e6c08c2151ea9317ad9a049620311 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Fri, 1 Apr 2022 14:18:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=88=E7=B1=BB=E5=9E=8B=E3=80=81=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E3=80=81=E7=BA=A6=E6=9D=9F=E3=80=81=E5=80=BC=E7=A9=BA?=
 =?UTF-8?q?=E9=97=B4=E7=AD=89=EF=BC=89=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E3=80=81=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/DataItem/Form.cshtml                | 24 +++++++++++++
 .../Views/DataItem/Index.cshtml               |  2 +-
 .../LR_SystemModule/Views/DataItem/Index.js   | 28 +++++++++------
 .../DataItem/DataItemDetailEntity.cs          | 36 +++++++++++++++++++
 .../SystemModule/DataItem/DataItemService.cs  |  3 +-
 5 files changed, 80 insertions(+), 13 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Form.cshtml
index 7529c1dfb..9dc9889c7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Form.cshtml	
@@ -12,6 +12,30 @@
         <div class="lr-form-item-title">项目值<font face="宋体">*</font></div>
         <input id="F_ItemValue" type="text" class="form-control" placeholder="请输入编号" isvalid="yes" checkexpession="NotNull" />
     </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">类型</div>
+        <input id="F_Type" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">长度</div>
+        <input id="F_Length" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">约束</div>
+        <input id="F_Constraint" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">值空间</div>
+        <input id="F_ValueSpace" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">解释/举例</div>
+        <input id="F_Explain" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">引用编号</div>
+        <input id="F_ReferenceNum" type="text" class="form-control" />
+    </div>
     <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title">排序<font face="宋体">*</font></div>
         <input id="F_SortCode" type="text" class="form-control" placeholder="请输入排序号" isvalid="yes" checkexpession="Num" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Index.cshtml
index a1ab4eb01..4075e76e0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Index.cshtml	
@@ -18,7 +18,7 @@
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
                     <div class="lr-layout-tool-item">
-                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入项目名/项目值" />
+                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入关键字查询" />
                     </div>
                     <div class="lr-layout-tool-item">
                         <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;<span class="lrlt">查询</span></a>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Index.js
index 06a97743c..941296850 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Index.js	
@@ -37,8 +37,8 @@ var bootstrap = function ($, learun) {
                     id: 'form',
                     title: '添加字典',
                     url: top.$.rootUrl + '/LR_SystemModule/DataItem/Form?parentId=' + parentId + '&itemCode=' + classify_itemCode,
-                    width: 500,
-                    height: 370,
+                    width: 600,
+                    height: 500,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGird);
                     }
@@ -48,17 +48,14 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('F_ItemDetailId');
                 top.selectedDataItemRow = $('#gridtable').jfGridGet('rowdata');
-
-
-               
-
+                
                 if (learun.checkrow(keyValue)) {
                     learun.layerForm({
                         id: 'form',
                         title: '编辑字典',
                         url: top.$.rootUrl + '/LR_SystemModule/DataItem/Form?itemCode=' + classify_itemCode,
-                        width: 500,
-                        height: 370,
+                        width: 600,
+                        height: 500,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGird);
                         }
@@ -108,9 +105,18 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailList',
                 headData: [
-                    { label: '项目名', name: 'F_ItemName', width: 200, align: 'left' },
-                    { label: '项目值', name: 'F_ItemValue', width: 200, align: 'left' },
-                    { label: '简拼', name: 'F_SimpleSpelling', width: 150, align: 'left' },
+                    //{ label: '项目名', name: 'F_ItemName', width: 200, align: 'left' },
+                    //{ label: '项目值', name: 'F_ItemValue', width: 200, align: 'left' },
+                    //{ label: '简拼', name: 'F_SimpleSpelling', width: 150, align: 'left' },
+                    { label: '中文简称', name: 'F_ItemName', width: 200, align: 'left' },
+                    { label: '编号', name: 'F_ItemValue', width: 200, align: 'left' },
+                    { label: '数据项名', name: 'F_SimpleSpelling', width: 150, align: 'left' },
+                    { label: '类型', name: 'F_Type', width: 100, align: 'left' },
+                    { label: '长度', name: 'F_Length', width: 100, align: 'left' },
+                    { label: '约束', name: 'F_Constraint', width: 100, align: 'left' },
+                    { label: '值空间', name: 'F_ValueSpace', width: 100, align: 'left' },
+                    { label: '解释/举例', name: 'F_Explain', width: 100, align: 'left' },
+                    { label: '引用编号', name: 'F_ReferenceNum', width: 100, align: 'left' },
                     { label: '排序', name: 'F_SortCode', width: 80, align: 'center' },
                     {
                         label: "有效", name: "F_EnabledMark", width: 50, align: "center",
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemDetailEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemDetailEntity.cs
index f5c4b935b..86e1b03fa 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemDetailEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemDetailEntity.cs	
@@ -128,6 +128,42 @@ namespace Learun.Application.Base.SystemModule
         /// <returns></returns>
         [Column("F_MODIFYUSERNAME")]
         public string F_ModifyUserName { get; set; }
+        /// <summary>
+        /// 类型
+        /// </summary>
+        /// <returns></returns>
+        [Column("F_TYPE")]
+        public string F_Type { get; set; }
+        /// <summary>
+        /// 长度
+        /// </summary>
+        /// <returns></returns>
+        [Column("F_LENGTH")]
+        public string F_Length { get; set; }
+        /// <summary>
+        /// 约束
+        /// </summary>
+        /// <returns></returns>
+        [Column("F_CONSTRAINT")]
+        public string F_Constraint { get; set; }
+        /// <summary>
+        /// 值空间
+        /// </summary>
+        /// <returns></returns>
+        [Column("F_VALUESPACE")]
+        public string F_ValueSpace { get; set; }
+        /// <summary>
+        /// 解释举例
+        /// </summary>
+        /// <returns></returns>
+        [Column("F_EXPLAIN")]
+        public string F_Explain { get; set; }
+        /// <summary>
+        /// 引用编号
+        /// </summary>
+        /// <returns></returns>
+        [Column("F_REFERENCENUM")]
+        public string F_ReferenceNum { get; set; }
         #endregion
 
         #region  扩展操作
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemService.cs
index e53ae1d1e..0b413979f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemService.cs	
@@ -57,7 +57,8 @@ namespace Learun.Application.Base.SystemModule
                     t.F_CreateUserName,
                     t.F_ModifyDate,
                     t.F_ModifyUserId,
-                    t.F_ModifyUserName
+                    t.F_ModifyUserName,
+t.F_Type,t.F_Length,t.F_Constraint,t.F_ValueSpace,t.F_Explain,t.F_ReferenceNum
                     ";
         }
         #endregion