From 5cbaaa72a8cd233960230c6de65b1d6df082abed Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Mon, 26 Apr 2021 11:34:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=A2=9E=E5=8A=A0=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LR_SystemModule/Views/DataItem/ClassifyForm.cshtml      | 4 ++++
 .../Areas/LR_SystemModule/Views/DataItem/ClassifyIndex.js   | 5 ++++-
 .../Areas/LR_SystemModule/Views/DataItem/Form.cshtml        | 4 ++++
 .../Areas/LR_SystemModule/Views/DataItem/Index.js           | 5 ++++-
 .../SystemModule/DataItem/DataItemDetailEntity.cs           | 6 ++++++
 .../SystemModule/DataItem/DataItemEntity.cs                 | 6 ++++++
 .../SystemModule/DataItem/DataItemService.cs                | 2 ++
 7 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyForm.cshtml
index 250b7b699..e765d5c7b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyForm.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyForm.cshtml	
@@ -15,6 +15,10 @@
         <div class="lr-form-item-title">编号<font face="宋体">*</font></div>
         <input id="F_ItemCode" 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">标准编码<font face="宋体">*</font></div>
+        <input id="F_ItemCodeGB" 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">排序<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/ClassifyIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyIndex.js
index 6570ff19d..55ab8e34e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyIndex.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyIndex.js	
@@ -71,9 +71,12 @@ var bootstrap = function ($, learun) {
             });
         },
         initGrid: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetClassifyList',
                 headData: [
+                    {
+                        label: '标准编码', name: 'F_ItemCodeGB', width: 200, align: 'left'
+                    },
                     { label: '名称', name: 'F_ItemName', width: 200, align: 'left' },
                     { label: '编号', name: 'F_ItemCode', width: 200, align: 'left' },
                     { label: '排序', name: 'F_SortCode', width: 50, align: 'center' },
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..28fc9461c 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,10 @@
         <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">标准编码<font face="宋体">*</font></div>
+        <input id="F_ItemCodeGB" 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">排序<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.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Index.js
index 06a97743c..6da6953f8 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	
@@ -105,9 +105,12 @@ var bootstrap = function ($, learun) {
             });
         },
         initGrid: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailList',
                 headData: [
+                    {
+                        label: '标准编码', name: 'F_ItemCodeGB', width: 200, 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' },
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..1137551e2 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	
@@ -39,6 +39,12 @@ namespace Learun.Application.Base.SystemModule
         [Column("F_ITEMCODE")]
         public string F_ItemCode { get; set; }
         /// <summary>
+        /// 标准编码
+        /// </summary>
+        /// <returns></returns>
+        [Column("F_ITEMCODEGB")]
+        public string F_ItemCodeGB { get; set; }
+        /// <summary>
         /// 名称
         /// </summary>
         /// <returns></returns>
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemEntity.cs
index ab28d3d74..35c4a4271 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemEntity.cs	
@@ -33,6 +33,12 @@ namespace Learun.Application.Base.SystemModule
         [Column("F_ITEMCODE")]
         public string F_ItemCode { get; set; }
         /// <summary>
+        /// 标准编码
+        /// </summary>
+        /// <returns></returns>
+        [Column("F_ITEMCODEGB")]
+        public string F_ItemCodeGB { get; set; }
+        /// <summary>
         /// 分类名称
         /// </summary>
         /// <returns></returns>
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..1ddf8507b 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	
@@ -24,6 +24,7 @@ namespace Learun.Application.Base.SystemModule
                     t.F_ItemId,
                     t.F_ParentId,
                     t.F_ItemCode,
+                    t.F_ItemCodeGB,
                     t.F_ItemName,
                     t.F_IsTree,
                     t.F_IsNav,
@@ -43,6 +44,7 @@ namespace Learun.Application.Base.SystemModule
                     t.F_ItemId,
                     t.F_ParentId,
                     t.F_ItemCode,
+                    t.F_ItemCodeGB,
                     t.F_ItemName,
                     t.F_ItemValue,
                     t.F_QuickQuery,