@@ -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 = "aiusepeople", ExcelColumn = "使用人" }); | ||||
excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aiplace", ExcelColumn = "存放地点" }); | excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aiplace", ExcelColumn = "存放地点" }); | ||||
excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aiassvalue", 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 = "airemark", ExcelColumn = "备注" }); | ||||
excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "depreciationmethod", ExcelColumn = "折旧方法" }); | excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "depreciationmethod", ExcelColumn = "折旧方法" }); | ||||
excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "depreciationstatus", ExcelColumn = "折旧状态" }); | excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "depreciationstatus", ExcelColumn = "折旧状态" }); | ||||
@@ -69,7 +69,7 @@ | |||||
<input id="AIAssValue" type="number" class="form-control" /> | <input id="AIAssValue" type="number" class="form-control" /> | ||||
</div> | </div> | ||||
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem"> | <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem"> | ||||
<div class="lr-form-item-title">购置日期</div> | |||||
<div class="lr-form-item-title">入账日期</div> | |||||
<input id="AIAddTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AIAddTime').trigger('change'); } })" /> | <input id="AIAddTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AIAddTime').trigger('change'); } })" /> | ||||
</div> | </div> | ||||
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem"> | <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem"> | ||||
@@ -86,7 +86,7 @@ | |||||
<input id="AIAssValue" readonly="readonly" type="text" class="form-control" /> | <input id="AIAssValue" readonly="readonly" type="text" class="form-control" /> | ||||
</div> | </div> | ||||
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem"> | <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem"> | ||||
<div class="lr-form-item-title">购置日期</div> | |||||
<div class="lr-form-item-title">入账日期</div> | |||||
<input id="AIAddTime" readonly="readonly" type="text" class="form-control lr-input-wdatepicker" /> | <input id="AIAddTime" readonly="readonly" type="text" class="form-control lr-input-wdatepicker" /> | ||||
</div> | </div> | ||||
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem"> | <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem"> | ||||
@@ -345,7 +345,7 @@ var bootstrap = function ($, learun) { | |||||
}, | }, | ||||
{ label: "存放地点", name: "AIPlace", width: 100, align: "left" }, | { label: "存放地点", name: "AIPlace", width: 100, align: "left" }, | ||||
{ label: "资产原价值", name: "AIAssValue", 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: "AIRemark", width: 100, align: "left" }, | ||||
{ label: "折旧方法", name: "DepreciationMethod", width: 100, align: "left" }, | { label: "折旧方法", name: "DepreciationMethod", width: 100, align: "left" }, | ||||
{ label: "折旧状态", name: "DepreciationStatus", width: 100, align: "left" }, | { label: "折旧状态", name: "DepreciationStatus", width: 100, align: "left" }, | ||||
@@ -333,7 +333,7 @@ var bootstrap = function ($, learun) { | |||||
} | } | ||||
}, | }, | ||||
{ label: "资产价值", name: "AIAssValue", 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: "AIASSClass", width: 100, align: "left", | label: "资产分类", name: "AIASSClass", width: 100, align: "left", | ||||
formatterAsync: function (callback, value, row, op, $cell) { | formatterAsync: function (callback, value, row, op, $cell) { | ||||
@@ -298,7 +298,7 @@ var bootstrap = function ($, learun) { | |||||
} | } | ||||
}, | }, | ||||
{ label: "资产价值", name: "AIAssValue", 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: "AIASSClass", width: 100, align: "left", | label: "资产分类", name: "AIASSClass", width: 100, align: "left", | ||||
formatterAsync: function (callback, value, row, op, $cell) { | formatterAsync: function (callback, value, row, op, $cell) { | ||||
@@ -172,7 +172,7 @@ var bootstrap = function ($, learun) { | |||||
}, | }, | ||||
{ label: "存放地点", name: "AIPlace", width: 100, align: "left" }, | { label: "存放地点", name: "AIPlace", width: 100, align: "left" }, | ||||
{ label: "资产原价值", name: "AIAssValue", 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: "AIRemark", width: 100, align: "left" }, | ||||
{ label: "折旧方法", name: "DepreciationMethod", width: 100, align: "left" }, | { label: "折旧方法", name: "DepreciationMethod", width: 100, align: "left" }, | ||||
{ label: "折旧状态", name: "DepreciationStatus", width: 100, align: "left" }, | { label: "折旧状态", name: "DepreciationStatus", width: 100, align: "left" }, | ||||
@@ -171,7 +171,7 @@ var bootstrap = function ($, learun) { | |||||
}, | }, | ||||
{ label: "存放地点", name: "AIPlace", width: 100, align: "left" }, | { label: "存放地点", name: "AIPlace", width: 100, align: "left" }, | ||||
{ label: "资产原价值", name: "AIAssValue", 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: "AIRemark", width: 100, align: "left" }, | ||||
{ label: "折旧方法", name: "DepreciationMethod", width: 100, align: "left" }, | { label: "折旧方法", name: "DepreciationMethod", width: 100, align: "left" }, | ||||
{ label: "折旧状态", name: "DepreciationStatus", width: 100, align: "left" }, | { label: "折旧状态", name: "DepreciationStatus", width: 100, align: "left" }, | ||||
@@ -90,7 +90,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem | |||||
[Column("AIASSVALUE")] | [Column("AIASSVALUE")] | ||||
public decimal? AIAssValue { get; set; } | public decimal? AIAssValue { get; set; } | ||||
/// <summary> | /// <summary> | ||||
/// 购置日期 | |||||
/// 入账日期 | |||||
/// </summary> | /// </summary> | ||||
[Column("AIADDTIME")] | [Column("AIADDTIME")] | ||||
public DateTime? AIAddTime { get; set; } | public DateTime? AIAddTime { get; set; } | ||||