From 7849a440313774c48a829ade03101579af9bec42 Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 18 Jul 2023 10:20:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E7=A0=94=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=99=84=E4=BB=B6=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E9=87=91=E9=A2=9D=20=E8=AF=84=E4=BB=B7=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/SRProject/Form.cshtml | 8 +-- .../Views/SRProject/Form.js | 1 + .../Views/SRProject/Index.js | 66 +++++++++---------- .../SRProject/SRProjectEntity.cs | 2 + 4 files changed, 40 insertions(+), 37 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/Form.cshtml index faa3029b0..286be255e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/Form.cshtml @@ -31,14 +31,14 @@
结题时间*
-
-
奖励金额
- -
成果形式
+
+
附件
+
+
备注
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/Form.js index c9169e005..86c24e897 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/Form.js @@ -18,6 +18,7 @@ var bootstrap = function ($, learun) { $('#DepartmentId').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' }); $('#Compere').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_account', text: 'f_realname' }); $('#Participant').lrUserSelect(1); + $('#Path').lrUploader(); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/Index.js index 02d194387..a9a66cee7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRProject/Index.js @@ -174,39 +174,39 @@ var bootstrap = function ($, learun) { }); } }, - { - label: "审批部门", name: "AuditDepartment", 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: "AuditUser", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo', - key: value, - keyId: 'f_userid', - callback: function (_data) { - callback(_data['f_realname']); - } - }); - } - }, - { - label: "审批时间", name: "AuditTime", width: 100, align: "left" - , formatter: function (cellvalue) { - return learun.formatDate(cellvalue, 'yyyy-MM-dd hh-mm-ss'); - } - }, - { label: "审批备注", name: "AuditRemark", width: 100, align: "left" }, + //{ + // label: "审批部门", name: "AuditDepartment", 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: "AuditUser", width: 100, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo', + // key: value, + // keyId: 'f_userid', + // callback: function (_data) { + // callback(_data['f_realname']); + // } + // }); + // } + //}, + //{ + // label: "审批时间", name: "AuditTime", width: 100, align: "left" + // , formatter: function (cellvalue) { + // return learun.formatDate(cellvalue, 'yyyy-MM-dd hh-mm-ss'); + // } + //}, + //{ label: "审批备注", name: "AuditRemark", width: 100, align: "left" }, ], mainId: 'ID', isPage: true, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRProject/SRProjectEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRProject/SRProjectEntity.cs index 59569d2e3..1ad6ea369 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRProject/SRProjectEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRProject/SRProjectEntity.cs @@ -69,6 +69,8 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement public string AuditRemark { get; set; } [Column("AUDITTIME")] public DateTime? AuditTime { get; set; } + [Column("PATH")] + public string Path { get; set; } #endregion #region 扩展操作