在册登记明细 列表查询条件和列表显示加房间功能、面积等

在册登记明细实体Ass_AssetsInfoItemEntity加字段
调整在册登记明细 列表字段和查看、编辑页面的字段

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssStorageRoom/Form.cshtml

@@ -7,10 +7,10 @@
         <div class="lr-form-item-title">所在楼宇<font face="宋体">*</font></div>
         <div id="StorageId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_Storage_Room">
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_Storage_Room">
         <div class="lr-form-item-title">房间名称<font face="宋体">*</font></div>
         <input id="RName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
+    </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_Storage_Room">
         <div class="lr-form-item-title">房间号<font face="宋体">*</font></div>
         <input id="RCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
@@ -20,12 +20,13 @@
         <input id="RFunction" type="text" class="form-control" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Ass_Storage_Room">
-        <div class="lr-form-item-title">面积</div>
+        <div class="lr-form-item-title">房间面积</div>
         <input id="RArea" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_Storage_Room">
-        <div class="lr-form-item-title">是否启用<font face="宋体">*</font></div>
-        <div id="REnabled" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">房间状态<font face="宋体">*</font></div>
+        <div id="REnabled"></div>
+        @*<div id="REnabled" isvalid="yes" checkexpession="NotNull"></div>*@
     </div>
 </div>
 @Html.AppendJsFile("/Areas/AssetManagementSystem/Views/AssStorageRoom/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssStorageRoom/Form.js

@@ -15,7 +15,8 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#REnabled').lrDataItemSelect({ code: 'YesOrNoBit' });
+            //$('#REnabled').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#REnabled').lrDataItemSelect({ code: 'RoomState' });
             $('#StorageId').lrDataSourceSelect({ code: 'Ass_StorageData',value: 'sid',text: 'sname' });
         },
         initData: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssStorageRoom/Index.cshtml

@@ -1,8 +1,9 @@
 @{
-    ViewBag.Title = "库房的房间号";
+    ViewBag.Title = "房间号";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
-<div class="lr-layout lr-layout-left-center"  id="lr_layout"   >
+
+<div class="lr-layout lr-layout-left-center" id="lr_layout">
     <div class="lr-layout-left">
         <div class="lr-layout-wrap">
             <div class="lr-layout-title lrlg ">楼宇名称</div>
@@ -23,28 +24,44 @@
                                     <div class="lr-form-item-title">名称</div>
                                     <input id="RName" type="text" class="form-control" />
                                 </div>
+                                @*<div class="col-xs-12 lr-form-item">
+            <div class="lr-form-item-title">楼宇名称</div>
+            <div id="StorageId"></div>
+        </div>*@
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">房间号</div>
                                     <input id="RCode" type="text" class="form-control" />
                                 </div>
+                                @*<div class="col-xs-12 lr-form-item">
+                    <div class="lr-form-item-title">房间功能</div>
+                    <input id="RFunction" type="text" class="form-control" />
+                </div>
+                <div class="col-xs-12 lr-form-item">
+                    <div class="lr-form-item-title">房间面积</div>
+                    <input id="RArea" type="text" class="form-control" />
+                </div>
+                <div class="col-xs-12 lr-form-item">
+                    <div class="lr-form-item-title">状态</div>
+                    <div id="REnabled"></div>
+        </div>*@
                             </div>
-                        </div>
                     </div>
                 </div>
-                <div class="lr-layout-tool-right">
-                    <div class=" btn-group btn-group-sm">
-                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
-                    </div>
-                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
-                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
-                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
-                        <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
-                    </div>
+            </div>
+            <div class="lr-layout-tool-right">
+                <div class=" btn-group btn-group-sm">
+                    <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                </div>
+                <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                    <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                    <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                    <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                    <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
                 </div>
             </div>
-            <div class="lr-layout-body" id="gridtable"></div>
         </div>
+        <div class="lr-layout-body" id="gridtable"></div>
     </div>
 </div>
+</div>
 @Html.AppendJsFile("/Areas/AssetManagementSystem/Views/AssStorageRoom/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssStorageRoom/Index.js

@@ -13,6 +13,27 @@ var bootstrap = function ($, learun) {
             page.bind();
         },
         bind: function () {
+            //$('#StorageId').lrselect({
+            //    type: 'tree',
+            //    allowSearch: true,
+            //    url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+            //    param: {},
+            //    select: function (val) {
+            //        console.log(val);
+            //        var storageId = "";
+            //        if (val) {
+            //            storageId = val.value;
+            //        }
+            //        $('#RCode').lrselectRefresh({
+            //            url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+            //            text: "RCode",
+            //            value: "RId"
+            //        });
+            //    }
+            //});
+            ////房间
+            //$('#RCode').lrselect({ value: 'RId', text: 'RCode' });
+            $('#REnabled').lrDataItemSelect({ code: 'YesOrNoBit' });
             // 初始化左侧树形数据
             $('#dataTree').lrtree({
                 url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
@@ -79,10 +100,22 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetPageList',
                 headData: [
-                    { label: "名称", name: "RName", width: 100, align: "left"},
+                    //{ label: "名称", name: "RName", width: 100, align: "left"},
                     { label: "房间号", name: "RCode", width: 100, align: "left"},
                     { label: "房间功能", name: "RFunction", width: 100, align: "left"},
-                    { label: "面积", name: "RArea", width: 100, align: "left" },
+                    { label: "房间面积", name: "RArea", width: 100, align: "left" },
+                    {
+                        label: "房间状态", name: "REnabled", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'RoomState',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     { label: "楼宇名称", name: "StorageId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op,$cell) {
                              learun.clientdata.getAsync('custmerData', {
@@ -95,12 +128,7 @@ var bootstrap = function ($, learun) {
                              });
                         }
                     },
-                    {
-                        label: "是否启用", name: "REnabled", width: 100, align: "left",
-                        formatter: function (cellvalue) {
-                            return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
-                        }
-                    },
+                    
                 ],
                 mainId:'RId',
                 isPage: true

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml

@@ -13,255 +13,290 @@
             <input id="AICodeNum" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
         </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">资产编号</div>
-        <input id="AICodeNumJY" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">名称</div>
-        <input id="AIASSName" type="text" class="form-control" />
+        <div class="lr-form-item-title">序号</div>
+        <input id="AICodeNum" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">部门</div>
-        <div id="AIDepartment"></div>
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">使用人员</div>
-        <div id="AIUsePeople"></div>
+        <div class="lr-form-item-title">资产编号</div>
+        <input id="AICodeNumJY" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">楼宇名称<font face="宋体">*</font></div>
         <div id="AIIStorageId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">房间号</div>
         <div id="AIIStoragePosition" isvalid="yes" checkexpession="NotNull"></div>
-        @*<input id="AIIStoragePosition" type="text" class="form-control" />*@
-    </div>
-    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-            <div class="lr-form-item-title">是否在库<font face="宋体">*</font></div>
-            <div id="AIIsInStorage" checkexpession="NotNull"></div>
-        </div>*@
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">资产型号</div>
-        <input id="AISpecificationtype" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">资产属性<font face="宋体">*</font></div>
-        <div id="AIAssType"></div>
-    </div>
-    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-            <div class="lr-form-item-title">报废时间<font face="宋体">*</font></div>
-            <input id="AScrapTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AScrapTime').trigger('change'); } })" />
-        </div>
-        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-            <div class="lr-form-item-title">报废提示时间<font face="宋体">*</font></div>
-            <div id="ScrapRemindTime"> </div>
-        </div>*@
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">计量单位</div>
-        <div id="AIUnits" class="form-control"></div>
-    </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" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <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'); } })" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">资产分类</div>
-        <div id="AIASSClass"></div>
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">资产状态</div>
-        <div id="AIASSState"></div>
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">增加方式</div>
-        <div id="AIAddType"></div>
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">生产厂家</div>
-        <input id="AIManufacturer" type="text" class="form-control" />
+        <div class="lr-form-item-title">资产名称</div>
+        <input id="AIASSName" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">资产规格</div>
         <input id="AISpecification" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">用途</div>
-        <input id="AIUse" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">采购组织形式</div>
-        <input id="ProcurementOrganizationForm" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">预算项目编号</div>
-        <input id="BudgetItemNo" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">取得方式</div>
-        <input id="MethodOfAcquisition" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">取得日期</div>
-        <input id="TimeOfAcquisition" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#TimeOfAcquisition').trigger('change'); } })" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">产品序列号</div>
-        <input id="ProjectID" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">销售商</div>
-        <input id="Seller" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">合同编号</div>
-        <input id="ContractNo" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">发票号</div>
-        <input id="InvoiceNumber" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">配置标准分类名称</div>
-        <input id="ConfigurationName" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">保修截止日期</div>
-        <input id="GuaranteeEndTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#GuaranteeEndTime').trigger('change'); } })" />
+        <div class="lr-form-item-title">资产型号</div>
+        <input id="AISpecificationtype" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">入账形式</div>
-        <input id="EntryForm" type="text" class="form-control" />
+        <div class="lr-form-item-title">计量单位</div>
+        <div id="AIUnits" class="form-control"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">价值类型</div>
-        <input id="ValueType" type="text" class="form-control" />
+        <div class="lr-form-item-title">资产状态</div>
+        <div id="AIASSState"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">财政拨款</div>
-        <input id="FinancialAllocation" type="text" class="form-control" />
+        <div class="lr-form-item-title">管理部门</div>
+        <input id="AdministrativeDepartment" type="text" class="form-control" />
     </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">部门</div>
+            <div id="AIDepartment"></div>
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">非财政拨款</div>
-        <input id="NonFinancialAppropriation" type="text" class="form-control" />
+        <div class="lr-form-item-title">使用人</div>
+        <div id="AIUsePeople"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">使用状况</div>
-        <input id="Usage" type="text" class="form-control" />
+        <div class="lr-form-item-title">存放地点</div>
+        <input id="AIPlace" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">投入使用日期</div>
-        <input id="DateOfCommissioning" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#DateOfCommissioning').trigger('change'); } })" />
+        <div class="lr-form-item-title">资产原价值</div>
+        <input id="AIAssValue" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">管理部门</div>
-        <input id="AdministrativeDepartment" type="text" class="form-control" />
+        <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'); } })" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">折旧状态</div>
-        <input id="DepreciationStatus" type="text" class="form-control" />
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="AIRemark" class="form-control" style="height:100px;"></textarea>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">折旧方法</div>
         <input id="DepreciationMethod" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">已提折旧月数</div>
-        <input id="MonthsOfDepreciation" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">累计折旧</div>
-        <input id="AccumulatedDepreciation" type="text" class="form-control" />
+        <div class="lr-form-item-title">折旧状态</div>
+        <input id="DepreciationStatus" type="text" class="form-control" />
     </div>
     <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="UsefulLife" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">月折旧额</div>
         <input id="MonthlyDepreciation" type="text" class="form-control" />
     </div>
-<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-    <div class="lr-form-item-title">残值率</div>
-    <input id="ResidualValueRate" type="text" class="form-control" />
-</div>
-<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-    
-</div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">权属说明</div>
-        <textarea id="AIOwnerRemark" class="form-control" style="height:100px;"></textarea>
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">备注</div>
-        <textarea id="AIRemark" class="form-control" style="height:100px;"></textarea>
-    </div>
-
-
-
-
-    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">入账日期</div>
-        <input id="AIAccountEntryTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AIAccountEntryTime').trigger('change'); } })" />
-    </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">行驶发证日期</div>
-        <input id="AIVehicleTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AIVehicleTime').trigger('change'); } })" />
+        <div class="lr-form-item-title">已提折旧月数</div>
+        <input id="MonthsOfDepreciation" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">品牌</div>
-        <input id="AIBrand" type="text" class="form-control" />
+        <div class="lr-form-item-title">月折旧率</div>
+        <input id="MonthlyDepreciationRate" type="text" class="form-control" />
     </div>
-
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">产权形式</div>
-        <input id="AIPropertyRight" type="text" class="form-control" />
+        <div class="lr-form-item-title">累计折旧</div>
+        <input id="AccumulatedDepreciation" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">建筑结构</div>
-        <input id="AIBuildingStructure" type="text" class="form-control" />
+        <div class="lr-form-item-title">净值</div>
+        <input id="NetWorth" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">权属证号</div>
-        <input id="AIOwnership" type="text" class="form-control" />
+        <div class="lr-form-item-title">车辆行驶证所有人</div>
+        <input id="VehicleLicenseUser" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">车辆用途</div>
-        <input id="AIVehicleUse" type="text" class="form-control" />
+        <div class="lr-form-item-title">车辆识别号</div>
+        <input id="AIVehicleNumber" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">车牌号</div>
         <input id="AIPlateNumber" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">车架号</div>
-        <input id="AIFrameNumber" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">使用性质</div>
-        <input id="AINatureOfUse" type="text" class="form-control" />
+        <div class="lr-form-item-title">面积</div>
+        <input id="AIBuiltArea" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">发动机号</div>
-        <input id="EngineNumber" type="text" class="form-control" />
+        <div class="lr-form-item-title">权属证号</div>
+        <input id="AIOwnership" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">会计凭证号</div>
-        <input id="AIAccountCertificate" type="text" class="form-control" />
+        <div class="lr-form-item-title">土地使用权类型</div>
+        <input id="LandUseType" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">排气量</div>
-        <input id="DischargeVolume" type="text" class="form-control" />
+        <div class="lr-form-item-title">土地使用权人</div>
+        <input id="LandUseUser" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">建筑面积</div>
-        <input id="AIBuiltArea" type="text" class="form-control" />
-    </div>*@
+
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">是否在库<font face="宋体">*</font></div>
+                <div id="AIIsInStorage" checkexpession="NotNull"></div>
+            </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">资产属性<font face="宋体">*</font></div>
+            <div id="AIAssType"></div>
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">报废时间<font face="宋体">*</font></div>
+                <input id="AScrapTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AScrapTime').trigger('change'); } })" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">报废提示时间<font face="宋体">*</font></div>
+                <div id="ScrapRemindTime"> </div>
+            </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">资产分类</div>
+            <div id="AIASSClass"></div>
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">增加方式</div>
+            <div id="AIAddType"></div>
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">生产厂家</div>
+            <input id="AIManufacturer" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">用途</div>
+            <input id="AIUse" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">采购组织形式</div>
+            <input id="ProcurementOrganizationForm" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">预算项目编号</div>
+            <input id="BudgetItemNo" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">取得方式</div>
+            <input id="MethodOfAcquisition" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">取得日期</div>
+            <input id="TimeOfAcquisition" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#TimeOfAcquisition').trigger('change'); } })" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">产品序列号</div>
+            <input id="ProjectID" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">销售商</div>
+            <input id="Seller" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">合同编号</div>
+            <input id="ContractNo" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">发票号</div>
+            <input id="InvoiceNumber" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">配置标准分类名称</div>
+            <input id="ConfigurationName" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">保修截止日期</div>
+            <input id="GuaranteeEndTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#GuaranteeEndTime').trigger('change'); } })" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">入账形式</div>
+            <input id="EntryForm" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">价值类型</div>
+            <input id="ValueType" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">财政拨款</div>
+            <input id="FinancialAllocation" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">非财政拨款</div>
+            <input id="NonFinancialAppropriation" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">使用状况</div>
+            <input id="Usage" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">投入使用日期</div>
+            <input id="DateOfCommissioning" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#DateOfCommissioning').trigger('change'); } })" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+            <div class="lr-form-item-title">权属说明</div>
+            <textarea id="AIOwnerRemark" class="form-control" style="height:100px;"></textarea>
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">入账日期</div>
+                <input id="AIAccountEntryTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AIAccountEntryTime').trigger('change'); } })" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">行驶发证日期</div>
+                <input id="AIVehicleTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AIVehicleTime').trigger('change'); } })" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">品牌</div>
+                <input id="AIBrand" type="text" class="form-control" />
+            </div>
+
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">产权形式</div>
+                <input id="AIPropertyRight" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">建筑结构</div>
+                <input id="AIBuildingStructure" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">权属证号</div>
+                <input id="AIOwnership" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">车辆用途</div>
+                <input id="AIVehicleUse" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">车牌号</div>
+                <input id="AIPlateNumber" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">车架号</div>
+                <input id="AIFrameNumber" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">使用性质</div>
+                <input id="AINatureOfUse" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">发动机号</div>
+                <input id="EngineNumber" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">会计凭证号</div>
+                <input id="AIAccountCertificate" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">排气量</div>
+                <input id="DischargeVolume" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+                <div class="lr-form-item-title">建筑面积</div>
+                <input id="AIBuiltArea" type="text" class="form-control" />
+            </div>*@
 
 
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml

@@ -16,219 +16,138 @@
         <div class="lr-form-item-title">明细编号<font face="宋体">*</font></div>
         <input id="AICode" hidden="hidden" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    @*<img id="photo" />*@
+
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title" readonly="readonly">资产编号</div>
-        <input id="AICodeNumJY" type="text" class="form-control" />
+        <div class="lr-form-item-title">序号<font face="宋体">*</font></div>
+        <input id="AICodeNum" readonly="readonly" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        @*<div class="lr-form-item-title">编号<font face="宋体">*</font></div>
-            <input id="AICodeNum" readonly="readonly" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />*@
     </div>
     <img id="photo" />
-
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">名称</div>
-        <input id="AIASSName" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title" readonly="readonly">资产编号</div>
+        <input id="AICodeNumJY" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        @*<div class="lr-form-item-title">所在库位<font face="宋体">*</font></div>
-            <input id="AIIStoragePosition" readonly="readonly" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />*@
     </div>
+
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">部门</div>
-        <div id="AIDepartment" readonly="readonly"></div>
+        <div class="lr-form-item-title">楼宇名称<font face="宋体">*</font></div>
+        <div id="AIIStorageId" readonly="readonly" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        @*<div class="lr-form-item-title">是否在库<font face="宋体">*</font></div>
-            <div id="AIIsInStorage" readonly="readonly" isvalid="yes" checkexpession="NotNull"></div>*@
     </div>
-    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-            <div class="lr-form-item-title">报废时间<font face="宋体">*</font></div>
-            <input id="AScrapTime" readonly="readonly" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AScrapTime').trigger('change'); } })" />
-        </div>
-        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-            <div class="lr-form-item-title" readonly="readonly">报废提示时间<font face="宋体">*</font></div>
-            <div id="ScrapRemindTime"> </div>
-        </div>*@
-
-
-
-    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-            <div class="lr-form-item-title">序号<font face="宋体">*</font></div>
-            <input id="AICodeNum" readonly="readonly" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
-        </div>*@
-
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">使用人员</div>
-        <div id="AIUsePeople" readonly="readonly"></div>
+        <div class="lr-form-item-title">房间号<font face="宋体">*</font></div>
+        <div id="AIIStoragePosition" readonly="readonly" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        @*<div class="lr-form-item-title">所在库房<font face="宋体">*</font></div>
-            <div id="AIIStorageId" readonly="readonly" isvalid="yes" checkexpession="NotNull"></div>*@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">楼宇名称<font face="宋体">*</font></div>
-        <div id="AIIStorageId" readonly="readonly" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">资产名称</div>
+        <input id="AIASSName" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">房间号<font face="宋体">*</font></div>
-        <div id="AIIStoragePosition" readonly="readonly" isvalid="yes" checkexpession="NotNull"></div>
-        @*<input id="AIIStoragePosition" readonly="readonly" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />*@
+        <div class="lr-form-item-title">资产规格</div>
+        <input id="AISpecification" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">资产型号</div>
         <input id="AISpecificationtype" readonly="readonly" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">资产属性</div>
-        <div id="AIAssType" readonly="readonly" checkexpession="NotNull"></div>
-    </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">计量单位</div>
         <div id="AIUnits" readonly="readonly" class="form-control"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">资产价值</div>
-        <input id="AIAssValue" readonly="readonly" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">购置日期</div>
-        <input id="AIAddTime" readonly="readonly" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AIAddTime').trigger('change'); } })" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">资产分类</div>
-        <div id="AIASSClass" readonly="readonly"></div>
-    </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">资产状态</div>
         <div id="AIASSState" readonly="readonly"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">增加方式</div>
-        <div id="AIAddType" readonly="readonly"></div>
+        <div class="lr-form-item-title">管理部门</div>
+        <input id="AdministrativeDepartment" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">生产厂家</div>
-        <input id="AIManufacturer" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">使用人</div>
+        <div id="AIUsePeople" readonly="readonly"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">资产规格</div>
-        <input id="AISpecification" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">存放地点</div>
+        <input id="AIPlace" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">用途</div>
-        <input id="AIUse" type="text" readonly="readonly" class="form-control" />
+        <div class="lr-form-item-title">资产原价值</div>
+        <input id="AIAssValue" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">采购组织形式</div>
-        <input id="ProcurementOrganizationForm" type="text" readonly="readonly" class="form-control" />
+        <div class="lr-form-item-title">购置日期</div>
+        <input id="AIAddTime" readonly="readonly" type="text" class="form-control lr-input-wdatepicker" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">预算项目编号</div>
-        <input id="BudgetItemNo" type="text" readonly="readonly" class="form-control" />
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="AIRemark" readonly="readonly" class="form-control" style="height:100px;"></textarea>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">取得方式</div>
-        <input id="MethodOfAcquisition" type="text" readonly="readonly" class="form-control" />
+        <div class="lr-form-item-title">折旧方法</div>
+        <input id="DepreciationMethod" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">取得日期</div>
-        <input id="TimeOfAcquisition" type="text" readonly="readonly" class="form-control" />
+        <div class="lr-form-item-title">折旧状态</div>
+        <input id="DepreciationStatus" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">产品序列号</div>
-        <input id="ProjectID" type="text" readonly="readonly" class="form-control" />
+        <div class="lr-form-item-title">折旧年限</div>
+        <input id="UsefulLife" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">销售商</div>
-        <input id="Seller" type="text" readonly="readonly" class="form-control" />
+        <div class="lr-form-item-title">月折旧额</div>
+        <input id="MonthlyDepreciation" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title" readonly="readonly">合同编号</div>
-        <input id="ContractNo" readonly="readonly" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AIAccountEntryTime').trigger('change'); } })" />
+        <div class="lr-form-item-title">已提折旧月数</div>
+        <input id="MonthsOfDepreciation" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">发票号</div>
-        <input id="InvoiceNumber" readonly="readonly" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AIVehicleTime').trigger('change'); } })" />
+        <div class="lr-form-item-title">月折旧率</div>
+        <input id="MonthlyDepreciationRate" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">配置标准分类名称</div>
-        <input id="ConfigurationName" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">累计折旧</div>
+        <input id="AccumulatedDepreciation" readonly="readonly" type="text" class="form-control" />
     </div>
 
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">保修截止日期</div>
-        <input id="GuaranteeEndTime" readonly="readonly" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">入账形式</div>
-        <input id="EntryForm" readonly="readonly" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">价值类型</div>
-        <input id="ValueType" readonly="readonly" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">财政拨款</div>
-        <input id="FinancialAllocation" readonly="readonly" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">非财政拨款</div>
-        <input id="NonFinancialAppropriation" readonly="readonly" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">使用状况</div>
-        <input id="Usage" readonly="readonly" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">投入使用日期</div>
-        <input id="DateOfCommissioning" readonly="readonly" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">管理部门</div>
-        <input id="AdministrativeDepartment" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">净值</div>
+        <input id="NetWorth" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">折旧状态</div>
-        <input id="DepreciationStatus" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">车辆行驶证所有人</div>
+        <input id="VehicleLicenseUser" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">折旧方法</div>
-        <input id="DepreciationMethod" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">车辆识别号</div>
+        <input id="AIVehicleNumber" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">已提折旧月数</div>
-        <input id="MonthsOfDepreciation" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">车牌号</div>
+        <input id="AIPlateNumber" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">累计折旧</div>
-        <input id="AccumulatedDepreciation" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">面积</div>
+        <input id="AIBuiltArea" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">折旧年限</div>
-        <input id="UsefulLife" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">权属证号</div>
+        <input id="AIOwnership" readonly="readonly" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">月折旧额</div>
-        <input id="MonthlyDepreciation" readonly="readonly" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">残值率</div>
-        <input id="ResidualValueRate" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">土地使用权类型</div>
+        <input id="LandUseType" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-         </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">权属说明</div>
-        <textarea id="AIOwnerRemark" readonly="readonly" class="form-control" style="height:100px;"></textarea>
+        <div class="lr-form-item-title">土地使用权人</div>
+        <input id="LandUseUser" readonly="readonly" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">备注</div>
-        <textarea id="AIRemark" readonly="readonly" class="form-control" style="height:100px;"></textarea>
-    </div>
-
-
 
 </div>
 @Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.cshtml

@@ -57,6 +57,18 @@
                                     <div class="lr-form-item-title">房间号</div>
                                     <div id="AIIStoragePosition"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">房间功能</div>
+                                    <input id="RFunction" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">房间面积</div>
+                                    <input id="RArea" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">房间状态</div>
+                                    <div id="REnabled"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">资产状态</div>
                                     <div id="AIASSState"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js

@@ -37,7 +37,7 @@ var bootstrap = function ($, learun) {
             });
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 400, 400);
+            }, 500, 400);
             $('#AIIStorageId').lrselect({
                 type: 'tree',
                 allowSearch: true,
@@ -58,6 +58,7 @@ var bootstrap = function ($, learun) {
             //房间
             $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
             //$('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            $('#REnabled').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#AIASSState').lrDataItemSelect({ code: 'AssState' });
             $('#AIDepartment').lrDepartmentSelect({
                 select: function (val) {
@@ -217,58 +218,128 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/GetPageList',
                 headData: [
                     //{ label: "明细编号", name: "AICode", width: 200, align: "left" },
+                    { label: "序号", name: "AICodeNum", width: 100, align: "left" },
                     { label: "资产编号", name: "AICodeNumJY", width: 200, align: "left" },
-                    { label: "名称", name: "AIASSName", width: 200, align: "left" },
                     {
-                        label: "部门", name: "AIDepartment", width: 100, align: "left",
+                        label: "楼宇名称", name: "AIIStorageId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('department', {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
                                 key: value,
+                                keyId: 'sid',
                                 callback: function (_data) {
-                                    callback(_data.name);
+                                    callback(_data['sname']);
                                 }
                             });
                         }
                     },
                     {
-                        label: "使用人员", name: "AIUsePeople", width: 100, align: "left",
+                        label: "房间号", name: "AIIStoragePosition", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
                                 key: value,
-                                keyId: 'f_userid',
+                                keyId: 'rid',
                                 callback: function (_data) {
-                                    callback(_data['f_realname']);
+                                    callback(_data['rcode']);
                                 }
                             });
                         }
                     },
                     {
-                        label: "楼宇名称", name: "AIIStorageId", width: 100, align: "left",
+                        label: "房间功能", name: "RFunction", width: 150, align: "left"
+                    },
+                    {
+                        label: "房间面积", name: "RArea", width: 100, align: "left"
+                    },
+                    {
+                        label: "房间状态", name: "REnabled", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'sid',
+                                code: 'RoomState',
                                 callback: function (_data) {
-                                    callback(_data['sname']);
+                                    callback(_data.text);
                                 }
                             });
                         }
                     },
+                    { label: "资产名称", name: "AIASSName", width: 200, align: "left" },
+                    { label: "资产规格", name: "AISpecification", width: 100, align: "left" },
                     {
-                        label: "房间号", name: "AIIStoragePosition", width: 100, align: "left",
+                        label: "资产型号", name: "AISpecificationtype", width: 100, align: "left"
+                    },
+                    //***************数量
+                    {
+                        label: "计量单位", name: "AIUnits", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem',
+                                {
+                                    key: value,
+                                    code: 'sldw',
+                                    callback: function (_data) {
+                                        callback(_data.text);
+                                    }
+                                });
+                        }
+                    },
+                    {
+                        label: "资产状态", name: "AIASSState", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'AssState',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "管理部门", name: "AdministrativeDepartment", width: 100, align: "left" },
+                    //{
+                    //    label: "管理部门", name: "AIDepartment", width: 100, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('department', {
+                    //            key: value,
+                    //            callback: function (_data) {
+                    //                callback(_data.name);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    {
+                        label: "使用人", name: "AIUsePeople", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
                                 key: value,
-                                keyId: 'rid',
+                                keyId: 'f_userid',
                                 callback: function (_data) {
-                                    callback(_data['rcode']);
+                                    callback(_data['f_realname']);
                                 }
                             });
                         }
                     },
+                    { label: "存放地点", name: "AIPlace", width: 100, align: "left" },
+                    { label: "资产原价值", name: "AIAssValue", 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" },
+                    { label: "折旧年限", name: "UsefulLife", width: 100, align: "left" },
+                    { label: "月折旧额", name: "MonthlyDepreciation", width: 100, align: "left" },
+                    { label: "已提折旧月数", name: "MonthsOfDepreciation", width: 100, align: "left" },
+                    { label: "月折旧率", name: "MonthlyDepreciationRate", width: 100, align: "left" },
+                    { label: "累计折旧", name: "AccumulatedDepreciation", width: 100, align: "left" },
+                    { label: "净值", name: "NetWorth", width: 100, align: "left" },
+                    { label: "车辆行驶证所有人", name: "VehicleLicenseUser", width: 100, align: "left" },
+                    { label: "车辆识别号", name: "AIVehicleNumber", width: 100, align: "left" },
+                    { label: "车牌号", name: "AIPlateNumber", width: 100, align: "left" },
+                    { label: "面积", name: "AIBuiltArea", width: 100, align: "left" },
+                    { label: "权属证号", name: "AIOwnership", width: 100, align: "left" },
+                    { label: "土地使用权类型", name: "LandUseType", width: 100, align: "left" },
+                    { label: "土地使用权人/房屋所有权人", name: "LandUseUser", width: 200, align: "left" }
+
                     //{
                     //    label: "报废时间", name: "AIIStoragePosition", width: 100, align: "left", formatter: function (cellvalue, row) {
 
@@ -317,100 +388,64 @@ var bootstrap = function ($, learun) {
 
                     //    }
                     //},
-                    {
-                        label: "资产型号", name: "AISpecificationtype", width: 100, align: "left"
-                    },
-                    {
-                        label: "资产属性", name: "AIAssType", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'AssType',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
-                    {
-                        label: "计量单位", name: "AIUnits", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem',
-                                {
-                                    key: value,
-                                    code: 'sldw',
-                                    callback: function (_data) {
-                                        callback(_data.text);
-                                    }
-                                })
-                        }
-                    },
-                    { label: "资产价值", name: "AIAssValue", 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) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType',
-                                key: value,
-                                keyId: 'atid',
-                                callback: function (_data) {
-                                    callback(_data['aname']);
-                                }
-                            });
-                        }
-                    },
-                    {
-                        label: "资产状态", name: "AIASSState", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'AssState',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
-                    {
-                        label: "增加方式", name: "AIAddType", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'zcly',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
-                    { label: "生产厂家", name: "AIManufacturer", width: 100, align: "left" },
-                    { label: "资产规格", name: "AISpecification", width: 100, align: "left" },
-                    { label: "用途", name: "AIUse", width: 100, align: "left" },
-                    { label: "采购组织形式", name: "ProcurementOrganizationForm", width: 100, align: "left" },
-                    { label: "预算项目编号", name: "BudgetItemNo", width: 100, align: "left" },
-                    { label: "取得方式", name: "MethodOfAcquisition", width: 100, align: "left" },
-                    { label: "取得日期", name: "TimeOfAcquisition", width: 100, align: "left" },
-                    { label: "产品序列号", name: "ProjectID", width: 100, align: "left" },
-                    { label: "销售商", name: "Seller", width: 100, align: "left" },
-                    { label: "合同编号", name: "ContractNo", width: 100, align: "left" },
-                    { label: "发票号", name: "InvoiceNumber", width: 100, align: "left" },
-                    { label: "配置标准分类名称", name: "ConfigurationName", width: 100, align: "left" },
-                    { label: "保修截止日期", name: "GuaranteeEndTime", width: 100, align: "left" },
-                    { label: "入账形式", name: "EntryForm", width: 100, align: "left" },
-                    { label: "价值类型", name: "ValueType", width: 100, align: "left" },
-                    { label: "财政拨款", name: "FinancialAllocation", width: 100, align: "left" },
-                    { label: "非财政拨款", name: "NonFinancialAppropriation", width: 100, align: "left" },
-                    { label: "使用状况", name: "Usage", width: 100, align: "left" },
-                    { label: "投入使用日期", name: "DateOfCommissioning", width: 100, align: "left" },
-                    { label: "管理部门", name: "AdministrativeDepartment", width: 100, align: "left" },
-                    { label: "折旧状态", name: "DepreciationStatus", width: 100, align: "left" },
-                    { label: "折旧方法", name: "DepreciationMethod", width: 100, align: "left" },
-                    { label: "已提折旧月数", name: "MonthsOfDepreciation", width: 100, align: "left" },
-                    { label: "累计折旧", name: "AccumulatedDepreciation", width: 100, align: "left" },
-                    { label: "折旧年限（月）", name: "UsefulLife", width: 100, align: "left" },
-                    { label: "月折旧额", name: "MonthlyDepreciation", width: 100, align: "left" },
-                    { label: "残值率", name: "ResidualValueRate", width: 100, align: "left" },
+                    
+                    //{
+                    //    label: "资产属性", name: "AIAssType", width: 100, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'AssType',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{
+                    //    label: "资产分类", name: "AIASSClass", width: 100, 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: "AIAddType", width: 100, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'zcly',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{ label: "生产厂家", name: "AIManufacturer", width: 100, align: "left" },
+                    //{ label: "用途", name: "AIUse", width: 100, align: "left" },
+                    //{ label: "采购组织形式", name: "ProcurementOrganizationForm", width: 100, align: "left" },
+                    //{ label: "预算项目编号", name: "BudgetItemNo", width: 100, align: "left" },
+                    //{ label: "取得方式", name: "MethodOfAcquisition", width: 100, align: "left" },
+                    //{ label: "取得日期", name: "TimeOfAcquisition", width: 100, align: "left" },
+                    //{ label: "产品序列号", name: "ProjectID", width: 100, align: "left" },
+                    //{ label: "销售商", name: "Seller", width: 100, align: "left" },
+                    //{ label: "合同编号", name: "ContractNo", width: 100, align: "left" },
+                    //{ label: "发票号", name: "InvoiceNumber", width: 100, align: "left" },
+                    //{ label: "配置标准分类名称", name: "ConfigurationName", width: 100, align: "left" },
+                    //{ label: "保修截止日期", name: "GuaranteeEndTime", width: 100, align: "left" },
+                    //{ label: "入账形式", name: "EntryForm", width: 100, align: "left" },
+                    //{ label: "价值类型", name: "ValueType", width: 100, align: "left" },
+                    //{ label: "财政拨款", name: "FinancialAllocation", width: 100, align: "left" },
+                    //{ label: "非财政拨款", name: "NonFinancialAppropriation", width: 100, align: "left" },
+                    //{ label: "使用状况", name: "Usage", width: 100, align: "left" },
+                    //{ label: "投入使用日期", name: "DateOfCommissioning", width: 100, align: "left" },
+                    //{ label: "管理部门", name: "AdministrativeDepartment", width: 100, align: "left" },
+                    //{ label: "残值率", name: "ResidualValueRate", width: 100, align: "left" },
                 ],
                 mainId: 'AIId',
                 isMultiselect: true,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Storage/Form.cshtml

@@ -4,11 +4,11 @@
 }
 <div class="lr-form-wrap">
     <div class="col-xs-6 lr-form-item"  data-table="Ass_Storage" >
-        <div class="lr-form-item-title">库房名称<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">楼宇名称<font face="宋体">*</font></div>
         <input id="SName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="Ass_Storage" >
-        <div class="lr-form-item-title">库房编号<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">楼宇编号<font face="宋体">*</font></div>
         <input id="SCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="Ass_Storage" >

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Storage/Index.cshtml

@@ -11,11 +11,11 @@
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">库房名称</div>
+                                    <div class="lr-form-item-title">楼宇名称</div>
                                     <input id="SName" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">库房编号</div>
+                                    <div class="lr-form-item-title">楼宇编号</div>
                                     <input id="SCode" type="text" class="form-control" />
                                 </div>
                             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Storage/Index.js

@@ -78,8 +78,8 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/AssetManagementSystem/Ass_Storage/GetPageList',
                 headData: [
-                    { label: "库房名称", name: "SName", width: 200, align: "left" },
-                    { label: "库房编号", name: "SCode", width: 100, align: "left" },
+                    { label: "楼宇名称", name: "SName", width: 200, align: "left" },
+                    { label: "楼宇编号", name: "SCode", width: 100, align: "left" },
                     { label: "联系人", name: "SContact", width: 100, align: "left" },
                     { label: "电话", name: "STell", width: 100, align: "left" },
                     { label: "地址", name: "SAdress", width: 300, align: "left" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Index.cshtml

@@ -30,61 +30,64 @@
             <div class="lr-layout-body" id="gridtable"></div>
         </div>
     </div>
-    <div id="winpop">
+    @*<div id="winpop">
         <div class="title">您有新的未读消息<span class="close" onclick="tips_pop()">x</span></div>
         <div id="notifications">
         </div>
 
-    </div>
+    </div>*@
 </div>
 @Html.AppendJsFile("/Areas/LR_Desktop/Views/MessageRind/Index.js");
 <script>
-    function tips_pop() {
-        var MsgPop = document.getElementById("winpop");
-        var popH = parseInt(MsgPop.style.height);
-        if (popH == 0) {
-            MsgPop.style.Height = "block";
-            show = setInterval("changeH('up')", 2);
-        } else {
-            hide = setInterval("changeH('down')", 2);
-        }
-    }
+    //function tips_pop() {
+    //    var MsgPop = document.getElementById("winpop");
+    //    var popH = parseInt(MsgPop.style.height);
+    //    if (popH == 0) {
+    //        MsgPop.style.Height = "block";
+    //        show = setInterval("changeH('up')", 2);
+    //    } else {
+    //        hide = setInterval("changeH('down')", 2);
+    //    }
+    //}
 
-    function changeH(str) {
-        var magPop = document.getElementById("winpop");
-        var popH = parseInt(MsgPop.style.Height);
-        if (str == "up") {
-            if (popH <= 100) {
-                msgPop.style.height = (popH + 4).toString() + "px";
-            } else {
-                clearInterval(show);
-            }
-        }
-        if (str == "down") {
-            if (popH >= 4) {
-                MsgPop.style.Height = (popH - 4).toString() + "px";
-            } else {
-                clearInterval(hide);
-                MsgPop.style.display = "none";
-            }
-        }
-        window.onload = function() {
-            document.getElementById('winpop').style.height = '0px';
-            setTimeout("tips_pop()", 800);
-        }
+    //function changeH(str) {
+    //    var magPop = document.getElementById("winpop");
+    //    var popH = parseInt(MsgPop.style.Height);
+    //    if (str == "up") {
+    //        if (popH <= 100) {
+    //            msgPop.style.height = (popH + 4).toString() + "px";
+    //        } else {
+    //            clearInterval(show);
+    //        }
+    //    }
+    //    if (str == "down") {
+    //        if (popH >= 4) {
+    //            MsgPop.style.Height = (popH - 4).toString() + "px";
+    //        } else {
+    //            clearInterval(hide);
+    //            MsgPop.style.display = "none";
+    //        }
+    //    }
+    //    window.onload = function() {
+    //        document.getElementById('winpop').style.height = '0px';
+    //        setTimeout("tips_pop()", 800);
+    //    }
 
-    }
-    function Winpop() {
-        var state = '0';
-        $.get(${ ctx } / sys / msGetUserMedia / getMsgList ? state + "&t=" + new Date().getTime(),function(data) {
-            $("#notifications").html(data);
-        }),
-    }
+    //}
+    //function Winpop() {
+    //    var state = '0';
+    //    //$.get(${ ctx }/ sys /msGetUserMedia/getMsgList?state + "&t=" + new Date().getTime(),function(data) {
+    //    //    $("#notifications").html(data);
+    //    //}),
+    //    $.get(${ ctx } / sys / msGetUserMedia / getMsgList ? state + "&t=" + new Date().getTime(), function (data) {
+    //        $("#notifications").html(data);
+    //    });
+    //}
 
-    winpop();
-    setInterval(function() {
-            $("#winpop").load(Winpop(), "");
-        },
-        1000);
+    //winpop();
+    //setInterval(function() {
+    //        $("#winpop").load(Winpop(), "");
+    //    },
+    //    1000);
    
 </script>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemEntity.cs

@@ -155,6 +155,11 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         [Column("AIVEHICLEUSE")]
         public string AIVehicleUse { get; set; }
         /// <summary> 
+        /// 车辆识别号 
+        /// </summary> 
+        [Column("AIVEHICLENUMBER")]
+        public string AIVehicleNumber { get; set; }
+        /// <summary> 
         /// 车牌号 
         /// </summary> 
         [Column("AIPLATENUMBER")]
@@ -360,7 +365,40 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         [Column("RESIDUALVALUERATE")]
         public string ResidualValueRate { get; set; }
 
+        /// <summary> 
+        /// 存放地点
+        /// </summary> 
+        [Column("AIPLACE")]
+        public string AIPlace { get; set; }
+        /// <summary> 
+        /// 月折旧率
+        /// </summary> 
+        [Column("MONTHLYDEPRECIATIONRATE")]
+        public string MonthlyDepreciationRate { get; set; }
+
+        /// <summary> 
+        /// 净值
+        /// </summary> 
+        [Column("NETWORTH")]
+        public string NetWorth { get; set; }
+
+        /// <summary> 
+        /// 车辆行驶证所有人
+        /// </summary> 
+        [Column("VEHICLELICENSEUSER")]
+        public string VehicleLicenseUser { get; set; }
+
+        /// <summary> 
+        /// 土地使用权类型
+        /// </summary> 
+        [Column("LANDUSETYPE")]
+        public string LandUseType { get; set; }
 
+        /// <summary> 
+        /// 土地使用权人/房屋所有权人
+        /// </summary> 
+        [Column("LANDUSEUSER")]
+        public string LandUseUser { get; set; }
 
 
         #endregion
@@ -389,6 +427,31 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         /// </summary>
         [NotMapped]
         public string AIPhoto { get; set; }
+        /// <summary>
+        /// 房间名称
+        /// </summary>
+        [NotMapped]
+        public string RName { get; set; }
+        /// <summary>
+        /// 房间号
+        /// </summary>
+        [NotMapped]
+        public string RCode { get; set; }
+        /// <summary>
+        /// 房间功能
+        /// </summary>
+        [NotMapped]
+        public string RFunction { get; set; }
+        /// <summary>
+        /// 房间面积
+        /// </summary>
+        [NotMapped]
+        public string RArea { get; set; }
+        /// <summary>
+        /// 房间状态
+        /// </summary>
+        [NotMapped]
+        public int REnabled { get; set; }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemService.cs

@@ -32,7 +32,9 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
             {
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT t.* ");
+                strSql.Append(",room.*  ");
                 strSql.Append("  FROM Ass_AssetsInfoItem t ");
+                strSql.Append("  left join Ass_Storage_Room room on t.AIIStoragePosition=room.rid ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
@@ -48,7 +50,6 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                     strSql.Append(" AND t.AICodeNumJY Like @AICodeNumJY ");
                 }
 
-
                 if (!queryParam["userId"].IsEmpty())
                 {
                     dp.Add("userId", queryParam["userId"].ToString(), DbType.String);
@@ -113,6 +114,32 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                     dp.Add("AIIStoragePosition", "%" + queryParam["AIIStoragePosition"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.AIIStoragePosition Like @AIIStoragePosition ");
                 }
+                //房间功能
+                if (!queryParam["RFunction"].IsEmpty())
+                {
+                    dp.Add("RFunction", "%" + queryParam["RFunction"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND room.RFunction Like @RFunction ");
+                }
+                //房间面积
+                if (!queryParam["RArea"].IsEmpty())
+                {
+                    dp.Add("RArea", "%" + queryParam["RArea"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND room.RArea Like @RArea ");
+                }
+                //房间状态
+                if (!queryParam["REnabled"].IsEmpty())
+                {
+                    var REnabled = Convert.ToBoolean(queryParam["REnabled"].ToString());
+                    if (REnabled)
+                    {
+                        strSql.Append(" AND room.REnabled=1 ");
+                    }
+                    else
+                    {
+                        strSql.Append(" AND room.REnabled=0 ");
+                    }
+
+                }
                 if (!queryParam["AIAssValue"].IsEmpty())
                 {
                     dp.Add("AIAssValue", "%" + queryParam["AIAssValue"].ToString() + "%", DbType.String);

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_Storage_Room/AssStorageRoomService.cs

@@ -54,13 +54,23 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                 if (!queryParam["RCode"].IsEmpty())
                 {
                     dp.Add("RCode", "%" + queryParam["RCode"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND t.RCode Like @RCode ");
+                    strSql.Append(" AND t.RCode  Like  @RCode ");
                 }
                 if (!queryParam["StorageId"].IsEmpty())
                 {
                     dp.Add("StorageId",queryParam["StorageId"].ToString(), DbType.String);
                     strSql.Append(" AND t.StorageId = @StorageId ");
                 }
+                if (!queryParam["RFunction"].IsEmpty())
+                {
+                    dp.Add("RFunction", "%" + queryParam["RFunction"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.RName Like @RFunction ");
+                }
+                if (!queryParam["RArea"].IsEmpty())
+                {
+                    dp.Add("RArea", "%" + queryParam["RArea"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.RArea Like @RArea ");
+                }
                 return this.BaseRepository().FindList<Ass_Storage_RoomEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
@@ -133,7 +143,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         {
             try
             {
-                string sql = $"select RId,RName,RCode from Ass_Storage_Room where renabled=1 and StorageId='{storageId}'";
+                string sql = $"select RId,RCode+'('+RFunction+')' as RCode from Ass_Storage_Room where renabled=1 and StorageId='{storageId}'";
                 return this.BaseRepository().FindList<Ass_Storage_RoomEntity>(sql);
             }
             catch (Exception ex)