From f604250647b6d6cd351c3bcb3bd0ecfbf3ca3670 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Wed, 12 May 2021 09:44:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E6=88=BF=E4=BD=8D=E7=BD=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=88=BF=E9=97=B4=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Ass_AssetsInfoItem/Index.cshtml     |  2 +-
 .../Views/Ass_AssetsInfoItem/IndexOfMy.cshtml |  6 +++---
 .../Views/Ass_AssetsInfoItem/IndexOfMy.js     | 21 ++++++++++++++++++-
 .../Ass_AssetsInfoItem/IndexScrap.cshtml      |  6 +++---
 .../Views/Ass_AssetsInfoItem/IndexScrap.js    | 21 ++++++++++++++++++-
 .../Views/Ass_AssetsInfoItem/IndexTwo.cshtml  |  6 +++---
 .../Views/Ass_AssetsInfoItem/IndexTwo.js      | 21 ++++++++++++++++++-
 7 files changed, 70 insertions(+), 13 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.cshtml
index 0a4edfbc5..33c661e4a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.cshtml	
@@ -34,7 +34,7 @@
                                 <input id="AICode" 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="AICodeNumJY" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.cshtml
index a20bc8a37..4ce50138f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.cshtml	
@@ -46,12 +46,12 @@
                                     <input id="AIASSName" 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>
                                     <div id="AIIStorageId"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">库房位置</div>
-                                    <input id="AIIStoragePosition" type="text" class="form-control" />
+                                    <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>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js
index c967777d2..98abf4fb1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js	
@@ -32,7 +32,26 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 400, 400);
-            $('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            //$('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            $('#AIIStorageId').lrselect({
+                type: 'tree',
+                allowSearch: true,
+                url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+                param: {},
+                select: function (val) {
+                    var storageId = "";
+                    if (val) {
+                        storageId = val.value;
+                    }
+                    $('#AIIStoragePosition').lrselectRefresh({
+                        url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+                        text: "RCode",
+                        value: "RId"
+                    });
+                }
+            });
+            //房间
+            $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
             $('#AIASSState').lrDataItemSelect({ code: 'AssState' });
             $('#AIDepartment').lrDepartmentSelect();
             // 刷新
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.cshtml
index 780f465f7..7002896a4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.cshtml	
@@ -46,12 +46,12 @@
                                     <input id="AIASSName" 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>
                                     <div id="AIIStorageId"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">库房位置</div>
-                                    <input id="AIIStoragePosition" type="text" class="form-control" />
+                                    <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>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.js
index a6c1dccc7..f85486799 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.js	
@@ -25,7 +25,26 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 400, 400);
-            $('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            //$('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            $('#AIIStorageId').lrselect({
+                type: 'tree',
+                allowSearch: true,
+                url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+                param: {},
+                select: function (val) {
+                    var storageId = "";
+                    if (val) {
+                        storageId = val.value;
+                    }
+                    $('#AIIStoragePosition').lrselectRefresh({
+                        url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+                        text: "RCode",
+                        value: "RId"
+                    });
+                }
+            });
+            //房间
+            $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
             $('#AIASSState').lrDataItemSelect({ code: 'AssState' });
             $('#AIDepartment').lrDepartmentSelect();
             // 刷新
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.cshtml
index 4ed9ca29d..6157ee2e6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.cshtml	
@@ -42,12 +42,12 @@
                                     <input id="AIASSName" 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>
                                     <div id="AIIStorageId"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">库房位置</div>
-                                    <input id="AIIStoragePosition" type="text" class="form-control" />
+                                    <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>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.js
index e4d6abab6..05d2b03a0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.js	
@@ -33,7 +33,26 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 400, 400);
-            $('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            //$('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            $('#AIIStorageId').lrselect({
+                type: 'tree',
+                allowSearch: true,
+                url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
+                param: {},
+                select: function (val) {
+                    var storageId = "";
+                    if (val) {
+                        storageId = val.value;
+                    }
+                    $('#AIIStoragePosition').lrselectRefresh({
+                        url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
+                        text: "RCode",
+                        value: "RId"
+                    });
+                }
+            });
+            //房间
+            $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
             $('#AIASSState').lrDataItemSelect({ code: 'AssState' });
             $('#AIAssType').lrDataItemSelect({ code: 'AssType' });
             $('#AIDepartment').lrDepartmentSelect();