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 @@
资产状态
-
-
管理部门
- -
@*
-
部门
-
+
管理部门
+
*@ +
+
部门
+
+
使用人
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 @@
管理部门
- +
使用人
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 @@
-
+
@@ -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);