From ee529921f0f6648393e2bf4d97449ddb1eb71d73 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Thu, 13 May 2021 16:35:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E4=BA=A7=20=20=20=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=94=B9=E4=B8=BA=E4=BD=BF=E7=94=A8=E4=BA=BA?=
 =?UTF-8?q?=E6=89=80=E5=9C=A8=E7=9A=84=E9=83=A8=E9=97=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Ass_AssetsInfoItem/Form.cshtml      | 12 +++++-----
 .../Views/Ass_AssetsInfoItem/FormView.cshtml  |  2 +-
 .../Views/Ass_AssetsInfoItem/Index.js         | 24 +++++++++----------
 .../Views/Ass_AssetsInfoItem/IndexTwo.js      | 24 +++++++++----------
 .../Views/Ass_AssetsInfoItem/QRPrint.cshtml   | 13 +++++++---
 5 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml
index 98ad621d6..bb36784c7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml	
@@ -48,14 +48,14 @@
         <div class="lr-form-item-title">资产状态</div>
         <div id="AIASSState"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">管理部门</div>
-        <input id="AdministrativeDepartment" type="text" class="form-control" />
-    </div>
     @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-            <div class="lr-form-item-title">部门</div>
-            <div id="AIDepartment"></div>
+            <div class="lr-form-item-title">管理部门</div>
+            <input id="AdministrativeDepartment" type="text" class="form-control" />
         </div>*@
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
+        <div class="lr-form-item-title">部门</div>
+        <div id="AIDepartment"></div>
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">使用人</div>
         <div id="AIUsePeople"></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml
index 729893e6a..eb4b8fb82 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml	
@@ -65,7 +65,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">管理部门</div>
-        <input id="AdministrativeDepartment" readonly="readonly" type="text" class="form-control" />
+        <div id="AIDepartment" readonly="readonly"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">使用人</div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js
index 3d2902954..e0512cd35 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js	
@@ -296,18 +296,18 @@ 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: "AdministrativeDepartment", width: 100, align: "left" },
+                    {
+                        label: "管理部门", name: "AIDepartment", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('department', {
+                                key: value,
+                                callback: function (_data) {
+                                    callback(_data.name);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "使用人", name: "AIUsePeople", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
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 82656b087..d22c402a5 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	
@@ -145,18 +145,18 @@ 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: "AdministrativeDepartment", width: 100, align: "left" },
+                    {
+                        label: "管理部门", name: "AIDepartment", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('department', {
+                                key: value,
+                                callback: function (_data) {
+                                    callback(_data.name);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "使用人", name: "AIUsePeople", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/QRPrint.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/QRPrint.cshtml
index e52f1f2a6..b30d88d21 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/QRPrint.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/QRPrint.cshtml	
@@ -29,7 +29,7 @@
                 <div id="top">
                     <div id="qrcode" style="float: left; font-size: 12px;"></div>
                     <div id="roghtDiv" style="float: right; line-height: 25px; padding: 5px;">
-                        <div id="AdministrativeDepartment" style="height: 25px;"></div>
+                        <div id="AIDepartment" style="height: 25px;"></div>
                         <div id="AIUsePeople" style="height: 25px;"></div>
                         <div id="AIIStorageAndRoom" style="height: 25px;"></div>
                     </div>
@@ -63,6 +63,14 @@
                 async: true,
                 success: function (res) {
                     var data = res.data.Ass_AssetsInfoItem;
+                    //部门
+                    var AIDepartment = "";
+                    top.learun.clientdata.getAsync('department', {
+                        key: data.AIDepartment,
+                        callback: function (_data) {
+                            AIDepartment = _data.name;
+                        }
+                    });
                     //使用人
                     var AIUsePeople = "";
                     top.learun.clientdata.getAsync('custmerData',
@@ -96,14 +104,13 @@
                                 AIIStoragePosition = _data['rcode'];
                             }
                         });
-                    $('#AdministrativeDepartment').html(data.AdministrativeDepartment);
+                    $('#AIDepartment').html(AIDepartment);
                     $('#AIUsePeople').html(AIUsePeople);
                     if (AIIStoragePosition) {
                         $('#AIIStorageAndRoom').html(AIIStorage + "-" + AIIStoragePosition);
                     } else {
                         $('#AIIStorageAndRoom').html(AIIStorage);
                     }
-                    $('#AdministrativeDepartment').html(data.AdministrativeDepartment);
                     $('#AICodeNumJY').html(data.AICodeNumJY);
                     $('#AIASSName').html(data.AIASSName);