调整资产管理

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

@@ -21,18 +21,18 @@
         <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_AllocationItem">
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AllocationItem">
         <div class="lr-form-item-title">英文名称</div>
         <input id="AOIEName" type="text" class="form-control" readonly="readonly" />
-    </div>
+    </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_AllocationItem">
-        <div class="lr-form-item-title">资产型号</div>
+        <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_AllocationItem">
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AllocationItem">
         <div class="lr-form-item-title">生产厂家</div>
         <input id="AOIManufacturer" type="text" class="form-control" readonly="readonly" />
-    </div>
+    </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_AllocationItem">
         <div class="lr-form-item-title">单价</div>
         <input id="AOIPrice" type="text" class="form-control" readonly="readonly" />

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

@@ -52,8 +52,8 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "英文名称", name: "AEName", width: 200, align: "left" },
-                    { label: "资产型号", name: "AModel", width: 200, align: "left" },
+                    //{ label: "英文名称", name: "AEName", width: 200, align: "left" },
+                    { label: "规格型号", name: "AModel", width: 200, align: "left" },
                     { label: "生产厂家", name: "AManufacturer", width: 200, align: "left" },
                     {
                         label: "供应商", name: "ASupplierId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {

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

@@ -82,8 +82,8 @@ var bootstrap = function ($, learun) {
                                  }
                              });
                         }},
-                    { label: "英文名称", name: "AOIEName", width: 100, align: "left"},
-                    { label: "资产型号", name: "AOIModel", width: 100, align: "left"},
+                    //{ label: "英文名称", name: "AOIEName", width: 100, align: "left"},
+                    { label: "规格型号", name: "AOIModel", width: 100, align: "left"},
                     { label: "生产厂家", name: "AOIManufacturer", width: 100, align: "left"},
                     { label: "单价", name: "AOIPrice", width: 100, align: "left"},
                     { label: "数量", name: "AOIStock", width: 100, align: "left"},

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

@@ -19,10 +19,10 @@
         <div class="lr-form-item-title">资产属性<font face="宋体">*</font></div>
         <div id="AAssType"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">英文名称</div>
-        <input id="AEName" type="text" class="form-control" />
-    </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
+            <div class="lr-form-item-title">英文名称</div>
+            <input id="AEName" type="text" class="form-control" />
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
         <div class="lr-form-item-title">单价<font face="宋体">*</font></div>
         <input id="APrice" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatintZero" />
@@ -40,17 +40,17 @@
         <div id="HasDetail" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">资产型号</div>
+        <div class="lr-form-item-title">规格型号</div>
         <input id="AModel" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">生产厂家</div>
-        <input id="AManufacturer" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">资产来源</div>
-        <div id="ASource"></div>
-    </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
+            <div class="lr-form-item-title">生产厂家</div>
+            <input id="AManufacturer" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
+            <div class="lr-form-item-title">资产来源</div>
+            <div id="ASource"></div>
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
         <div class="lr-form-item-title">供应商</div>
         <div id="ASupplierId"></div>
@@ -63,27 +63,27 @@
         <div class="lr-form-item-title">规格</div>
         <input id="ASpecification" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">用途</div>
-        <input id="AUse" type="text" class="form-control" />
-    </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
+            <div class="lr-form-item-title">用途</div>
+            <input id="AUse" type="text" class="form-control" />
+        </div>*@
 
 
     @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
-        <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_AssetsInfo">
-        <div class="lr-form-item-title">房间号</div>
-        <div id="AIIStoragePosition" isvalid="yes" checkexpession="NotNull"></div>
-    </div>
-    <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">资产照片</div>
-        <div id="APhoto"></div>
-    </div>
-    <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfo">
-        <div class="lr-form-item-title">资产描述</div>
-        <textarea id="AContent" class="form-control" style="height: 150px;"></textarea>
-    </div>*@
+            <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_AssetsInfo">
+            <div class="lr-form-item-title">房间号</div>
+            <div id="AIIStoragePosition" isvalid="yes" checkexpession="NotNull"></div>
+        </div>
+        <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfo">
+            <div class="lr-form-item-title">资产照片</div>
+            <div id="APhoto"></div>
+        </div>
+        <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfo">
+            <div class="lr-form-item-title">资产描述</div>
+            <textarea id="AContent" class="form-control" style="height: 150px;"></textarea>
+        </div>*@
 </div>
 @Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Form.js")

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

@@ -102,17 +102,17 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    {
-                        label: '资产来源', name: 'AAISource', 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: 'AAISource', 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: 'AAIPrice', width: 100, align: 'left'
                     },
@@ -136,7 +136,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: '库房', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                        label: '楼宇名称', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
                                 key: value,
@@ -148,7 +148,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: '库位', name: 'AAIStoragePosition', width: 100, align: 'left',
+                        label: '房间号', name: 'AAIStoragePosition', width: 100, align: 'left',
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
@@ -160,21 +160,15 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    //{label: '英文名称', name: 'AAIEName', width: 100, align: 'left'},
                     {
-                        label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
-                    },
-                    {
-                        label: '资产型号', name: 'AAIModel', width: 100, align: 'left'
-                    },
-                    {
-                        label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
-                    },
-                    {
-                        label: '资产规格', name: 'AAISpecification', width: 100, align: 'left'
+                        label: '规格型号', name: 'AAIModel', width: 100, align: 'left'
                     },
+                    //{label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'},
                     {
-                        label: '用途', name: 'AAIUse', width: 100, align: 'left'
+                        label: '资产品牌', name: 'AAISpecification', width: 100, align: 'left'
                     },
+                    //{label: '用途', name: 'AAIUse', width: 100, align: 'left'},
                     {
                         label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {

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

@@ -40,8 +40,8 @@ var bootstrap = function ($, learun) {
                 grid: [
                     { label: '资产编号', name: 'ACode', width: 200, align: 'left' },
                     { label: '资产名称', name: 'AName', width: 200, align: 'left' },
-                    { label: "英文名称", name: "AEName", width: 200, align: "left" },
-                    { label: "资产型号", name: "AModel", width: 200, align: "left" },
+                    //{ label: "英文名称", name: "AEName", width: 200, align: "left" },
+                    { label: "规格型号", name: "AModel", width: 200, align: "left" },
                     { label: "生产厂家", name: "AManufacturer", width: 200, align: "left" },
                     {
                         label: "供应商", name: "ASupplierId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {

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

@@ -40,8 +40,8 @@ var bootstrap = function ($, learun) {
                 grid: [
                     //{ label: '资产编号', name: 'ACode', width: 200, align: 'left' },
                     { label: '资产名称', name: 'AName', width: 200, align: 'left' },
-                    { label: "英文名称", name: "AEName", width: 200, align: "left" },
-                    { label: "资产型号", name: "AModel", width: 200, align: "left" },
+                    //{ label: "英文名称", name: "AEName", width: 200, align: "left" },
+                    { label: "规格型号", name: "AModel", width: 200, align: "left" },
                     { label: "生产厂家", name: "AManufacturer", width: 200, align: "left" },
                     {
                         label: "供应商", name: "ASupplierId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {

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

@@ -40,8 +40,8 @@ var bootstrap = function ($, learun) {
                 grid: [
                     { label: '资产编号', name: 'ACode', width: 200, align: 'left' },
                     { label: '资产名称', name: 'AName', width: 200, align: 'left' },
-                    { label: "英文名称", name: "AEName", width: 200, align: "left" },
-                    { label: "资产型号", name: "AModel", width: 200, align: "left" },
+                    //{ label: "英文名称", name: "AEName", width: 200, align: "left" },
+                    { label: "规格型号", name: "AModel", width: 200, align: "left" },
                     { label: "生产厂家", name: "AManufacturer", width: 200, align: "left" },
                     {
                         label: "供应商", name: "ASupplierId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {

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

@@ -73,11 +73,9 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    //{label: '英文名称', name: 'AOIEName', width: 100, align: 'left'},
                     {
-                        label: '英文名称', name: 'AOIEName', width: 100, align: 'left'
-                    },
-                    {
-                        label: '资产型号', name: 'AOIModel', width: 100, align: 'left'
+                        label: '规格型号', name: 'AOIModel', width: 100, align: 'left'
                     },
                     {
                         label: '生产厂家', name: 'AOIManufacturer', width: 100, align: 'left'

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApplyIncomplete/FormItem.cshtml

@@ -17,12 +17,12 @@
         <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="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>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
-        <div class="lr-form-item-title">资产型号</div>
+        <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">

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

@@ -24,7 +24,7 @@
     <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title">明细操作</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/Ass_Inventory/Form.js

@@ -128,15 +128,61 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {label: '资产品牌', name: 'AISpecification', width: 100, align: 'left'},
                     {
-                        label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
+                        label: '规格型号', name: 'AAIModel', width: 100, align: 'left'
                     },
                     {
-                        label: '资产型号', name: 'AAIModel', width: 100, align: 'left'
+                        label: '楼宇名称', name: 'AIIStorageId', width: 100, align: 'left',
+                        formatterAsync: function(callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
+                                key: value,
+                                keyId: 'sid',
+                                callback: function (_data) {
+                                    callback(_data['sname']);
+                                }
+                            });
+                        }
                     },
                     {
-                        label: '生产厂家', name: 'AAIManufacturer', 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=' + 'Ass_Storage_Room',
+                                key: value,
+                                keyId: 'rid',
+                                callback: function (_data) {
+                                    callback(_data['rcode']);
+                                }
+                            });
+                        }
+                    },{
+                        label: '使用部门', name: 'AIDepartment', width: 100, align: 'left',
+                        formatterAsync: function(callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                key: value,
+                                keyId: 'id',
+                                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']);
+                                }
+                            });
+                        }
+                    },
                 ],
                 height: 400,
                 mainId: 'AAIId',
@@ -177,7 +223,12 @@ var bootstrap = function ($, learun) {
                     AAIPrice: item.AIAssValue,
                     AAIUnit: item.AIUnits,
                     AAIEName: '',
-                    AAIModel: item.AISpecificationtype,
+                    AAIModel: item.AISpecificationtype,//规格型号
+                    AISpecification: item.AISpecification,//资产品牌
+                    AIIStorageId: item.AIIStorageId,
+                    AIIStoragePosition: item.AIIStoragePosition,
+                    AIDepartment: item.AIDepartment,
+                    AIUsePeople: item.AIUsePeople,
                     AAIManufacturer: item.AIManufacturer,
                     AAIId:learun.newGuid()
                 }

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

@@ -85,15 +85,61 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {label: '资产品牌', name: 'AAIEName', width: 100, align: 'left'},
                     {
-                        label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
+                        label: '规格型号', name: 'AAIModel', width: 100, align: 'left'
                     },
                     {
-                        label: '资产型号', name: 'AAIModel', width: 100, align: 'left'
+                        label: '楼宇名称', name: 'AIIStorageId', width: 100, align: 'left',
+                        formatterAsync: function(callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
+                                key: value,
+                                keyId: 'sid',
+                                callback: function (_data) {
+                                    callback(_data['sname']);
+                                }
+                            });
+                        }
                     },
                     {
-                        label: '生产厂家', name: 'AAIManufacturer', 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=' + 'Ass_Storage_Room',
+                                key: value,
+                                keyId: 'rid',
+                                callback: function (_data) {
+                                    callback(_data['rcode']);
+                                }
+                            });
+                        }
+                    },{
+                        label: '使用部门', name: 'AIDepartment', width: 100, align: 'left',
+                        formatterAsync: function(callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                key: value,
+                                keyId: 'id',
+                                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']);
+                                }
+                            });
+                        }
+                    },
                 ],
                 height: 400,
                 mainId: 'AAIId',

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

@@ -21,12 +21,12 @@
         <div class="lr-form-item-title">资产类别</div>
         <div id="AAITId" readonly="readonly"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_InventoryItemApply">
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_InventoryItemApply">
         <div class="lr-form-item-title">英文名称</div>
         <input id="AAIEName" type="text" class="form-control" readonly="readonly" />
-    </div>
+    </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_InventoryItemApply">
-        <div class="lr-form-item-title">资产型号</div>
+        <div class="lr-form-item-title">规格型号</div>
         <input id="AAIModel" type="text" class="form-control" readonly="readonly" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_InventoryItemApply">

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

@@ -75,7 +75,7 @@ var bootstrap = function ($, learun) {
                             }
                         }
                     },
-                    { label: "资产型号", name: "amodel", width: 150, align: "left" },
+                    { label: "规格型号", name: "amodel", width: 150, align: "left" },
                     { label: "生产厂家", name: "amanufacturer", width: 150, align: "left" },
                     {
                         label: "供应商", name: "asupplierid", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {

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

@@ -82,8 +82,8 @@ var bootstrap = function ($, learun) {
                                  }
                              });
                         }},
-                    { label: "英文名称", name: "AOIEName", width: 100, align: "left"},
-                    { label: "资产型号", name: "AOIModel", width: 100, align: "left"},
+                    //{ label: "英文名称", name: "AOIEName", width: 100, align: "left"},
+                    { label: "规格型号", name: "AOIModel", width: 100, align: "left"},
                     { label: "生产厂家", name: "AOIManufacturer", width: 100, align: "left"},
                     { label: "单价", name: "AOIPrice", width: 100, align: "left"},
                     { label: "数量", name: "AOIStock", width: 100, align: "left"},

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

@@ -107,11 +107,9 @@ var bootstrap = function ($, learun) {
                     {
                         label: '资产名称', name: 'PAIName', width: 100, align: 'left'
                     },
+                    //{label: '英文名称', name: 'PAIEName', width: 100, align: 'left'},
                     {
-                        label: '英文名称', name: 'PAIEName', width: 100, align: 'left'
-                    },
-                    {
-                        label: '资产型号', name: 'PAIModel', width: 100, align: 'left'
+                        label: '规格型号', name: 'PAIModel', width: 100, align: 'left'
                     },
                     {
                         label: '资产类别', name: 'PAITId', width: 100, align: 'left',
@@ -132,15 +130,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '数量', name: 'PAIAmount', width: 100, align: 'left'
                     },
-                    {
-                        label: '生产厂家', name: 'PAIManufacturer', width: 100, align: 'left'
-                    },
+                    //{label: '生产厂家', name: 'PAIManufacturer', width: 100, align: 'left'},
                     {
                         label: '资产要求', name: 'PAIRequest', width: 100, align: 'left'
                     },
-                    {
-                        label: '用途', name: 'PAIUse', width: 100, align: 'left'
-                    },
+                    //{label: '用途', name: 'PAIUse', width: 100, align: 'left'},
                     {
                         label: '资产描述', name: 'PAIContent', width: 100, align: 'left'
                     },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Purchase/StartForm.js

@@ -32,11 +32,9 @@ var bootstrap = function ($, learun) {
                     {
                         label: '资产名称', name: 'PAIName', width: 100, align: 'left'
                     },
+                    //{ label: '英文名称', name: 'PAIEName', width: 100, align: 'left'},
                     {
-                        label: '英文名称', name: 'PAIEName', width: 100, align: 'left'
-                    },
-                    {
-                        label: '资产型号', name: 'PAIModel', width: 100, align: 'left'
+                        label: '规格型号', name: 'PAIModel', width: 100, align: 'left'
                     },
                     {
                         label: '资产类别', name: 'PAITId', width: 100, align: 'left',
@@ -63,9 +61,7 @@ var bootstrap = function ($, learun) {
                     {
                         label: '资产要求', name: 'PAIRequest', width: 100, align: 'left'
                     },
-                    {
-                        label: '用途', name: 'PAIUse', width: 100, align: 'left'
-                    },
+                    //{label: '用途', name: 'PAIUse', width: 100, align: 'left'},
                     {
                         label: '资产描述', name: 'PAIContent', width: 100, align: 'left'
                     },

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

@@ -98,11 +98,9 @@ var bootstrap = function ($, learun) {
                     {
                         label: '资产名称', name: 'PAIName', width:100, align: 'left'
                     },
+                    //{label: '英文名称', name: 'PAIEName', width:100, align: 'left'},
                     {
-                        label: '英文名称', name: 'PAIEName', width:100, align: 'left'
-                    },
-                    {
-                        label: '资产型号', name: 'PAIModel', width:100, align: 'left'
+                        label: '规格型号', name: 'PAIModel', width:100, align: 'left'
                     },
                     {
                         label: '资产类别', name: 'PAITId', width: 100, align: 'left',
@@ -136,9 +134,7 @@ var bootstrap = function ($, learun) {
                     {
                         label: '数量', name: 'PAIAmount', width: 100, align: 'left'
                     },
-                    {
-                        label: '生产厂家', name: 'PAIManufacturer', width:100, align: 'left'
-                    },
+                    //{label: '生产厂家', name: 'PAIManufacturer', width:100, align: 'left'},
                 ],
                 height: 270,
                 mainId:'PAIId'

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

@@ -93,11 +93,9 @@ var bootstrap = function ($, learun) {
                     {
                         label: '资产名称', name: 'PAIName', width: 100, align: 'left'
                     },
+                    //{label: '英文名称', name: 'PAIEName', width: 100, align: 'left'},
                     {
-                        label: '英文名称', name: 'PAIEName', width: 100, align: 'left'
-                    },
-                    {
-                        label: '资产型号', name: 'PAIModel', width: 100, align: 'left'
+                        label: '规格型号', name: 'PAIModel', width: 100, align: 'left'
                     },
                     {
                         label: '资产类别', name: 'PAITId', width: 100, align: 'left',
@@ -118,15 +116,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '数量', name: 'PAIAmount', width: 100, align: 'left'
                     },
-                    {
-                        label: '生产厂家', name: 'PAIManufacturer', width: 100, align: 'left'
-                    },
+                    //{label: '生产厂家', name: 'PAIManufacturer', width: 100, align: 'left'},
                     {
                         label: '资产要求', name: 'PAIRequest', width: 100, align: 'left'
                     },
-                    {
-                        label: '用途', name: 'PAIUse', width: 100, align: 'left'
-                    },
+                    //{label: '用途', name: 'PAIUse', width: 100, align: 'left'},
                     {
                         label: '资产描述', name: 'PAIContent', width: 100, align: 'left'
                     },

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

@@ -12,7 +12,7 @@
         <input id="PAIEName" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_PurchaseItemApply">
-        <div class="lr-form-item-title">资产型号</div>
+        <div class="lr-form-item-title">规格型号</div>
         <input id="PAIModel" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_PurchaseItemApply">

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

@@ -66,8 +66,8 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/AssetManagementSystem/Ass_PurchaseItemApply/GetPageList',
                 headData: [
                     { label: "资产名称", name: "PAIName", width: 100, align: "left"},
-                    { label: "英文名称", name: "PAIEName", width: 100, align: "left"},
-                    { label: "资产型号", name: "PAIModel", width: 100, align: "left"},
+                    //{ label: "英文名称", name: "PAIEName", width: 100, align: "left"},
+                    { label: "规格型号", name: "PAIModel", width: 100, align: "left"},
                     { label: "资产类别", name: "PAITId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op,$cell) {
                              learun.clientdata.getAsync('custmerData', {
@@ -81,9 +81,9 @@ var bootstrap = function ($, learun) {
                         }},
                     { label: "所需金额", name: "PAIPrice", width: 100, align: "left"},
                     { label: "所需数量", name: "PAIAmount", width: 100, align: "left"},
-                    { label: "生产厂家", name: "PAIManufacturer", width: 100, align: "left"},
+                    //{ label: "生产厂家", name: "PAIManufacturer", width: 100, align: "left"},
                     { label: "资产要求", name: "PAIRequest", width: 100, align: "left"},
-                    { label: "用途", name: "PAIUse", width: 100, align: "left"},
+                    //{ label: "用途", name: "PAIUse", width: 100, align: "left"},
                     { label: "资产描述", name: "PAIContent", width: 100, align: "left"},
                 ],
                 mainId:'PAIId',

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

@@ -38,13 +38,13 @@
         <input id="AAIEName" type="text" class="form-control" readonly="readonly" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_InventoryItemApply">
-        <div class="lr-form-item-title">资产型号</div>
+        <div class="lr-form-item-title">规格型号</div>
         <input id="AAIModel" type="text" class="form-control" readonly="readonly" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_InventoryItemApply">
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_InventoryItemApply">
         <div class="lr-form-item-title">生产厂家</div>
         <input id="AAIManufacturer" type="text" class="form-control" readonly="readonly" />
-    </div>
+    </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_InventoryItemApply">
         <div class="lr-form-item-title">资产id</div>
         <input id="AAIAId" type="text" class="form-control" readonly="readonly" />

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

@@ -39,7 +39,7 @@ var bootstrap = function ($, learun) {
                 grid: [
                     { label: '资产编号', name: 'aicodenumjy', width: 150, align: 'left' },
                     { label: '资产名称', name: 'aname', width: 150, align: 'left' },
-                    { label: "英文名称", name: "aename", width: 100, align: "left" },
+                    //{ label: "英文名称", name: "aename", width: 100, align: "left" },
                     {
                         label: '楼宇名称', name: 'aiistorageid', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
@@ -74,8 +74,8 @@ var bootstrap = function ($, learun) {
                             }
                         }
                     },
-                    { label: "资产型号", name: "amodel", width: 150, align: "left" },
-                    { label: "生产厂家", name: "amanufacturer", width: 150, align: "left" },
+                    { label: "规格型号", name: "amodel", width: 150, align: "left" },
+                    //{ label: "生产厂家", name: "amanufacturer", width: 150, align: "left" },
                     {
                         label: "供应商", name: "asupplierid", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {

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

@@ -84,9 +84,9 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "英文名称", name: "AOIEName", width: 100, align: "left" },
-                    { label: "资产型号", name: "AOIModel", width: 100, align: "left" },
-                    { label: "生产厂家", name: "AOIManufacturer", width: 100, align: "left" },
+                    //{ label: "英文名称", name: "AOIEName", width: 100, align: "left" },
+                    { label: "规格型号", name: "AOIModel", width: 100, align: "left" },
+                    //{ label: "生产厂家", name: "AOIManufacturer", width: 100, align: "left" },
                     { label: "单价", name: "AOIPrice", width: 100, align: "left" },
                     { label: "数量", name: "AOIStock", width: 100, align: "left" },
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_InventoryItemApply/Ass_InventoryItemApplyEntity.cs

@@ -122,6 +122,31 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         /// </summary> 
         [Column("AADDRESS")]
         public string AAddress { get; set; }
+        /// <summary> 
+        /// 资产品牌 
+        /// </summary> 
+        [Column("AISPECIFICATION")]
+        public string AISpecification { get; set; }
+        /// <summary> 
+        /// 楼宇 
+        /// </summary> 
+        [Column("AIISTORAGEID")]
+        public string AIIStorageId { get; set; }
+        /// <summary> 
+        /// 房间号
+        /// </summary> 
+        [Column("AIISTORAGEPOSITION")]
+        public string AIIStoragePosition { get; set; }
+        /// <summary> 
+        /// 使用部门
+        /// </summary> 
+        [Column("AIDEPARTMENT")]
+        public string AIDepartment { get; set; }
+        /// <summary> 
+        /// 使用人
+        /// </summary> 
+        [Column("AIUSEPEOPLE")]
+        public string AIUsePeople { get; set; }
 
 
         #endregion