资产管理其他页面更改楼宇名称和房间号

出库申请明细表加旧房间号、新房间号两个字段

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

@@ -21,7 +21,7 @@
 
         <div id="detailaddbutton" style="display:none;"></div>
         <input id="detailadd" type="button" class="btn btn-success" value="新增明细" />
-        <input id="detailedit" type="button" class="btn btn-warning" value="编辑明细" />
+        @*<input id="detailedit" type="button" class="btn btn-warning" value="编辑明细" />*@
         <input id="detaildel" type="button" class="btn btn-danger" value="移除明细" />
     </div>
     <div class="col-xs-12 lr-form-item lr-form-item-grid">

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

@@ -125,7 +125,7 @@ var bootstrap = function ($, learun) {
                 isMultiple: true
             });
             $("#detailedit").on('click', function () {
-                Ass_ScrapItem
+                //Ass_ScrapItem
                 var keyValue = $('#Ass_ScrapItem').jfGridValue('AAIId');
                 selectedRow = $('#Ass_ScrapItem').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {

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

@@ -29,7 +29,7 @@ var bootstrap = function ($, learun) {
                     title: '新增',
                     url: top.$.rootUrl + '/AssetManagementSystem/AssScrap/Form',
                     width: 1000,
-                    height: 600,
+                    height: 700,
                     callBack: function (id) {
                         var res = false;
                         // 验证数据

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

@@ -81,14 +81,16 @@ var bootstrap = function ($, learun) {
             });
 
             //整理资产数据
-            $("#lr_arrangement").on('click', function () {
+            $("#lr_arrangement").on('click',
+                function() {
 
-                learun.postForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/ArrangementAss',
-                    {}, function (res) {
-                    refreshGirdData();
-                });
+                    learun.postForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/ArrangementAss',
+                        {},
+                        function(res) {
+                            refreshGirdData();
+                        });
 
-            })
+                });
 
             // 删除
             $('#lr_delete').on('click', function () {

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

@@ -68,33 +68,9 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/GetPageList',
                 headData: [
-                    { label: "明细编号", name: "AICode", width: 200, align: "left" },
-                    { label: "金隅编号", name: "AICodeNumJY", width: 200, align: "left" },
-                    { label: "名称", name: "AIASSName", width: 200, 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=' + 'BaseUser',
-                                key: value,
-                                keyId: 'f_userid',
-                                callback: function (_data) {
-                                    callback(_data['f_realname']);
-                                }
-                            });
-                        }
-                    },
+                    //{ label: "明细编号", name: "AICode", width: 200, align: "left" },
+                    { label: "序号", name: "AICodeNum", width: 100, align: "left" },
+                    { label: "资产编号", name: "AICodeNumJY", width: 200, align: "left" },
                     {
                         label: "楼宇名称", name: "AIIStorageId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -122,20 +98,28 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "资产型号", name: "AISpecificationtype", width: 100, align: "left"
+                        label: "房间功能", name: "RFunction", width: 150, align: "left"
+                    },
+                    {
+                        label: "房间面积", name: "RArea", width: 100, align: "left"
                     },
                     {
-                        label: "资产属性", name: "AIAssType", 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: 'AssType',
+                                code: 'RoomState',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }
                             });
                         }
                     },
+                    { label: "资产名称", name: "AIASSName", width: 200, align: "left" },
+                    { label: "资产规格", name: "AISpecification", 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) {
@@ -146,22 +130,7 @@ var bootstrap = function ($, learun) {
                                     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']);
-                                }
-                            });
+                                });
                         }
                     },
                     {
@@ -176,21 +145,51 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    { 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: "AIAddType", width: 100, align: "left",
+                        label: "使用人", name: "AIUsePeople", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
                                 key: value,
-                                code: 'zcly',
+                                keyId: 'f_userid',
                                 callback: function (_data) {
-                                    callback(_data.text);
+                                    callback(_data['f_realname']);
                                 }
                             });
                         }
                     },
-                    { label: "生产厂家", name: "AIManufacturer", width: 100, align: "left" },
-                    { label: "资产规格", name: "AISpecification", width: 100, align: "left" },
-                    { label: "用途", name: "AIUse", width: 100, align: "left" },
+                    { 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" }
+
                 ],
                 mainId: 'AIId',
                 isMultiselect: true,

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

@@ -71,7 +71,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
         <div class="lr-form-item-title">房间号</div>
-        <div id="AAIStoragePosition" isvalid="yes" checkexpession="NotNull"></div>
+        <div id="AAIStoragePosition" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfoItemApply">
         <div class="lr-form-item-title">生成明细<font face="宋体">*</font></div>

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

@@ -101,7 +101,7 @@ var bootstrap = function ($, learun) {
             $('#AAISupplierId').lrDataSourceSelect({ code: 'Ass_SupplierData', value: 'sid', text: 'sname' });
             $('#AAIUnit').lrDataItemSelect({ code: 'sldw' });
             //$('#AAIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
-            $('#AIIStorageId').lrselect({
+            $('#AAIStorageId').lrselect({
                 type: 'tree',
                 allowSearch: true,
                 url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
@@ -111,7 +111,7 @@ var bootstrap = function ($, learun) {
                     if (val) {
                         storageId = val.value;
                     }
-                    $('#AIIStoragePosition').lrselectRefresh({
+                    $('#AAIStoragePosition').lrselectRefresh({
                         url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
                         text: "RCode",
                         value: "RId"
@@ -119,7 +119,7 @@ var bootstrap = function ($, learun) {
                 }
             });
             //房间
-            $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
+            $('#AAIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
             $('#AAIHasDetail').lrDataItemSelect({
                 code: 'YesOrNoBit', select: function (item) {
                     if (item != null && item != undefined) {
@@ -137,6 +137,7 @@ var bootstrap = function ($, learun) {
             if (!!keyValue) {
                 if (!!selectedRow) {
                     $('#form').lrSetFormData(selectedRow);
+                    $("#AAOldCode").find('span').text(selectedRow.AAIName);
                 }
             }
 

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

@@ -154,7 +154,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "原库房", name: "AOIStorageId", width: 100, align: "left",
+                        label: "原楼宇", name: "AOIStorageId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
@@ -166,6 +166,19 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {
+                        label: "原房间", name: "AOIRoomId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+                                key: value,
+                                keyId: 'rid',
+                                callback: function (_data) {
+                                    callback(_data['rcode']);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "新使用人", name: "AOINewUsePeople", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -193,7 +206,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "新库房", name: "AOINewStorageId", width: 100, align: "left",
+                        label: "新楼宇", name: "AOINewStorageId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
@@ -205,6 +218,19 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {
+                        label: "新房间", name: "AOINewRoomId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+                                key: value,
+                                keyId: 'rid',
+                                callback: function (_data) {
+                                    callback(_data['rcode']);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: '资产型号', name: 'AOIModel', width: 100, align: 'left'
                     },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/FormView.js

@@ -105,7 +105,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "原库房", name: "AOIStorageId", width: 100, align: "left",
+                        label: "原楼宇", name: "AOIStorageId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
@@ -117,6 +117,19 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {
+                        label: "原房间", name: "AOIRoomId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+                                key: value,
+                                keyId: 'rid',
+                                callback: function (_data) {
+                                    callback(_data['rcode']);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "新使用人", name: "AOINewUsePeople", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -144,7 +157,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "新库房", name: "AOINewStorageId", width: 100, align: "left",
+                        label: "新楼宇", name: "AOINewStorageId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
@@ -156,6 +169,19 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {
+                        label: "新房间", name: "AOINewRoomId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+                                key: value,
+                                keyId: 'rid',
+                                callback: function (_data) {
+                                    callback(_data['rcode']);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: '英文名称', name: 'AOIEName', width: 100, align: 'left'
                     },

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

@@ -4,86 +4,94 @@
 }
 @Html.AppendCssFile("/Views/LR_Content/plugin/layerselect/lr-layerselect.css")
 @Html.AppendJsFile("/Views/LR_Content/plugin/layerselect/lr-layerselect.js")
-    <div class="lr-form-wrap" id="form">
-        <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfoItemApply">
-            <div class="lr-form-item-title">选择资产<font face="宋体">*</font></div>
-            <div id="AAOldCode"></div>
-        </div>
-        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
-            <div class="lr-form-item-title">资产编号</div>
-            <input id="AOICode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
-        </div>
-        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
-            <div class="lr-form-item-title">资产名称</div>
-            <input id="AOIName" type="text" class="form-control" readonly="readonly" />
-        </div>
-        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
-            <div class="lr-form-item-title">资产类别</div>
-            <div id="AOITId" readonly="readonly"></div>
-        </div>
-        @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfoItemApply">
+        <div class="lr-form-item-title">选择资产<font face="宋体">*</font></div>
+        <div id="AAOldCode"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
+        <div class="lr-form-item-title">资产编号</div>
+        <input id="AOICode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
+        <div class="lr-form-item-title">资产名称</div>
+        <input id="AOIName" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
+        <div class="lr-form-item-title">资产类别</div>
+        <div id="AOITId" readonly="readonly"></div>
+    </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
             <div class="lr-form-item-title">英文名称</div>
             <input id="AOIEName" type="text" class="form-control" readonly="readonly" />
         </div>*@
-        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
-            <div class="lr-form-item-title">资产型号</div>
-            <input id="AOIModel" type="text" class="form-control" readonly="readonly" />
-        </div>
-        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
-            <div class="lr-form-item-title">生产厂家</div>
-            <input id="AOIManufacturer" type="text" class="form-control" readonly="readonly" />
-        </div>
-        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
-            <div class="lr-form-item-title">单价</div>
-            <input id="AOIPrice" type="text" class="form-control" readonly="readonly" />
-        </div>
-        @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
+        <div class="lr-form-item-title">资产型号</div>
+        <input id="AOIModel" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
+        <div class="lr-form-item-title">生产厂家</div>
+        <input id="AOIManufacturer" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
+        <div class="lr-form-item-title">单价</div>
+        <input id="AOIPrice" type="text" class="form-control" readonly="readonly" />
+    </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
             <div class="lr-form-item-title">数量<font face="宋体">*</font></div>
             <input id="AOIStock" type="text" class="form-control"  isvalid="yes" checkexpession="PositiveFloatint"  />
         </div>*@
-        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
-            <div class="lr-form-item-title">资产规格</div>
-            <input id="AOISpecification" type="text" class="form-control" readonly="readonly" />
-        </div>
-        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
-            <div class="lr-form-item-title">用途</div>
-            <input id="AOIUse" type="text" class="form-control" />
-        </div>
-        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
-            <div class="lr-form-item-title">原使用部门</div>
-            <div id="AOIOldDepartment" readonly="readonly"> </div>
-        </div>
-        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
-            <div class="lr-form-item-title">新使用部门<font face="宋体">*</font></div>
-            <div id="AOINewDepartment" isvalid="yes" checkexpession="NotNull" > </div>
-        </div>
-        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
-            <div class="lr-form-item-title">原使用人员</div>
-            <div id="AOIUsePeople" readonly="readonly"></div>
-        </div>
-        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
-            <div class="lr-form-item-title">新使用人员<font face="宋体">*</font></div>
-            <div id="AOINewUsePeople" isvalid="yes" checkexpession="NotNull"></div>
-        </div>
-        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
-            <div class="lr-form-item-title">原库存位置</div>
-            <div id="AOIStorageId" readonly="readonly"></div>
-        </div>
-        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
-            <div class="lr-form-item-title">新库存位置<font face="宋体">*</font></div>
-            <div id="AOINewStorageId" isvalid="yes" checkexpession="NotNull" ></div>
-        </div>
-        <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsOutItemApply">
-            <div class="lr-form-item-title">数量单位</div>
-            <div id="AOIUnit" readonly="readonly"></div>
-        </div>
-        <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsOutItemApply">
-            <div class="lr-form-item-title">出库照片</div>
-            <div id="AOIPhoto"></div>
-        </div>
-        <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsOutItemApply">
-            <div class="lr-form-item-title">备注</div>
-            <textarea id="AOIContent" class="form-control" style="height: 150px;"></textarea>
-        </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
+        <div class="lr-form-item-title">资产规格</div>
+        <input id="AOISpecification" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
+        <div class="lr-form-item-title">用途</div>
+        <input id="AOIUse" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
+        <div class="lr-form-item-title">原使用部门</div>
+        <div id="AOIOldDepartment" readonly="readonly"> </div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
+        <div class="lr-form-item-title">新使用部门<font face="宋体">*</font></div>
+        <div id="AOINewDepartment" isvalid="yes" checkexpession="NotNull"> </div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
+        <div class="lr-form-item-title">原使用人员</div>
+        <div id="AOIUsePeople" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
+        <div class="lr-form-item-title">新使用人员<font face="宋体">*</font></div>
+        <div id="AOINewUsePeople" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
+        <div class="lr-form-item-title">原楼宇名称</div>
+        <div id="AOIStorageId" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
+        <div class="lr-form-item-title">新楼宇名称<font face="宋体">*</font></div>
+        <div id="AOINewStorageId" checkexpession="NotNull"> </div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
+        <div class="lr-form-item-title">原房间号</div>
+        <div id="AOIRoomId" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
+        <div class="lr-form-item-title">新房间号</div>
+        <div id="AOINewRoomId" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsOutItemApply">
+        <div class="lr-form-item-title">数量单位</div>
+        <div id="AOIUnit" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsOutItemApply">
+        <div class="lr-form-item-title">出库照片</div>
+        <div id="AOIPhoto"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsOutItemApply">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="AOIContent" class="form-control" style="height: 150px;"></textarea>
     </div>
+</div>
 @Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.js")

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

@@ -34,7 +34,47 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
                 param: {}
             });
-            $('#AOIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            //$('#AOIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            //原楼宇
+            $('#AOIStorageId').lrselect({
+                type: 'tree',
+                allowSearch: true,
+                url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+                param: {},
+                select: function (val) {
+                    var storageId = "";
+                    if (val) {
+                        storageId = val.value;
+                    }
+                    $('#AOIRoomId').lrselectRefresh({
+                        url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+                        text: "RCode",
+                        value: "RId"
+                    });
+                }
+            });
+            //原房间
+            $('#AOIRoomId').lrselect({ value: 'RId', text: 'RCode' });
+            //新楼宇
+            $('#AOINewStorageId').lrselect({
+                type: 'tree',
+                allowSearch: true,
+                url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+                param: {},
+                select: function (val) {
+                    var storageId = "";
+                    if (val) {
+                        storageId = val.value;
+                    }
+                    $('#AOINewRoomId').lrselectRefresh({
+                        url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+                        text: "RCode",
+                        value: "RId"
+                    });
+                }
+            });
+            //新房间
+            $('#AOINewRoomId').lrselect({ value: 'RId', text: 'RCode' });
             $('#AOINewDepartment').lrselect({
                 type: 'tree',
                 allowSearch: true,
@@ -148,14 +188,17 @@ var bootstrap = function ($, learun) {
                     learun.httpAsync("post", top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/GetFormDataByCode', { code: selectedRow.AOICode },
                         function (res) {
                             var data = res.Ass_AssetsInfo;
-                            maxstock = data.AStock;
-                            if (data.HasDetail === true) {
+                            if (data) {
+                                maxstock = data.AStock;
+                            }
+                            if (data && data.HasDetail === true) {
                                 $("#AOIStock").attr("checkexpession", "PositiveInteger");
                             } else {
                                 $("#AOIStock").attr("checkexpession", "PositiveFloatint");
                             }
                         });
                     $('#form').lrSetFormData(selectedRow);
+                    $('#AAOldCode').find('span').text(selectedRow.AOIName);
                 }
             }
         }

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

@@ -55,7 +55,7 @@ var bootstrap = function ($, learun) {
                 });
             });
             $("#detailedit").on('click', function () {
-                Ass_InventoryItem
+                //Ass_InventoryItem
                 var keyValue = $('#Ass_InventoryItem').jfGridValue('AAIId');
                 selectedRow = $('#Ass_InventoryItem').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {

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

@@ -28,7 +28,7 @@ var bootstrap = function ($, learun) {
                     title: '新增',
                     url: top.$.rootUrl + '/AssetManagementSystem/Ass_Inventory/Form',
                     width: 1000,
-                    height: 700,
+                    height: 750,
                     callBack: function (id) {
                         var res = false;
                         // 验证数据
@@ -59,7 +59,7 @@ var bootstrap = function ($, learun) {
                         title: '编辑',
                         url: top.$.rootUrl + '/AssetManagementSystem/Ass_Inventory/Form?keyValue=' + keyValue,
                         width: 1000,
-                        height: 700,
+                        height: 750,
                         callBack: function (id) {
                             var res = false;
                             // 验证数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfo/Ass_AssetsInfoEntity.cs

@@ -20,77 +20,77 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         [Column("AID")]
         public string AId { get; set; }
         /// <summary>
-        /// ACode
+        /// 资产编号
         /// </summary>
         [Column("ACODE")]
         public string ACode { get; set; }
         /// <summary>
-        /// AName
+        /// 资产名称
         /// </summary>
         [Column("ANAME")]
         public string AName { get; set; }
         /// <summary>
-        /// ATId
+        /// 资产类别Id
         /// </summary>
         [Column("ATID")]
         public string ATId { get; set; }
         /// <summary>
-        /// AEName
+        /// 资产英文名称
         /// </summary>
         [Column("AENAME")]
         public string AEName { get; set; }
         /// <summary>
-        /// APhoto
+        /// 资产图片
         /// </summary>
         [Column("APHOTO")]
         public string APhoto { get; set; }
         /// <summary>
-        /// AContent
+        /// 资产描述
         /// </summary>
         [Column("ACONTENT")]
         public string AContent { get; set; }
         /// <summary>
-        /// AOrder
+        /// 资产排序
         /// </summary>
         [Column("AORDER")]
         public int? AOrder { get; set; }
         /// <summary>
-        /// AModel
+        /// 资产型号
         /// </summary>
         [Column("AMODEL")]
         public string AModel { get; set; }
         /// <summary>
-        /// AManufacturer
+        /// 生产厂家
         /// </summary>
         [Column("AMANUFACTURER")]
         public string AManufacturer { get; set; }
         /// <summary>
-        /// ASupplierId
+        /// 供应商编号
         /// </summary>
         [Column("ASUPPLIERID")]
         public string ASupplierId { get; set; }
         /// <summary>
-        /// ASource
+        /// 资产来源
         /// </summary>
         [Column("ASOURCE")]
         public string ASource { get; set; }
         /// <summary>
-        /// APrice
+        /// 单价
         /// </summary>
         [Column("APRICE")]
         public decimal? APrice { get; set; }
         /// <summary>
-        /// AStock
+        /// 库存
         /// </summary>
         [Column("ASTOCK")]
         public decimal? AStock { get; set; }
         /// <summary>
-        /// AUnit
+        /// 数量单位
         /// </summary>
         [Column("AUNIT")]
         public string AUnit { get; set; }
         /// <summary>
-        /// HasDetail
+        /// 是否生成资产明细
         /// </summary>
         [Column("HASDETAIL")]
         public bool? HasDetail { get; set; }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsOutItemApply/Ass_AssetsOutItemApplyEntity.cs

@@ -111,11 +111,20 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         [Column("AOISTORAGEID")]
         public string AOIStorageId { get; set; }
         /// <summary>
+        /// 原房间id
+        /// </summary>
+        [Column("AOIROOMID")]
+        public string AOIRoomId { get; set; }
+        /// <summary>
         /// 新库房id
         /// </summary>
         [Column("AOINEWSTORAGEID")]
         public string AOINewStorageId { get; set; }
-        #endregion
+        /// <summary>
+        /// 原房间id
+        /// </summary>
+        [Column("AOINEWROOMID")]
+        public string AOINewRoomId { get; set; }
 
         /// <summary>
         /// 原部门
@@ -128,6 +137,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         /// </summary>
         [Column("AOINEWDEPARTMENT")]
         public string AOINewDepartment { get; set; }
+        #endregion
 
         #region  扩展操作
         /// <summary>