bjquanjiang
/
DigitalScholl
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

资产调整

金隅分支
zhangli 3 years ago
parent
a0d6c61d0c
commit
34341b168f
17 changed files with 462 additions and 441 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +8
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Form.js
  2. +20
    -20
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormItem.cshtml
  3. +73
    -12
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormView.js
  4. +61
    -21
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Print.cshtml
  5. +16
    -16
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJY.js
  6. +19
    -19
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.js
  7. +43
    -17
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.js
  8. +46
    -21
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJYHC.js
  9. +4
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/IndexJYHC.js
  10. +12
    -12
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.cshtml
  11. +31
    -31
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJYHC.cshtml
  12. +4
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsForm.js
  13. +1
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsFormView.js
  14. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Form.js
  15. +5
    -165
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/FormView.js
  16. +109
    -81
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Print.cshtml
  17. +9
    -9
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.cshtml

+ 8
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Form.js View File

@@ -105,7 +105,7 @@ var bootstrap = function ($, learun) {
});
}
});
page.bind();
page.initData();
},
@@ -130,7 +130,7 @@ var bootstrap = function ($, learun) {
},
{
label: '单位', name: 'AAIUnit', width: 80, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
}
},
{
@@ -164,7 +164,9 @@ var bootstrap = function ($, learun) {
key: value,
keyId: 'sid',
callback: function (_data) {
content += _data['sname'];
if (_data['sname'] && _data['sname'] != 'undefined') {
content += _data['sname'];
}
}
});
learun.clientdata.getAsync('custmerData', {
@@ -172,7 +174,9 @@ var bootstrap = function ($, learun) {
key: row.AAIStoragePosition,
keyId: 'rid',
callback: function (_data) {
content += _data['rname'];
if (_data['rname'] && _data['rname'] != 'undefined') {
content += _data['rname'];
}
}
});



+ 20
- 20
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormItem.cshtml View File

@@ -5,42 +5,42 @@
<div class="lr-form-wrap" id="form">
<div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance" style="display: none;">
<div class="lr-form-item-title">资产编号</div>
<input id="AAICode" type="text" class="form-control" value="@ViewBag.AAICode"/>
<input id="AAICode" type="text" class="form-control" value="@ViewBag.AAICode" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
<div class="lr-form-item-title">资产名称<font face="宋体">*</font></div>
<input id="AAIName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
<div class="lr-form-item-title">资产类别<font face="宋体">*</font></div>
<div id="AAITId" isvalid="yes" checkexpession="NotNull"></div>
<div class="lr-form-item-title">资产类别</div>
<div id="AAITId"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
@*<div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
<div class="lr-form-item-title">资产来源</div>
<div id="AAISource"></div>
</div>
</div>*@
<div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
<div class="lr-form-item-title">单位</div>
<div id="AAIUnit"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
<div class="lr-form-item-title">数量<font face="宋体">*</font></div>
<input id="AAIStock" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" />
<div class="lr-form-item-title">数量</div>
<input id="AAIStock" type="number" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
<div class="lr-form-item-title">单价<font face="宋体">*</font></div>
<input id="AAIPrice" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" />
<div class="lr-form-item-title">单价</div>
<input id="AAIPrice" type="number" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
<div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance" style="display: none;">
<div class="lr-form-item-title">生成资产明细</div>
<div id="AAIHasDetail"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
<div class="lr-form-item-title">库房<font face="宋体">*</font></div>
<div class="lr-form-item-title">楼宇名称<font face="宋体">*</font></div>
<div id="AAIStorageId" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
<div class="lr-form-item-title">库位<font face="宋体">*</font></div>
<div class="lr-form-item-title">房间号<font face="宋体">*</font></div>
<div id="AAIStoragePosition" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
@@ -52,25 +52,25 @@
<div id="AAIUseUserId" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
<div class="lr-form-item-title">英文名称</div>
<input id="AAIEName" type="text" class="form-control" />
<div class="lr-form-item-title">资产品牌</div>
<input id="AAISpecification" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
<div class="lr-form-item-title">资产型号</div>
<div class="lr-form-item-title">规格型号</div>
<input id="AAIModel" type="text" class="form-control" />
</div>
@*<div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
<div class="lr-form-item-title">英文名称</div>
<input id="AAIEName" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
<div class="lr-form-item-title">生产厂家</div>
<input id="AAIManufacturer" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
<div class="lr-form-item-title">资产规格</div>
<input id="AAISpecification" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
<div class="lr-form-item-title">用途</div>
<input id="AAIUse" type="text" class="form-control" />
</div>
</div>*@
<div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
<div class="lr-form-item-title">供应商</div>
<div id="AAISupplierId"></div>


+ 73
- 12
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormView.js View File

@@ -98,24 +98,24 @@ var bootstrap = function ($, learun) {
$('#CreateUserId')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;

$('#CreateUserId').val(learun.clientdata.get(['userinfo']).realName);
$('#Ass_Acceptance').jfGrid({
headData: [
//{
// label: '资产编号', name: 'AAICode', width: 150, align: 'left'
//},
{
label: '设备名称', name: 'AAIName', width: 150, align: 'left'
},
//{
// label: '资产型号', name: 'AAIModel', width: 100, align: 'left'
//},
{
label: '规格型号', name: 'AAISpecification', width: 100, align: 'left'
},
{
label: '单位', name: 'AAIUnit', width: 80, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'sldw',
callback: function (_data) {
callback(_data.text);
}
});

}
},
{
@@ -149,7 +149,9 @@ var bootstrap = function ($, learun) {
key: value,
keyId: 'sid',
callback: function (_data) {
content += _data['sname'];
if (_data['sname'] && _data['sname'] != 'undefined') {
content += _data['sname'];
}
}
});
learun.clientdata.getAsync('custmerData', {
@@ -157,7 +159,9 @@ var bootstrap = function ($, learun) {
key: row.AAIStoragePosition,
keyId: 'rid',
callback: function (_data) {
content += _data['rname'];
if (_data['rname'] && _data['rname'] != 'undefined') {
content += _data['rname'];
}
}
});

@@ -178,7 +182,64 @@ var bootstrap = function ($, learun) {
}
}, {
label: '备注', name: 'ARemark', width: 180, align: 'left'
}
},
//{
// label: '资产类别', name: 'AAITId', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('custmerData', {
// url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType',
// key: value,
// keyId: 'atid',
// callback: function (_data) {
// callback(_data['aname']);
// }
// });
// }
//},
//{
// label: '资产来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'zcly',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},

//{
// label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) {
// return (cellvalue === true || cellvalue === "true") ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
// }
//},

//{
// label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
//},
//{
// label: '资产型号', name: 'AAIModel', width: 100, align: 'left'
//},
//{
// label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
//},
//{
// label: '资产规格', name: 'AAISpecification', width: 100, align: 'left'
//},
//{
// label: '用途', name: 'AAIUse', width: 100, align: 'left'
//},
//{
// label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('custmerData', {
// url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_SupplierData',
// key: value,
// keyId: 'sid',
// callback: function (_data) {
// callback(_data['sname']);
// }
// });
// }
//}
],
height: 400,
mainId: 'AAIId',
@@ -191,7 +252,7 @@ var bootstrap = function ($, learun) {
learun.layerForm({
id: 'print',
title: '北京金隅科技学校固定资产验收单',
url: top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/Print',
url: top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/Print?keyValue=' + keyValue,
width: 1100,
height: 800,
btn: null


+ 61
- 21
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Print.cshtml View File

@@ -64,16 +64,26 @@
})

$(function () {
var tempdatra = top["layer_formAss_Acceptance"].tempdatra;
var tempdatra = '';

if (top["layer_formAss_Acceptance"]) {
tempdatra = top["layer_formAss_Acceptance"].tempdatra;
}
else {
var keyValue = getQueryString('keyValue');

if (keyValue) {
var data = top.learun.httpGet(
top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/GetFormData?keyValue=' + keyValue, '');
tempdatra = data.data.Ass_Acceptance;

}
}

if (tempdatra) {
var html = '';
var num = 0, pricenum = 0;
var num = 0, price = 0, pricenum = 0;
for (var i = 0; i < tempdatra.length; i++) {
if (tempdatra[i].AAIStock != 'undefined') {
num += tempdatra[i].AAIStock;
}

pricenum += tempdatra[i].AAIPrice * tempdatra[i].AAIStock;
//单位
var AAIUnit = '';
top.learun.clientdata.getAsync('dataItem', {
@@ -121,22 +131,44 @@
});
//使用人
var AAIUseUser = '';
top.learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
key: tempdatra[i].AAIUseUserId,
keyId: 'f_userid',
callback: function (_data) {
AAIUseUser = _data['f_realname'];
}
});
if (tempdatra[i].AAIUseUserId && tempdatra[i].AAIUseUserId != 'undefined') {
top.learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
key: tempdatra[i].AAIUseUserId,
keyId: 'f_userid',
callback: function (_data) {
AAIUseUser = _data['f_realname'];
}
});
}
var AAIStock = '';
if (tempdatra[i].AAIStock && tempdatra[i].AAIStock != 'undefined') {
AAIStock = tempdatra[i].AAIStock;
}

var AAIPrice = '';
if (tempdatra[i].AAIPrice && tempdatra[i].AAIPrice != 'undefined') {
AAIPrice = tempdatra[i].AAIPrice;
}
if (AAIStock && AAIStock != 'undefined') {
num += AAIStock;
}
if (AAIPrice && AAIPrice != 'undefined') {
price += AAIPrice;
}

if (AAIStock && AAIStock != 'undefined' && AAIPrice && AAIPrice != 'undefined') {
pricenum += AAIPrice * AAIStock;
}

html += '<tr>';
html += '<td>' + i + '</td>';
html += '<td>' + (i + 1) + '</td>';
html += '<td>' + tempdatra[i].AAIName + '</td>';
html += '<td>' + tempdatra[i].AAISpecification + '</td>';
html += '<td>' + AAIUnit + '</td>';
html += '<td>' + tempdatra[i].AAIStock + '</td>';
html += '<td>' + tempdatra[i].AAIPrice + '</td>';
html += '<td>' + tempdatra[i].AAIPrice * tempdatra[i].AAIStock + '</td>';
html += '<td>' + AAIStock + '</td>';
html += '<td>' + AAIPrice + '</td>';
html += '<td>' + AAIPrice * AAIStock + '</td>';
html += '<td>' + AAIUseDeptName + '</td>';
html += '<td>' + AAIStorage + '</td>';
html += '<td>' + AAIUseUser + '</td>';
@@ -155,7 +187,7 @@
html += '<td></td>';
html += '<td></td>';
html += '<td>' + num + '</td>';
html += '<td></td>';
html += '<td>' + price + '</td>';
html += '<td>' + pricenum + '</td>';
html += '<td></td>';
html += '<td></td>';
@@ -167,7 +199,15 @@
$('#t_tbody').html(html);
}
});

function getQueryString(name) {
var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", 'i'); // 匹配目标参数
var result = window.location.search.substr(1).match(reg); // 对querystring匹配目标参数
if (result != null) {
return decodeURIComponent(result[2]);
} else {
return null;
}
}
</script>
</body>
</html>

+ 16
- 16
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJY.js View File

@@ -112,17 +112,17 @@ var bootstrap = function ($, learun) {
});
}
},
{
label: '资产来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'zcly',
callback: function (_data) {
callback(_data.text);
}
});
}
},
//{
// label: '资产来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'zcly',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
{
label: '单价', name: 'AAIPrice', width: 100, align: 'left'
},
@@ -146,7 +146,7 @@ var bootstrap = function ($, learun) {
// }
//},
{
label: '库房', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
label: '楼宇名称', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
key: value,
@@ -158,7 +158,7 @@ var bootstrap = function ($, learun) {
}
},
{
label: '库位', name: 'AAIStoragePosition', width: 100, align: 'left',
label: '房间号', name: 'AAIStoragePosition', width: 100, align: 'left',
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
@@ -208,9 +208,9 @@ var bootstrap = function ($, learun) {
{
label: '规格型号', name: 'AAISpecification', width: 100, align: 'left'
},
{
label: '用途', name: 'AAIUse', width: 100, align: 'left'
},
//{
// label: '用途', name: 'AAIUse', width: 100, align: 'left'
//},
{
label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {


+ 19
- 19
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.js View File

@@ -112,17 +112,17 @@ var bootstrap = function ($, learun) {
// });
// }
//},
{
label: '耗材来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'zcly',
callback: function (_data) {
callback(_data.text);
}
});
}
},
//{
// label: '耗材来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'zcly',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
{
label: '单价', name: 'AAIPrice', width: 100, align: 'left'
},
@@ -146,7 +146,7 @@ var bootstrap = function ($, learun) {
// }
//},
{
label: '库房', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
label: '楼宇名称', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
key: value,
@@ -158,7 +158,7 @@ var bootstrap = function ($, learun) {
}
},
{
label: '库位', name: 'AAIStoragePosition', width: 100, align: 'left',
label: '房间号', name: 'AAIStoragePosition', width: 100, align: 'left',
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
@@ -198,18 +198,18 @@ var bootstrap = function ($, learun) {
//{
// label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
//},
{
label: '耗材品牌', name: 'AAIModel', width: 100, align: 'left'
},
//{
// label: '耗材品牌', name: 'AAIModel', width: 100, align: 'left'
//},
//{
// label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
//},
{
label: '规格型号', name: 'AAISpecification', width: 100, align: 'left'
},
{
label: '用途', name: 'AAIUse', width: 100, align: 'left'
},
//{
// label: '用途', name: 'AAIUse', width: 100, align: 'left'
//},
//{
// label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('custmerData', {


+ 43
- 17
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.js View File

@@ -94,7 +94,7 @@ var bootstrap = function ($, learun) {
$('#Ass_AssetsInfoItemApply').jfGrid({
headData: [
//{
// label: '资产编号', name: 'AAICode', width: 150, align: 'left'
// label: '采购临时编号', name: 'AAICode', width: 150, align: 'left'
//},
{
label: '资产名称', name: 'AAIName', width: 150, align: 'left'
@@ -111,17 +111,17 @@ var bootstrap = function ($, learun) {
});
}
},
{
label: '资产来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'zcly',
callback: function (_data) {
callback(_data.text);
}
});
}
},
//{
// label: '资产来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'zcly',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
{
label: '单价', name: 'AAIPrice', width: 100, align: 'left'
},
@@ -145,7 +145,7 @@ var bootstrap = function ($, learun) {
// }
//},
{
label: '库房', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
label: '楼宇名称', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
key: value,
@@ -157,7 +157,7 @@ var bootstrap = function ($, learun) {
}
},
{
label: '库位', name: 'AAIStoragePosition', width: 100, align: 'left',
label: '房间号', name: 'AAIStoragePosition', width: 100, align: 'left',
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
@@ -169,6 +169,32 @@ var bootstrap = function ($, learun) {
});
}
},
{
label: '使用部门', name: 'AAIUseDeptId', width: 100, align: 'left',
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: value,
keyId: 'id',
callback: function (_data) {
callback(_data['name']);
}
});
}
},
{
label: '使用人', name: 'AAIUseUserId', width: 100, align: 'left',
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
key: value,
keyId: 'f_userid',
callback: function (_data) {
callback(_data['f_realname']);
}
});
}
},
//{
// label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
//},
@@ -181,9 +207,9 @@ var bootstrap = function ($, learun) {
{
label: '规格型号', name: 'AAISpecification', width: 100, align: 'left'
},
{
label: '用途', name: 'AAIUse', width: 100, align: 'left'
},
//{
// label: '用途', name: 'AAIUse', width: 100, align: 'left'
//},
{
label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {


+ 46
- 21
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJYHC.js View File

@@ -91,7 +91,7 @@ var bootstrap = function ($, learun) {
label: '耗材名称', name: 'AAIName', width: 150, align: 'left'
},
//{
// label: '耗材类别', name: 'AAITId', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
// label: '资产类别', name: 'AAITId', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('custmerData', {
// url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType',
// key: value,
@@ -102,17 +102,17 @@ var bootstrap = function ($, learun) {
// });
// }
//},
{
label: '耗材来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'zcly',
callback: function (_data) {
callback(_data.text);
}
});
}
},
//{
// label: '耗材来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'zcly',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
{
label: '单价', name: 'AAIPrice', width: 100, align: 'left'
},
@@ -131,12 +131,12 @@ var bootstrap = function ($, learun) {
}
},
//{
// label: '生成耗材明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) {
// label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) {
// return (cellvalue === true || cellvalue === "true") ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
// }
//},
{
label: '库房', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
label: '楼宇名称', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
key: value,
@@ -148,7 +148,7 @@ var bootstrap = function ($, learun) {
}
},
{
label: '库位', name: 'AAIStoragePosition', width: 100, align: 'left',
label: '房间号', name: 'AAIStoragePosition', width: 100, align: 'left',
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
@@ -159,22 +159,47 @@ var bootstrap = function ($, learun) {
}
});
}
}, {
label: '使用部门', name: 'AAIUseDeptId', width: 100, align: 'left',
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: value,
keyId: 'id',
callback: function (_data) {
callback(_data['name']);
}
});
}
},
{
label: '使用人', name: 'AAIUseUserId', width: 100, align: 'left',
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
key: value,
keyId: 'f_userid',
callback: function (_data) {
callback(_data['f_realname']);
}
});
}
},
//{
// label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
//},
{
label: '耗材品牌', name: 'AAIModel', width: 100, align: 'left'
},
//{
// label: '耗材品牌', name: 'AAIModel', width: 100, align: 'left'
//},
//{
// label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
//},
{
label: '规格型号', name: 'AAISpecification', width: 100, align: 'left'
},
{
label: '用途', name: 'AAIUse', width: 100, align: 'left'
},
//{
// label: '用途', name: 'AAIUse', width: 100, align: 'left'
//},
//{
// label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('custmerData', {


+ 4
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/IndexJYHC.js View File

@@ -58,7 +58,7 @@ var bootstrap = function ($, learun) {
title: '新增',
url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoApply/FormJYHC',
width: 1000,
height: 700,
height: 750,
callBack: function (id) {
var res = false;
// 验证数据
@@ -91,7 +91,7 @@ var bootstrap = function ($, learun) {
title: '采购编辑',
url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoApply/FormJYHC?keyValue=' + keyValue,
width: 1000,
height: 700,
height: 750,
callBack: function (id) {
var res = false;
// 验证数据
@@ -111,7 +111,7 @@ var bootstrap = function ($, learun) {
title: '编辑',
url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoApply/FormJYHC?keyValue=' + keyValue,
width: 1000,
height: 700,
height: 750,
callBack: function (id) {
var res = false;
// 验证数据
@@ -138,7 +138,7 @@ var bootstrap = function ($, learun) {
title: '查看采购申请',
url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoApply/FormViewJYHC?keyValue=' + keyValue,
width: 1000,
height: 600,
height: 750,
btn: null
});
}


+ 12
- 12
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.cshtml View File

@@ -10,8 +10,8 @@
<div id="AAOldCode"></div>
</div>*@
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">资产类别<font face="宋体">*</font></div>
<div id="AAITId" isvalid="yes" checkexpession="NotNull"></div>
<div class="lr-form-item-title">资产类别</div>
<div id="AAITId"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply" style="display: none;">
<div class="lr-form-item-title">采购临时编号<font face="宋体">*</font></div>
@@ -37,33 +37,33 @@
<div class="lr-form-item-title">规格型号</div>
<input id="AAISpecification" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
@*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">用途</div>
<input id="AAIUse" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">资产来源</div>
<div id="AAISource"></div>
</div>
</div>*@
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">供应商</div>
<div id="AAISupplierId" ></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">单价<font face="宋体">*</font></div>
<input id="AAIPrice" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatintZero" />
<div class="lr-form-item-title">单价</div>
<input id="AAIPrice" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">数量<font face="宋体">*</font></div>
<input id="AAIStock" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
<div class="lr-form-item-title">数量</div>
<input id="AAIStock" type="number" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">数量单位<font face="宋体">*</font></div>
<div id="AAIUnit" isvalid="yes" checkexpession="NotNull"></div>
<div class="lr-form-item-title">数量单位</div>
<div id="AAIUnit"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply" style="display: none;">
<div class="lr-form-item-title">排序<font face="宋体">*</font></div>
<input id="AAIOrder" type="text" class="form-control" isvalid="yes" checkexpession="Num" value="1" />
<div class="lr-form-item-title">排序</div>
<input id="AAIOrder" type="text" class="form-control" value="1" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">楼宇名称<font face="宋体">*</font></div>


+ 31
- 31
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJYHC.cshtml View File

@@ -10,9 +10,9 @@
<div id="AAOldCode"></div>
</div>*@
@*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">耗材类别<font face="宋体">*</font></div>
<div id="AAITId" isvalid="yes" checkexpession="NotNull"></div>
</div>*@
<div class="lr-form-item-title">耗材类别<font face="宋体">*</font></div>
<div id="AAITId" isvalid="yes" checkexpession="NotNull"></div>
</div>*@
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply" style="display: none">
<div class="lr-form-item-title">耗材编号</div>
<input id="AAICode" type="text" class="form-control" value="@ViewBag.AAICode" />
@@ -22,48 +22,48 @@
<input id="AAIName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
@*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">英文名称</div>
<input id="AAIEName" type="text" class="form-control" />
</div>*@
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">耗材品牌</div>
<input id="AAIModel" type="text" class="form-control"/>
</div>
@*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">生产厂家</div>
<input id="AAIManufacturer" type="text" class="form-control" />
</div>*@
<div class="lr-form-item-title">英文名称</div>
<input id="AAIEName" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">耗材品牌</div>
<input id="AAIModel" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">生产厂家</div>
<input id="AAIManufacturer" type="text" class="form-control" />
</div>*@
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">规格型号</div>
<input id="AAISpecification" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">用途</div>
<input id="AAIUse" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">耗材来源</div>
<div id="AAISource"></div>
</div>
@*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">用途</div>
<input id="AAIUse" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">耗材来源</div>
<div id="AAISource"></div>
</div>*@
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">供应商</div>
<div id="AAISupplierId"></div>
</div>*@
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">单价<font face="宋体">*</font></div>
<input id="AAIPrice" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatintZero" />
<div class="lr-form-item-title">单价</div>
<input id="AAIPrice" type="number" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">数量<font face="宋体">*</font></div>
<input id="AAIStock" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
<div class="lr-form-item-title">数量</div>
<input id="AAIStock" type="number" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">数量单位<font face="宋体">*</font></div>
<div id="AAIUnit" isvalid="yes" checkexpession="NotNull"></div>
<div class="lr-form-item-title">数量单位</div>
<div id="AAIUnit"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply" style="display: none;">
<div class="lr-form-item-title">排序<font face="宋体">*</font></div>
<input id="AAIOrder" type="text" class="form-control" isvalid="yes" checkexpession="Num" value="1" />
<div class="lr-form-item-title">排序</div>
<input id="AAIOrder" type="text" class="form-control" value="1" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
<div class="lr-form-item-title">楼宇名称<font face="宋体">*</font></div>


+ 4
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsForm.js View File

@@ -121,11 +121,11 @@ var bootstrap = function ($, learun) {
label: '资产名称', name: 'AOIName', width: 150, align: 'left'
},
{
label: '规格型号', name: 'AOISpecification', width: 150, align: 'left'
},
{
label: '数量', name: 'AOIStock', width: 80, align: 'left'
label: '规格型号', name: 'AOIModel ', width: 150, align: 'left'
},
//{
// label: '数量', name: 'AOIStock', width: 80, align: 'left'
//},
{
label: "调出部门", name: "AOIOldDepartment", width: 150, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {


+ 1
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsFormView.js View File

@@ -134,10 +134,7 @@ var bootstrap = function ($, learun) {
label: '资产名称', name: 'AOIName', width: 150, align: 'left'
},
{
label: '规格型号', name: 'AOISpecification', width: 150, align: 'left'
},
{
label: '数量', name: 'AOIStock', width: 80, align: 'left'
label: '规格型号', name: 'AOIModel ', width: 150, align: 'left'
},
{
label: "调出部门", name: "AOIOldDepartment", width: 150, align: "left",


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Form.js View File

@@ -99,7 +99,7 @@ var bootstrap = function ($, learun) {
label: '资产名称', name: 'AOIName', width: 150, align: 'left'
},
{
label: '规格型号', name: 'AOISpecification', width: 150, align: 'left'
label: '规格型号', name: 'AOIModel', width: 150, align: 'left'
},
//{
// label: '数量', name: 'AOIStock', width: 80, align: 'left'


+ 5
- 165
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/FormView.js View File

@@ -47,7 +47,7 @@ var bootstrap = function ($, learun) {
learun.layerForm({
id: 'print',
title: '固定资产调拨单',
url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsOutApply/Print',
url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsOutApply/Print?keyValue=' + keyValue,
width: 1100,
height: 800,
btn: null
@@ -66,7 +66,7 @@ var bootstrap = function ($, learun) {
label: '规格型号', name: 'AOISpecification', width: 100, align: 'left'
},
//{
// label: '数量', name: 'AOIStock', width: 80, align: 'left'
// label: '数量', name: 'AOIStock', width: 80, align: 'left'
//},
{
label: "调出部门", name: "AOIOldDepartment", width: 100, align: "left",
@@ -160,167 +160,7 @@ var bootstrap = function ($, learun) {
mainId: 'AOIId',
reloadSelected: false
});
//$('#Ass_AssetsOutItemApply').jfGrid({
// headData: [
// {
// label: '资产编号', name: 'AOICode', width: 150, align: 'left'
// },
// {
// label: '资产名称', name: 'AOIName', width: 150, align: 'left'
// },
// {
// label: '资产类别', name: 'AOITId', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('custmerData', {
// url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType',
// key: value,
// keyId: 'atid',
// callback: function (_data) {
// callback(_data['aname']);
// }
// });
// }
// },
// {
// label: '单价', name: 'AOIPrice', width: 100, align: 'left'
// },
// {
// label: '数量', name: 'AOIStock', width: 80, align: 'left'
// },
// {
// label: '单位', name: 'AOIUnit', width: 80, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'sldw',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
// },
// {
// label: "使用人", name: "AOIUserPeople", width: 100, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('custmerData', {
// url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
// key: value,
// keyId: 'f_userid',
// callback: function (_data) {
// callback(_data['f_realname']);
// }
// });
// }
// },
// {
// label: "原部门", name: "AOIOldDepartment", width: 100, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('custmerData', {
// url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
// key: value,
// keyId: 'id',
// callback: function (_data) {
// callback(_data['name']);
// }
// });
// }
// },
// {
// label: "原楼宇", name: "AOIStorageId", width: 100, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('custmerData', {
// url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
// key: value,
// keyId: 'sid',
// callback: function (_data) {
// callback(_data['sname']);
// }
// });
// }
// },
// {
// label: "原房间", name: "AOIRoomId", width: 100, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('custmerData', {
// url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
// key: value,
// keyId: 'rid',
// callback: function (_data) {
// callback(_data['rcode']);
// }
// });
// }
// },
// {
// label: "新使用人", name: "AOINewUsePeople", width: 100, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('custmerData', {
// url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
// key: value,
// keyId: 'f_userid',
// callback: function (_data) {
// callback(_data['f_realname']);
// }
// });
// }
// },
// {
// label: "新部门", name: "AOINewDepartment", width: 100, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('custmerData', {
// url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
// key: value,
// keyId: 'id',
// callback: function (_data) {
// callback(_data['name']);
// }
// });
// }
// },
// {
// label: "新楼宇", name: "AOINewStorageId", width: 100, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('custmerData', {
// url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
// key: value,
// keyId: 'sid',
// callback: function (_data) {
// callback(_data['sname']);
// }
// });
// }
// },
// {
// label: "新房间", name: "AOINewRoomId", width: 100, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('custmerData', {
// url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
// key: value,
// keyId: 'rid',
// callback: function (_data) {
// callback(_data['rcode']);
// }
// });
// }
// },
// {
// label: '英文名称', name: 'AOIEName', width: 100, align: 'left'
// },
// {
// label: '资产型号', name: 'AOIModel', width: 100, align: 'left'
// },
// {
// label: '生产厂家', name: 'AOIManufacturer', width: 100, align: 'left'
// },
// {
// label: '资产规格', name: 'AOISpecification', width: 100, align: 'left'
// },
// {
// label: '用途', name: 'AOIUse', width: 100, align: 'left'
// },
// ],
// height: 400,
// mainId: 'AAIId',
// reloadSelected: false,
//});

},
initData: function () {
if (!!keyValue) {
@@ -364,7 +204,7 @@ var bootstrap = function ($, learun) {
return a.AOIOrder - b.AOIOrder;
}
// 设置表单数据
setFormData = function (processId,param,callback) {
setFormData = function (processId, param, callback) {
if (!!processId) {
$.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsOutApply/GetFormDataByProcessId?processId=' + processId, function (data) {
for (var id in data) {
@@ -380,7 +220,7 @@ var bootstrap = function ($, learun) {
}
});
}
callback&& callback()
callback && callback()
}
// 验证数据是否填写完整
validForm = function () {


+ 109
- 81
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Print.cshtml View File

@@ -22,7 +22,7 @@
<td style="width: 150px;">资产编码</td>
<td>资产名称</td>
<td>规格型号</td>
<td style="width: 45px;">数量</td>
@*<td style="width: 45px;">数量</td>*@
<td>调出部门</td>
<td>调出存放地点</td>
<td>调入部门</td>
@@ -65,8 +65,21 @@
})

$(function () {
var tempdatra = top["layer_formAss_AssetsOutApply"].tempdatra;
//console.log(tempdatra);
var tempdatra = '';
if (top["layer_formAss_AssetsOutApply"]) {
tempdatra = top["layer_formAss_AssetsOutApply"].tempdatra;
}
else {
var keyValue = getQueryString('keyValue');

if (keyValue) {
var data = top.learun.httpGet(
top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsOutApply/GetFormData?keyValue=' + keyValue, '');
tempdatra = data.data.Ass_AssetsOutItemApply;

}
}
//console.log('tempdatra', tempdatra);
if (tempdatra) {
var html = '';
var num = 0, pricenum = 0;
@@ -79,92 +92,99 @@
}
//调出部门
var AOIOldDepartment = '';
top.learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: tempdatra[i].AOIOldDepartment,
keyId: 'id',
callback: function (_data) {
if (_data['name'] && _data['name'] != 'undefined') {
AOIOldDepartment = _data['name'];
top.learun.clientdata.getAsync('custmerData',
{
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: tempdatra[i].AOIOldDepartment,
keyId: 'id',
callback: function (_data) {
if (_data['name'] && _data['name'] != 'undefined') {
AOIOldDepartment = _data['name'];
}
}
}
});
});
//调出存放地点
var AAIStorage = '';
top.learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
key: tempdatra[i].AOIStorageId,
keyId: 'sid',
callback: function (_data) {
if (_data['sname'] && _data['sname'] != 'undefined') {
AAIStorage += _data['sname'] + ' ';
top.learun.clientdata.getAsync('custmerData',
{
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
key: tempdatra[i].AOIStorageId,
keyId: 'sid',
callback: function (_data) {
if (_data['sname'] && _data['sname'] != 'undefined') {
AAIStorage += _data['sname'] + ' ';
}
}
}
});
top.learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
key: tempdatra[i].AOIRoomId,
keyId: 'rid',
callback: function (_data) {
if (_data['rcode'] && _data['rcode'] != 'undefined') {
AAIStorage += _data['rcode'];
});
top.learun.clientdata.getAsync('custmerData',
{
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
key: tempdatra[i].AOIRoomId,
keyId: 'rid',
callback: function (_data) {
if (_data['rcode'] && _data['rcode'] != 'undefined') {
AAIStorage += _data['rcode'];
}
}
}
});
});


//调入部门
var AOINewDepartment = '';
top.learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: tempdatra[i].AOINewDepartment,
keyId: 'id',
callback: function (_data) {
if (_data['name'] && _data['name'] != 'undefined') {
AOINewDepartment = _data['name'];
top.learun.clientdata.getAsync('custmerData',
{
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: tempdatra[i].AOINewDepartment,
keyId: 'id',
callback: function (_data) {
if (_data['name'] && _data['name'] != 'undefined') {
AOINewDepartment = _data['name'];
}
}
}
});
});
//调出存放地点
var AOINewStorage = '';
top.learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
key: tempdatra[i].AOINewStorageId,
keyId: 'sid',
callback: function (_data) {
if (_data['sname'] && _data['sname'] != 'undefined') {
AOINewStorage += _data['sname'] + ' ';
top.learun.clientdata.getAsync('custmerData',
{
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
key: tempdatra[i].AOINewStorageId,
keyId: 'sid',
callback: function (_data) {
if (_data['sname'] && _data['sname'] != 'undefined') {
AOINewStorage += _data['sname'] + ' ';
}
}
}
});
top.learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
key: tempdatra[i].AOINewRoomId,
keyId: 'rid',
callback: function (_data) {
if (_data['rcode'] && _data['rcode'] != 'undefined') {
AOINewStorage += _data['rcode'];
});
top.learun.clientdata.getAsync('custmerData',
{
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
key: tempdatra[i].AOINewRoomId,
keyId: 'rid',
callback: function (_data) {
if (_data['rcode'] && _data['rcode'] != 'undefined') {
AOINewStorage += _data['rcode'];
}
}
}
});
});

//使用人
var AAIUseUser = '';
top.learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
key: tempdatra[i].AAIUseUserId,
keyId: 'f_userid',
callback: function (_data) {
AAIUseUser = _data['f_realname'];
}
});
top.learun.clientdata.getAsync('custmerData',
{
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
key: tempdatra[i].AAIUseUserId,
keyId: 'f_userid',
callback: function (_data) {
AAIUseUser = _data['f_realname'];
}
});
html += '<tr>';
html += '<td>' + i + '</td>';
html += '<td>' + (i + 1) + '</td>';
html += '<td>' + tempdatra[i].AOICode + '</td>';
html += '<td>' + tempdatra[i].AOIName + '</td>';
html += '<td>' + tempdatra[i].AOISpecification + '</td>';
html += '<td>' + tempdatra[i].AOIModel + '</td>';

html += '<td>' + AAIStock + '</td>';
//html += '<td>' + AAIStock + '</td>';
html += '<td>' + AOIOldDepartment + '</td>';
html += '<td>' + AAIStorage + '</td>';
html += '<td>' + AOINewDepartment + '</td>';
@@ -178,24 +198,32 @@
html += '</tr>';
}

html += '<tr>';
html += '<td></td>';
html += '<td>合计</td>';
html += '<td></td>';
html += '<td></td>';
html += '<td>' + num + '</td>';
html += '<td></td>';
html += '<td></td>';
html += '<td></td>';
html += '<td></td>';
html += '<td></td>';
html += '</tr>';
//html += '<tr>';
//html += '<td></td>';
//html += '<td>合计</td>';
//html += '<td></td>';
//html += '<td></td>';
//html += '<td>' + num + '</td>';
//html += '<td></td>';
//html += '<td></td>';
//html += '<td></td>';
//html += '<td></td>';
//html += '<td></td>';
//html += '</tr>';

//$('.table tbody').empty().append(html);
$('#t_tbody').html(html);
}
});

function getQueryString(name) {
var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", 'i'); // 匹配目标参数
var result = window.location.search.substr(1).match(reg); // 对querystring匹配目标参数
if (result != null) {
return decodeURIComponent(result[2]);
} else {
return null;
}
}
</script>
</body>
</html>

+ 9
- 9
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.cshtml View File

@@ -13,7 +13,7 @@
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
<div class="lr-form-item-title">资产编号</div>
<input id="AOICode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
<input id="AOICode" type="text" class="form-control" readonly="readonly" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
<div class="lr-form-item-title">资产名称</div>
@@ -28,13 +28,13 @@
<input id="AOIEName" type="text" class="form-control" readonly="readonly" />
</div>*@
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
<div class="lr-form-item-title">资产型号</div>
<div class="lr-form-item-title">规格型号</div>
<input id="AOIModel" type="text" class="form-control" readonly="readonly" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
@*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
<div class="lr-form-item-title">生产厂家</div>
<input id="AOIManufacturer" type="text" class="form-control" readonly="readonly" />
</div>
</div>*@
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
<div class="lr-form-item-title">单价</div>
<input id="AOIPrice" type="text" class="form-control" readonly="readonly" />
@@ -44,13 +44,13 @@
<input id="AOIStock" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
</div>*@
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
<div class="lr-form-item-title">资产规格</div>
<div class="lr-form-item-title">资产品牌</div>
<input id="AOISpecification" type="text" class="form-control" readonly="readonly" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
@*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
<div class="lr-form-item-title">用途</div>
<input id="AOIUse" type="text" class="form-control" />
</div>
</div>*@
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
<div class="lr-form-item-title">原使用部门</div>
<div id="AOIOldDepartment" readonly="readonly"> </div>
@@ -80,8 +80,8 @@
<div id="AOIRoomId" readonly="readonly"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutItemApply">
<div class="lr-form-item-title">新房间号</div>
<div id="AOINewRoomId" checkexpession="NotNull"></div>
<div class="lr-form-item-title">新房间号<font face="宋体">*</font></div>
<div id="AOINewRoomId" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-12 lr-form-item" data-table="Ass_AssetsOutItemApply">
<div class="lr-form-item-title">数量单位</div>


Write Preview
Loading…
Cancel
Save