From 7289de4b3b75fa5c49c5ceaf506967ba4e703520 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Tue, 2 Nov 2021 14:53:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E7=AE=A1=E7=90=86=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Ass_AssetsInfoItem/Form.cshtml       |  2 +-
 .../Views/Ass_AssetsInfoItem/Index.js          | 18 +++++++++++++++---
 .../Ass_AssetsInfoItemService.cs               |  1 +
 3 files changed, 17 insertions(+), 4 deletions(-)

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 2351a51a3..b9f3db66d 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	
@@ -66,7 +66,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">资产原价值</div>
-        <input id="AIAssValue" type="text" class="form-control" />
+        <input id="AIAssValue" type="number" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">购置日期</div>
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 baf86fe58..9522709f3 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	
@@ -217,8 +217,8 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            
-            
+
+
             $('#lr_exportexcel').on('click', function () {
                 page.exportExcel();
             });
@@ -276,6 +276,18 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "资产名称", name: "AIASSName", width: 200, align: "left" },
+                    {
+                        label: '资产分类', name: 'AIASSClass', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType',
+                                key: value,
+                                keyId: 'atid',
+                                callback: function (_data) {
+                                    callback(_data['aname']);
+                                }
+                            });
+                        }
+                    },
                     { label: "资产品牌", name: "AISpecification", width: 100, align: "left" },
                     {
                         label: "规格型号", name: "AISpecificationtype", width: 100, align: "left"
@@ -478,7 +490,7 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         },
         exportExcel: function () {
-            
+
             var param = exportWhere || {};
             param.AId = AId;
             param.AIASSClass = TreeAIASSClass;
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemService.cs
index 8a602f5da..1f0b41996 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemService.cs	
@@ -827,6 +827,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                         Ass_AssetsInfoItemEntity.UsefulLife = entity.UsefulLife;
                         Ass_AssetsInfoItemEntity.MonthlyDepreciation = entity.MonthlyDepreciation;
                         Ass_AssetsInfoItemEntity.ResidualValueRate = entity.ResidualValueRate;
+                        Ass_AssetsInfoItemEntity.AIAddTime = entity.AIAddTime;
 
                         db.Update(Ass_AssetsInfoItemEntity);
                         db.Update(Ass_AssetsInfo);