调整房间号显示

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

@@ -177,8 +177,8 @@ var bootstrap = function ($, learun) {
                                 key: row.AAIStoragePosition,
                                 keyId: 'rid',
                                 callback: function (_data) {
-                                    if (_data['rname'] && _data['rname'] != 'undefined') {
-                                        content += _data['rcode'] + '(' + _data['rname'] + ')';
+                                    if (_data['rcode'] && _data['rcode'] != 'undefined') {
+                                        content += _data['rcode'];
                                     }
                                 }
                             });

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

@@ -159,8 +159,8 @@ var bootstrap = function ($, learun) {
                                 key: row.AAIStoragePosition,
                                 keyId: 'rid',
                                 callback: function (_data) {
-                                    if (_data['rname'] && _data['rname'] != 'undefined') {
-                                        content += _data['rcode'] + '(' + _data['rname'] + ')';
+                                    if (_data['rcode'] && _data['rcode'] != 'undefined') {
+                                        content += _data['rcode'];
                                     }
                                 }
                             });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Print.cshtml

@@ -124,8 +124,8 @@
                         key: tempdatra[i].AAIStoragePosition,
                         keyId: 'rid',
                         callback: function (_data) {
-                            if (_data['rname'] && _data['rname'] != 'undefined') {
-                                AAIStorage += _data['rname'];
+                            if (_data['rcode'] && _data['rcode'] != 'undefined') {
+                                AAIStorage += _data['rcode'];
                             }
                         }
                     });

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

@@ -165,7 +165,7 @@ var bootstrap = function ($, learun) {
                                 key: value,
                                 keyId: 'rid',
                                 callback: function (_data) {
-                                    callback(_data['rcode']);
+                                    callback(_data['rcode']+"("+_data['rname']+")");
                                 }
                             });
                         }

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

@@ -165,7 +165,7 @@ var bootstrap = function ($, learun) {
                                 key: value,
                                 keyId: 'rid',
                                 callback: function (_data) {
-                                    callback(_data['rcode']);
+                                    callback(_data['rcode']+"("+_data['rname']+")");
                                 }
                             });
                         }

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

@@ -164,7 +164,7 @@ var bootstrap = function ($, learun) {
                                 key: value,
                                 keyId: 'rid',
                                 callback: function (_data) {
-                                    callback(_data['rcode']);
+                                    callback(_data['rcode']+"("+_data['rname']+")");
                                 }
                             });
                         }

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

@@ -155,7 +155,7 @@ var bootstrap = function ($, learun) {
                                 key: value,
                                 keyId: 'rid',
                                 callback: function (_data) {
-                                    callback(_data['rcode']);
+                                    callback(_data['rcode']+"("+_data['rname']+")");
                                 }
                             });
                         }

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

@@ -106,15 +106,11 @@ 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: 'AAIManufacturer', width: 100, align: 'left'
-                    }
+                    //{label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'}
                 ],
                 height: 400,
                 mainId: 'RIID',

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

@@ -62,14 +62,8 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
+                        label: '规格型号', name: 'AAIModel', width: 100, align: 'left'
                     },
-                    {
-                        label: '资产型号', name: 'AAIModel', width: 100, align: 'left'
-                    },
-                    {
-                        label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
-                    }
                 ],
                 height: 400,
                 mainId: 'RIID',