diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoItemController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoItemController.cs index 43b23698c..063752727 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoItemController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoItemController.cs @@ -189,7 +189,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aiusepeople", ExcelColumn = "使用人" }); excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aiplace", ExcelColumn = "存放地点" }); excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aiassvalue", ExcelColumn = "资产原价值" }); - excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aiaddtime", ExcelColumn = "购置日期" }); + excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aiaddtime", ExcelColumn = "入账日期" }); excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "airemark", ExcelColumn = "备注" }); excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "depreciationmethod", ExcelColumn = "折旧方法" }); excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "depreciationstatus", ExcelColumn = "折旧状态" }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml index b9f3db66d..a4971093c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml @@ -69,7 +69,7 @@
-
购置日期
+
入账日期
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml index 12425dafd..19de17898 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml @@ -86,7 +86,7 @@
-
购置日期
+
入账日期
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js index a1bd32a4d..d151373e3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js @@ -345,7 +345,7 @@ var bootstrap = function ($, learun) { }, { label: "存放地点", name: "AIPlace", width: 100, align: "left" }, { label: "资产原价值", name: "AIAssValue", width: 100, align: "left" }, - { label: "购置日期", name: "AIAddTime", width: 100, align: "left" }, + { label: "入账日期", name: "AIAddTime", width: 100, align: "left" }, { label: "备注", name: "AIRemark", width: 100, align: "left" }, { label: "折旧方法", name: "DepreciationMethod", width: 100, align: "left" }, { label: "折旧状态", name: "DepreciationStatus", width: 100, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js index 4c578330d..7f30cabbf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js @@ -333,7 +333,7 @@ var bootstrap = function ($, learun) { } }, { label: "资产价值", name: "AIAssValue", width: 100, align: "left" }, - { label: "购置日期", name: "AIAddTime", width: 100, align: "left" }, + { label: "入账日期", name: "AIAddTime", width: 100, align: "left" }, { label: "资产分类", name: "AIASSClass", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.js index 1ba7a7edb..d03aef713 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.js @@ -298,7 +298,7 @@ var bootstrap = function ($, learun) { } }, { label: "资产价值", name: "AIAssValue", width: 100, align: "left" }, - { label: "购置日期", name: "AIAddTime", width: 100, align: "left" }, + { label: "入账日期", name: "AIAddTime", width: 100, align: "left" }, { label: "资产分类", name: "AIASSClass", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.js index c6cda2f85..716c78fe2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.js @@ -172,7 +172,7 @@ var bootstrap = function ($, learun) { }, { label: "存放地点", name: "AIPlace", width: 100, align: "left" }, { label: "资产原价值", name: "AIAssValue", width: 100, align: "left" }, - { label: "购置日期", name: "AIAddTime", width: 100, align: "left" }, + { label: "入账日期", name: "AIAddTime", width: 100, align: "left" }, { label: "备注", name: "AIRemark", width: 100, align: "left" }, { label: "折旧方法", name: "DepreciationMethod", width: 100, align: "left" }, { label: "折旧状态", name: "DepreciationStatus", width: 100, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/IndexTwo.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/IndexTwo.js index 60e07c3f5..24100d5a2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/IndexTwo.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/IndexTwo.js @@ -171,7 +171,7 @@ var bootstrap = function ($, learun) { }, { label: "存放地点", name: "AIPlace", width: 100, align: "left" }, { label: "资产原价值", name: "AIAssValue", width: 100, align: "left" }, - { label: "购置日期", name: "AIAddTime", width: 100, align: "left" }, + { label: "入账日期", name: "AIAddTime", width: 100, align: "left" }, { label: "备注", name: "AIRemark", width: 100, align: "left" }, { label: "折旧方法", name: "DepreciationMethod", width: 100, align: "left" }, { label: "折旧状态", name: "DepreciationStatus", width: 100, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemEntity.cs index a1b196482..32e458e53 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemEntity.cs @@ -90,7 +90,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem [Column("AIASSVALUE")] public decimal? AIAssValue { get; set; } /// - /// 购置日期 + /// 入账日期 /// [Column("AIADDTIME")] public DateTime? AIAddTime { get; set; }