+
-
@Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/FormView.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/FormView.js
index 7dabcad6d..ea180e8e4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/FormView.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/FormView.js
@@ -83,14 +83,19 @@ var bootstrap = function ($, learun) {
$('#StorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
$('#StorageIdNew').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
$('#UsePeople').lrDataSourceSelect({
- code: 'teacheruserdata', value: 'f_encode', text: 'f_realname',
+ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname',
select: function (item) {
if (item) {
$("#ContactWayNew").val(item.f_mobile);
}
}
});
- $('#Files').lrUploader({ isUpload: false});
+ $('#IsMark').lrselect({
+ data: [{ text: "否", value: "1" }, { text: "是", value: "0" }],
+ text: "text",
+ value: "value"
+ })
+ $('#Files').lrUploader({ isUpload: false });
},
initData: function () {
if (!!keyValue) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/Index.js
index b1dd94fe9..00b5084fd 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/Index.js
@@ -46,8 +46,8 @@ var bootstrap = function ($, learun) {
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
}, 250, 400);
- $('#CreateUser').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
- $('#UsePeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
+ $('#CreateUser').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
+ $('#UsePeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
$('#StorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
$('#StorageIdNew').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
// 刷新
@@ -82,7 +82,7 @@ var bootstrap = function ($, learun) {
if (learun.checkrow(keyValue)) {
var Status = $('#gridtable').jfGridValue('Status');
if (Status != 0) {
- learun.alert.warning("选中记录中包含已审核项目，已审核不能删除！");
+ learun.alert.warning("当前项目不可编辑！");
return;
}
var user = $('#gridtable').jfGridValue('CreateUser');
@@ -166,8 +166,8 @@ var bootstrap = function ($, learun) {
id: 'formAss_FixAssets',
title: '查看',
url: top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssetsApply/FormView?keyValue=' + keyValue,
- width: 600,
- height: 400,
+ width: 800,
+ height: 600,
btn: null
});
}
@@ -197,7 +197,7 @@ var bootstrap = function ($, learun) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
key: value,
- keyId: 'f_encode',
+ keyId: 'f_userid',
callback: function (_data) {
callback(_data['f_realname']);
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_FixAssetsApply/Ass_FixAssetsApplyEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_FixAssetsApply/Ass_FixAssetsApplyEntity.cs
index ea8ef34be..f6a2d0bab 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_FixAssetsApply/Ass_FixAssetsApplyEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_FixAssetsApply/Ass_FixAssetsApplyEntity.cs
@@ -114,6 +114,12 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
///
[Column("PROCESSID")]
public string ProcessId { get; set; }
+ [Column("DEPARTMENT")]
+ public string Department { get; set; }
+ [Column("ASSETSMANAGEMENT")]
+ public string AssetsManagement { get; set; }
+ [Column("ISMARK")]
+ public int? IsMark { get; set; }
#endregion
#region 扩展操作
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_FixAssetsApply/Ass_FixAssetsApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_FixAssetsApply/Ass_FixAssetsApplyService.cs
index 2e65cb160..a9e85e5ed 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_FixAssetsApply/Ass_FixAssetsApplyService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_FixAssetsApply/Ass_FixAssetsApplyService.cs
@@ -234,6 +234,13 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
var entity = this.BaseRepository().FindEntity
(a => a.ProcessId == processId);
entity.Status = pastatus;
this.BaseRepository().Update(entity);
+ if (pastatus == 2)
+ {
+ var Ass_FixAssetsentity = this.BaseRepository().FindEntity(x => x.FAId == entity.FAId);
+ Ass_FixAssetsentity.UsePeople = entity.UsePeople;
+ Ass_FixAssetsentity.StorageId = entity.StorageIdNew;
+ this.BaseRepository().Update(Ass_FixAssetsentity);
+ }
}
catch (Exception e)
{