From a7431a668810be86fbe5756df9600ca7ff1e748c Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Wed, 12 May 2021 17:18:03 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AD=97=E5=85=B8=E3=80=81=E5=AD=97=E5=85=B8=E5=88=86?= =?UTF-8?q?=E7=B1=BB=EF=BC=9A=E5=A2=9E=E5=8A=A0=E6=A0=87=E5=87=86=E7=BC=96?= =?UTF-8?q?=E7=A0=81=EF=BC=9B?= 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 | 3 +++ .../Areas/LR_SystemModule/Views/DataItem/Form.cshtml | 4 ++++ .../Areas/LR_SystemModule/Views/DataItem/Index.js | 3 +++ .../SystemModule/DataItem/DataItemDetailEntity.cs | 6 ++++++ .../SystemModule/DataItem/DataItemEntity.cs | 6 ++++++ .../SystemModule/DataItem/DataItemService.cs | 2 ++ 7 files changed, 28 insertions(+) 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 @@
编号*
+
+
标准编码*
+ +
排序*
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..70a467854 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 @@ -74,6 +74,9 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ 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 @@
项目值*
+
+
标准编码*
+ +
排序*
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..e27a4c39a 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 @@ -108,6 +108,9 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ 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; } /// + /// 标准编码 + /// + /// + [Column("F_ITEMCODEGB")] + public string F_ItemCodeGB { get; set; } + /// /// 名称 /// /// 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; } /// + /// 标准编码 + /// + /// + [Column("F_ITEMCODEGB")] + public string F_ItemCodeGB { get; set; } + /// /// 分类名称 /// /// 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,