3 mainītis faili ar 99 papildinājumiem un 30 dzēšanām
Apvienotais skats
Salīdzināšanas iespējas
-
+3 -2Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js
-
+96 -27Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/QRPrint.cshtml
-
+0 -1Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.js
+ 3
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js
Parādīt failu
| @@ -92,6 +92,7 @@ var bootstrap = function ($, learun) { | |||||
| height: 80 | height: 80 | ||||
| }); | }); | ||||
| $("#lr_printBar").on('click', function () { | $("#lr_printBar").on('click', function () { | ||||
| var AIId = $('#gridtable').jfGridValue('AIId'); | |||||
| var keyValue = $('#gridtable').jfGridValue('AICode'); | var keyValue = $('#gridtable').jfGridValue('AICode'); | ||||
| var AName = $('#gridtable').jfGridValue('AIASSName'); | var AName = $('#gridtable').jfGridValue('AIASSName'); | ||||
| if (learun.checkrow(keyValue)) { | if (learun.checkrow(keyValue)) { | ||||
| @@ -113,7 +114,7 @@ var bootstrap = function ($, learun) { | |||||
| learun.layerForm({ | learun.layerForm({ | ||||
| id: 'formcardprint', | id: 'formcardprint', | ||||
| title: '打印二维码', | 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, | width: 700, | ||||
| height: 300, | height: 300, | ||||
| btn: null, | btn: null, | ||||
| @@ -388,7 +389,7 @@ var bootstrap = function ($, learun) { | |||||
| // } | // } | ||||
| //}, | //}, | ||||
| //{ | //{ | ||||
| // label: "资产属性", name: "AIAssType", width: 100, align: "left", | // label: "资产属性", name: "AIAssType", width: 100, align: "left", | ||||
| // formatterAsync: function (callback, value, row, op, $cell) { | // formatterAsync: function (callback, value, row, op, $cell) { | ||||
+ 96
- 27
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/QRPrint.cshtml
Parādīt failu
| @@ -23,38 +23,107 @@ | |||||
| </head> | </head> | ||||
| <body style=""> | <body style=""> | ||||
| <div id="qrcodeBox" style="text-align:center;margin-top:20px;"> | |||||
| <div class="qrcodeBox" style="display:inline-block"> | |||||
| <div id="qrcode" style="margin:0 auto 5px;"></div> | |||||
| <div class="qrcodeTxt" style="font-size:12px;"></div> | |||||
| <div id="qrcodeBox" style="text-align:center;margin-top:20px;"> | |||||
| <div class="qrcodeBox" style="display: inline-block"> | |||||
| <div style="margin: 0 auto 5px;"> | |||||
| <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="AIUsePeople" style="height: 25px;"></div> | |||||
| <div id="AIIStorageAndRoom" style="height: 25px;"></div> | |||||
| </div> | |||||
| </div> | |||||
| <div id="bottom" style="line-height: 20px;"> | |||||
| <div id="AICodeNumJY"></div> | |||||
| <div id="AIASSName"></div> | |||||
| </div> | |||||
| </div> | |||||
| @*<div class="qrcodeTxt" style="font-size:12px;"></div>*@ | |||||
| </div> | |||||
| </div> | </div> | ||||
| </div> | |||||
| <div id="btnprint" type="button" class="btns" value="打印">打印</div> | |||||
| <script> | |||||
| //标签打印 | |||||
| var qrcode = new QRCode(document.getElementById("qrcode"), { | |||||
| width: 80, | |||||
| height: 80 | |||||
| }); | |||||
| var keyValue = request('keyValue');//二维码 | |||||
| var aName = request('aName'); | |||||
| $('.qrcodeTxt').html(unescape( aName)); | |||||
| $(function () { | |||||
| qrcode.makeCode(keyValue); | |||||
| $("#btnprint").on("click", function () { | |||||
| AddPrintContent3() | |||||
| <div id="btnprint" type="button" class="btns" value="打印">打印</div> | |||||
| <script> | |||||
| //标签打印 | |||||
| var qrcode = new QRCode(document.getElementById("qrcode"), { | |||||
| width: 80, | |||||
| height: 80 | |||||
| }); | }); | ||||
| var keyValue = request('keyValue');//二维码 | |||||
| var aName = request('aName'); | |||||
| var AIId = request('AIId'); | |||||
| //$('.qrcodeTxt').html(unescape(aName)); | |||||
| $(function () { | |||||
| qrcode.makeCode(keyValue); | |||||
| //获取打印信息 | |||||
| $.ajax({ | |||||
| url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/GetFormData?keyValue=' + AIId, | |||||
| type: "GET", | |||||
| dataType: "json", | |||||
| async: true, | |||||
| success: function (res) { | |||||
| var data = res.data.Ass_AssetsInfoItem; | |||||
| //使用人 | |||||
| var AIUsePeople = ""; | |||||
| top.learun.clientdata.getAsync('custmerData', | |||||
| { | |||||
| url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', | |||||
| key: data.AIUsePeople, | |||||
| keyId: 'f_userid', | |||||
| callback: function (_data) { | |||||
| AIUsePeople = _data['f_realname']; | |||||
| } | |||||
| }); | |||||
| //楼宇名称 | |||||
| var AIIStorage = ""; | |||||
| top.learun.clientdata.getAsync('custmerData', | |||||
| { | |||||
| url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData', | |||||
| key: data.AIIStorageId, | |||||
| keyId: 'sid', | |||||
| callback: function (_data) { | |||||
| AIIStorage = _data['sname']; | |||||
| } | |||||
| }); | |||||
| //房间号 | |||||
| var AIIStoragePosition = ""; | |||||
| top.learun.clientdata.getAsync('custmerData', | |||||
| { | |||||
| url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room', | |||||
| key: data.AIIStoragePosition, | |||||
| keyId: 'rid', | |||||
| callback: function (_data) { | |||||
| AIIStoragePosition = _data['rcode']; | |||||
| } | |||||
| }); | |||||
| $('#AdministrativeDepartment').html(data.AdministrativeDepartment); | |||||
| $('#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); | |||||
| } | |||||
| }); | |||||
| $("#btnprint").on("click", function () { | |||||
| AddPrintContent3(); | |||||
| }); | |||||
| }); | |||||
| // 打印表单 | |||||
| function AddPrintContent3() { | |||||
| $('#btnprint').css('display', 'none') | |||||
| window.print(); | |||||
| $('#btnprint').css('display', 'block') | |||||
| } | |||||
| </script> | |||||
| }); | |||||
| // 打印表单 | |||||
| function AddPrintContent3() { | |||||
| $('#btnprint').css('display', 'none'); | |||||
| window.print(); | |||||
| $('#btnprint').css('display', 'block'); | |||||
| } | |||||
| </script> | |||||
| </body> | </body> | ||||
| </html> | </html> | ||||
+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.js
Parādīt failu
| @@ -93,7 +93,6 @@ var bootstrap = function ($, learun) { | |||||
| } | } | ||||
| }); | }); | ||||
| $('#AOINewUsePeople').lrselect({ value: 'F_UserId', text: 'F_RealName' }); | $('#AOINewUsePeople').lrselect({ value: 'F_UserId', text: 'F_RealName' }); | ||||
| $('#AOINewStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' }); | |||||
| $("#AAOldCode").lrlayerselect({ | $("#AAOldCode").lrlayerselect({ | ||||
| treeUrl: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsType/GetAllTree', | treeUrl: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsType/GetAllTree', | ||||
| treeParentId: '', | treeParentId: '', | ||||