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 0aa56c6e9..3d2902954 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 @@ -92,6 +92,7 @@ var bootstrap = function ($, learun) { height: 80 }); $("#lr_printBar").on('click', function () { + var AIId = $('#gridtable').jfGridValue('AIId'); var keyValue = $('#gridtable').jfGridValue('AICode'); var AName = $('#gridtable').jfGridValue('AIASSName'); if (learun.checkrow(keyValue)) { @@ -113,7 +114,7 @@ var bootstrap = function ($, learun) { learun.layerForm({ id: 'formcardprint', title: '打印二维码', - url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/QRPrint?keyValue=' + keyValue + '&aName=' + escape(AName), + url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/QRPrint?keyValue=' + keyValue + '&aName=' + escape(AName) + '&AIId=' + AIId, width: 700, height: 300, btn: null, @@ -388,7 +389,7 @@ var bootstrap = function ($, learun) { // } //}, - + //{ // label: "资产属性", name: "AIAssType", 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 5a39f0077..e52f1f2a6 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 @@ -23,38 +23,107 @@ -
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @*
*@ +
-
-
打印
- + }); + // 打印表单 + + function AddPrintContent3() { + $('#btnprint').css('display', 'none'); + window.print(); + $('#btnprint').css('display', 'block'); + } + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.js index a87fcd341..9013c7955 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.js @@ -93,7 +93,6 @@ var bootstrap = function ($, learun) { } }); $('#AOINewUsePeople').lrselect({ value: 'F_UserId', text: 'F_RealName' }); - $('#AOINewStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' }); $("#AAOldCode").lrlayerselect({ treeUrl: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsType/GetAllTree', treeParentId: '',