bjquanjiang
/
DigitalScholl
1
0
Förgrening 0
Kod Ärenden 0 Pull-förfrågningar 0 Släpp 0 Wiki Aktiviteter
Bläddra i källkod

Merge branch '金隅分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 金隅分支

金隅分支
dyy 3 år sedan
förälder
02a525a3fe 6f37bcb6cd
incheckning
91706bbb00
3 ändrade filer med 99 tillägg och 30 borttagningar
Delad Vy
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js
  2. +96
    -27
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/QRPrint.cshtml
  3. +0
    -1
      Learun.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 Visa fil

@@ -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) {


+ 96
- 27
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/QRPrint.cshtml Visa fil

@@ -23,38 +23,107 @@
</head>

<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 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>

</html>

+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.js Visa fil

@@ -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: '',


Skriv Förhandsgranska
Laddar…
Avbryt
Spara