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

调整资产管理

金隅分支
zhangli 3 years ago
parent
34341b168f
commit
686920d787
28 changed files with 130 additions and 104 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Form.js
  2. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormView.js
  3. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Index.js
  4. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/Form.js
  5. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJY.js
  6. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.cshtml
  7. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.js
  8. +14
    -14
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormPurchase.js
  9. +30
    -30
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormPurchaseJY.js
  10. +14
    -14
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormView.js
  11. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.js
  12. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJYHC.js
  13. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml
  14. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml
  15. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js
  16. +4
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js
  17. +4
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.js
  18. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.js
  19. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.cshtml
  20. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormPurchase.cshtml
  21. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Index.js
  22. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/IndexTwo.js
  23. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.js
  24. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Index.js
  25. +13
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFSchemeController.cs
  26. +5
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Views/WfMyTask/Release.js
  27. +8
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Scheme/NWFSchemeInfoEntity.cs
  28. +8
    -6
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Scheme/NWFSchemeService.cs

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

@@ -175,7 +175,7 @@ var bootstrap = function ($, learun) {
keyId: 'rid',
callback: function (_data) {
if (_data['rname'] && _data['rname'] != 'undefined') {
content += _data['rname'];
content += _data['rcode'] + '(' + _data['rname'] + ')';
}
}
});


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

@@ -160,7 +160,7 @@ var bootstrap = function ($, learun) {
keyId: 'rid',
callback: function (_data) {
if (_data['rname'] && _data['rname'] != 'undefined') {
content += _data['rname'];
content += _data['rcode'] + '(' + _data['rname'] + ')';
}
}
});


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Index.js View File

@@ -159,7 +159,7 @@ var bootstrap = function ($, learun) {
return (cellvalue === true || cellvalue === "true") ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
}
},
{ label: "资产型号", name: "AModel", width: 150, align: "left" },
{ label: "规格型号", name: "AModel", width: 150, align: "left" },
{ label: "生产厂家", name: "AManufacturer", width: 150, align: "left" },
{
label: "资产来源", name: "ASource", width: 100, align: "left",
@@ -186,7 +186,7 @@ var bootstrap = function ($, learun) {
}
},
{ label: "资产排序", name: "AOrder", width: 100, align: "left" },
{ label: "资产规格", name: "ASpecification", width: 100, align: "left" },
{ label: "资产品牌", name: "ASpecification", width: 100, align: "left" },
{ label: "用途", name: "AUse", width: 100, align: "left" },
],
mainId: 'AId',


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

@@ -155,7 +155,7 @@ var bootstrap = function ($, learun) {
key: value,
keyId: 'rid',
callback: function (_data) {
callback(_data['rname']);
callback(_data['rcode'] + '(' + _data['rname'] + ')');
}
});
}


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

@@ -165,7 +165,7 @@ var bootstrap = function ($, learun) {
key: value,
keyId: 'rid',
callback: function (_data) {
callback(_data['rname']);
callback(_data['rcode'] + '(' + _data['rname'] + ')');
}
});
}


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

@@ -14,7 +14,7 @@
<div class="lr-form-item-title">采购总价</div>
<input id="AAPrice" type="text" class="form-control" readonly="readonly" />
</div>
<div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfoApply">
<div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfoApply" style="display: none">
<div class="lr-form-item-title">资产属性<font face="宋体">*</font></div>
<div id="AAAssType" isvalid="yes" checkexpession="NotNull"></div>
</div>


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

@@ -158,14 +158,14 @@ var bootstrap = function ($, learun) {
}
},
{
label: '房间号', name: 'AAIStoragePosition', width: 100, align: 'left',
label: '房间号', name: 'AAIStoragePosition', width: 150, 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['rname']);
callback(_data['rcode'] + '(' + _data['rname'] + ')');
}
});
}


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

@@ -105,7 +105,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,
@@ -117,33 +117,33 @@ 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',
key: value,
keyId: 'rid',
callback: function (_data) {
callback(_data['rname']);
callback(_data['rcode'] + '(' + _data['rname'] + ')');
}
});
}
},
//{
// label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
//},
{
label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
label: '规格型号', name: 'AAIModel', width: 100, align: 'left'
},
//{
// label: '生产厂家', name: 'AAIManufacturer', 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: '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', {


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

@@ -71,17 +71,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'
},
@@ -99,13 +99,13 @@ var bootstrap = function ($, learun) {
});
}
},
//{
// 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: '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,
@@ -117,33 +117,33 @@ 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',
key: value,
keyId: 'rid',
callback: function (_data) {
callback(_data['rname']);
callback(_data['rcode'] + '(' + _data['rname'] + ')');
}
});
}
},
//{
// label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
//},
{
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: 'AAIModel', width: 100, align: 'left'
},
//{
// label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
//},
{
label: '用途', name: 'AAIUse', 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', {


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

@@ -136,7 +136,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,
@@ -148,33 +148,33 @@ 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',
key: value,
keyId: 'rid',
callback: function (_data) {
callback(_data['rname']);
callback(_data['rcode'] + '(' + _data['rname'] + ')');
}
});
}
},
//{
// label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
//},
{
label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
label: '规格型号', name: 'AAIModel', width: 100, align: 'left'
},
//{
// label: '生产厂家', name: 'AAIManufacturer', 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: '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', {


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

@@ -164,7 +164,7 @@ var bootstrap = function ($, learun) {
key: value,
keyId: 'rid',
callback: function (_data) {
callback(_data['rname']);
callback(_data['rcode'] + '(' + _data['rname'] + ')');
}
});
}


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

@@ -155,7 +155,7 @@ var bootstrap = function ($, learun) {
key: value,
keyId: 'rid',
callback: function (_data) {
callback(_data['rname']);
callback(_data['rcode'] + '(' + _data['rname'] + ')');
}
});
}


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

@@ -33,11 +33,11 @@
<div id="AIASSClass"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
<div class="lr-form-item-title">资产规格</div>
<div class="lr-form-item-title">资产品牌</div>
<input id="AISpecification" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
<div class="lr-form-item-title">资产型号</div>
<div class="lr-form-item-title">规格型号</div>
<input id="AISpecificationtype" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/FormView.cshtml View File

@@ -54,11 +54,11 @@
<div id="AIASSClass"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
<div class="lr-form-item-title">资产规格</div>
<div class="lr-form-item-title">资产品牌</div>
<input id="AISpecification" readonly="readonly" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
<div class="lr-form-item-title">资产型号</div>
<div class="lr-form-item-title">规格型号</div>
<input id="AISpecificationtype" readonly="readonly" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js View File

@@ -270,9 +270,9 @@ var bootstrap = function ($, learun) {
}
},
{ label: "资产名称", name: "AIASSName", width: 200, align: "left" },
{ label: "资产规格", name: "AISpecification", width: 100, align: "left" },
{ label: "资产品牌", name: "AISpecification", width: 100, align: "left" },
{
label: "资产型号", name: "AISpecificationtype", width: 100, align: "left"
label: "规格型号", name: "AISpecificationtype", width: 100, align: "left"
},
//***************数量
{


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

@@ -244,14 +244,14 @@ var bootstrap = function ($, learun) {
}
},
{
label: "房间号", name: "AIIStoragePosition", width: 100, align: "left",
label: "房间号", name: "AIIStoragePosition", width: 150, 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']);
callback(_data['rcode'] + '(' + _data['rname'] + ')');
}
});
}
@@ -305,7 +305,7 @@ var bootstrap = function ($, learun) {
// }
//},
{
label: "资产型号", name: "AISpecificationtype", width: 100, align: "left"
label: "规格型号", name: "AISpecificationtype", width: 100, align: "left"
},
{
label: "资产属性", name: "AIAssType", width: 100, align: "left",
@@ -372,7 +372,7 @@ var bootstrap = function ($, learun) {
}
},
{ label: "生产厂家", name: "AIManufacturer", width: 100, align: "left" },
{ label: "资产规格", name: "AISpecification", width: 100, align: "left" },
{ label: "资产品牌", name: "AISpecification", width: 100, align: "left" },
{ label: "用途", name: "AIUse", width: 100, align: "left" },
],
mainId: 'AIId',


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

@@ -209,14 +209,14 @@ var bootstrap = function ($, learun) {
}
},
{
label: "房间号", name: "AIIStoragePosition", width: 100, align: "left",
label: "房间号", name: "AIIStoragePosition", width: 150, 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']);
callback(_data['rcode'] + '(' + _data['rname'] + ')');
}
});
}
@@ -270,7 +270,7 @@ var bootstrap = function ($, learun) {
// }
//},
{
label: "资产型号", name: "AISpecificationtype", width: 100, align: "left"
label: "规格型号", name: "AISpecificationtype", width: 100, align: "left"
},
{
label: "资产属性", name: "AIAssType", width: 100, align: "left",
@@ -337,7 +337,7 @@ var bootstrap = function ($, learun) {
}
},
{ label: "生产厂家", name: "AIManufacturer", width: 100, align: "left" },
{ label: "资产规格", name: "AISpecification", width: 100, align: "left" },
{ label: "资产品牌", name: "AISpecification", width: 100, align: "left" },
{ label: "用途", name: "AIUse", width: 100, align: "left" },
],
mainId: 'AIId',


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.js View File

@@ -116,9 +116,9 @@ var bootstrap = function ($, learun) {
}
},
{ label: "资产名称", name: "AIASSName", width: 200, align: "left" },
{ label: "资产规格", name: "AISpecification", width: 100, align: "left" },
{ label: "资产品牌", name: "AISpecification", width: 100, align: "left" },
{
label: "资产型号", name: "AISpecificationtype", width: 100, align: "left"
label: "规格型号", name: "AISpecificationtype", width: 100, align: "left"
},
{
label: "计量单位", name: "AIUnits", width: 100, align: "left",


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

@@ -26,7 +26,7 @@
<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>
<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">
@@ -34,7 +34,7 @@
<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>
<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">


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

@@ -27,7 +27,7 @@
<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>
<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">
@@ -35,7 +35,7 @@
<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>
<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">


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Index.js View File

@@ -79,7 +79,7 @@ var bootstrap = function ($, learun) {
}
});
}},
{ label: "资产型号", name: "AAIModel", width: 100, align: "left"},
{ label: "规格型号", name: "AAIModel", width: 100, align: "left"},
{ label: "生产厂家", name: "AAIManufacturer", width: 100, align: "left"},
{ label: "资产来源", name: "AAISource", width: 100, align: "left",
formatterAsync: function (callback, value, row, op,$cell) {
@@ -117,7 +117,7 @@ var bootstrap = function ($, learun) {
{ label: "排序", name: "AAIOrder", width: 100, align: "left"},
{ label: "资产图片", name: "AAIPhoto", width: 100, align: "left"},
{ label: "资产描述", name: "AAIContent", width: 100, align: "left"},
{ label: "资产规格", name: "AAISpecification", width: 100, align: "left"},
{ label: "资产品牌", name: "AAISpecification", width: 100, align: "left"},
{ label: "用途", name: "AAIUse", width: 100, align: "left"},
],
mainId:'AAIId',


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

@@ -115,9 +115,9 @@ var bootstrap = function ($, learun) {
}
},
{ label: "资产名称", name: "AIASSName", width: 200, align: "left" },
{ label: "资产规格", name: "AISpecification", width: 100, align: "left" },
{ label: "资产品牌", name: "AISpecification", width: 100, align: "left" },
{
label: "资产型号", name: "AISpecificationtype", width: 100, align: "left"
label: "规格型号", name: "AISpecificationtype", width: 100, align: "left"
},
{
label: "计量单位", name: "AIUnits", width: 100, align: "left",


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

@@ -234,6 +234,7 @@ var bootstrap = function ($, learun) {
$('#AOIOldDepartment').lrselectSet(data.AIDepartment);
$('#AOIUsePeople').lrselectSet(data.AIUsePeople);
$('#AOIStorageId').lrselectSet(data.AIIStorageId);
$('#AOIRoomId').lrselectSet(data.AIIStoragePosition);

//$('#Ass_ReceiveItem').jfGridSet('refreshdata', tempdatra.sort(sortNumber));
};


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Index.js View File

@@ -83,7 +83,7 @@ var bootstrap = function ($, learun) {
});
}},
{ label: "英文名称", name: "AOIEName", width: 100, align: "left"},
{ label: "资产型号", name: "AOIModel", width: 100, align: "left"},
{ label: "规格型号", name: "AOIModel", width: 100, align: "left"},
{ label: "生产厂家", name: "AOIManufacturer", width: 100, align: "left"},
{ label: "单价", name: "AOIPrice", width: 100, align: "left"},
{ label: "数量", name: "AOIStock", width: 100, align: "left"},
@@ -99,7 +99,7 @@ var bootstrap = function ($, learun) {
}},
{ label: "出库照片", name: "AOIPhoto", width: 100, align: "left"},
{ label: "资产描述", name: "AOIContent", width: 100, align: "left"},
{ label: "资产规格", name: "AOISpecification", width: 100, align: "left"},
{ label: "资产品牌", name: "AOISpecification", width: 100, align: "left"},
{ label: "用途", name: "AOIUse", width: 100, align: "left"},
{
label: "使用人", name: "AOIUsePeople", width: 100, align: "left",


+ 13
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFSchemeController.cs View File

@@ -251,6 +251,19 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
{
item.imgUrl = null;
}

if (item.F_Id == "3a9e9db8-a928-435b-a9d2-4a4660b4cdeb")
{
item.F_Name = "采购申请(普通)";
item.F_CodeUrl = "/AssetManagementSystem/Ass_AssetsInfoApply/IndexJY";
item.F_Code = "caigoupt";
}
else if (item.F_Id == "307b2c75-174f-424d-84d8-e0f8374ec6d1")
{
item.F_Name = "采购申请(耗材)";
item.F_CodeUrl = "/AssetManagementSystem/Ass_AssetsInfoApply/IndexJYHC";
item.F_Code = "caigouhc";
}
}
return Success(data);
}


+ 5
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Views/WfMyTask/Release.js View File

@@ -99,10 +99,12 @@ var bootstrap = function ($, learun) {
bind: function () {
// 加载自定义流程列表
learun.httpAsync('GET', top.$.rootUrl + '/LR_NewWorkFlow/NWFScheme/GetMyInfoListHasImg', {}, function (data) {
console.log(data);
schemeList = data;
//增加资产申请项目
schemeList.push({ F_Id:'f1414358-cb9b-4eaf-927f-66f6d60e9280', F_Name: '采购申请(普通)', F_Code: 'caigoupt', F_Category: '资产类', F_CodeUrl: '/AssetManagementSystem/Ass_AssetsInfoApply/IndexJY' });
schemeList.push({ F_Id: '74701b0e-ad01-4836-9304-bb39222d3bcd', F_Name: '采购申请(耗材)', F_Code: 'caigouhc', F_Category: '资产类', F_CodeUrl: '/AssetManagementSystem/Ass_AssetsInfoApply/IndexJYHC' });
//增加资产申请项目--20210809 资产改到后台
//schemeList.push({ F_Id:'f1414358-cb9b-4eaf-927f-66f6d60e9280', F_Name: '采购申请(普通)', F_Code: 'caigoupt', F_Category: '资产类', F_CodeUrl: '/AssetManagementSystem/Ass_AssetsInfoApply/IndexJY' });
//schemeList.push({ F_Id: '74701b0e-ad01-4836-9304-bb39222d3bcd', F_Name: '采购申请(耗材)', F_Code: 'caigouhc', F_Category: '资产类', F_CodeUrl: '/AssetManagementSystem/Ass_AssetsInfoApply/IndexJYHC' });
console.log(schemeList);
render();
});



+ 8
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Scheme/NWFSchemeInfoEntity.cs View File

@@ -130,6 +130,14 @@ namespace Learun.Application.WorkFlow
/// <returns></returns>
[NotMapped]
public string F_ProcessId { get; set; }
/// <summary>
/// 地址
/// </summary>
/// <returns></returns>
[NotMapped]
public string F_CodeUrl { get; set; }

#endregion
}
}

+ 8
- 6
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Scheme/NWFSchemeService.cs View File

@@ -15,7 +15,7 @@ namespace Learun.Application.WorkFlow
/// 日 期：2018.12.06
/// 描 述：工作流模板(新)
/// </summary>
public class NWFSchemeService: RepositoryFactory
public class NWFSchemeService : RepositoryFactory
{
#region 获取数据
/// <summary>
@@ -34,7 +34,8 @@ namespace Learun.Application.WorkFlow
strSql.Append(" FROM LR_NWF_SchemeInfo t LEFT JOIN LR_NWF_Scheme t1 ON t.F_SchemeId = t1.F_Id WHERE 1=1 ");

var dp = new DynamicParameters();
if (!string.IsNullOrEmpty(queryJson)) {
if (!string.IsNullOrEmpty(queryJson))
{
var queryParam = queryJson.ToJObject();
if (!queryParam["keyword"].IsEmpty())
{
@@ -87,7 +88,8 @@ namespace Learun.Application.WorkFlow

var strSql = new StringBuilder();
strSql.Append("SELECT * ");
strSql.Append(" FROM LR_NWF_SchemeInfo t WHERE t.F_EnabledMark = 1 AND t.F_Mark = 1 AND t.F_Kind = 1 AND t.F_Id in " + schemeinfoIds);
strSql.Append(" FROM LR_NWF_SchemeInfo t WHERE (t.F_EnabledMark = 1 AND t.F_Mark = 1 AND t.F_Kind = 1 AND t.F_Id in " + schemeinfoIds + ")");
strSql.Append(" or t.F_Id in('3a9e9db8-a928-435b-a9d2-4a4660b4cdeb','307b2c75-174f-424d-84d8-e0f8374ec6d1')");

return this.BaseRepository().FindList<NWFSchemeInfoEntity>(strSql.ToString());
}
@@ -180,7 +182,7 @@ namespace Learun.Application.WorkFlow
}
}
}
/// <summary>
/// 获取模板基础信息的实体
/// </summary>
@@ -303,7 +305,7 @@ namespace Learun.Application.WorkFlow
}
}
}


#endregion
@@ -492,7 +494,7 @@ namespace Learun.Application.WorkFlow
strSql.Append(" and DATEPART(yyyy,p.F_CreateDate) = @year ");
}
strSql.Append(" where si.F_EnabledMark=1 ");
return this.BaseRepository().FindList<NWFSchemeInfoEntity>(strSql.ToString(), dp);
}
catch (Exception ex)


Write Preview
Loading…
Cancel
Save