From 4685f03b9a291eadedc7bafcae6b520d4d9f3b18 Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 1 Jul 2022 11:17:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=BF=E8=88=8D=E5=A5=96=E5=8A=B1=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Acc_Reward/Form.cshtml | 50 ++++++++++++------- .../Views/Acc_Reward/Form.js | 2 + .../Views/Acc_Reward/Index.js | 16 +++++- .../Acc_Reward/Acc_RewardEntity.cs | 15 ++++++ .../Acc_Reward/Acc_RewardService.cs | 17 ++----- 5 files changed, 66 insertions(+), 34 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.cshtml index 6dce9a4dc..682b3f444 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.cshtml @@ -3,41 +3,53 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+
学年
-
+
-
+
学期
-
+
-
+
宿舍楼
-
+
-
+
单元
-
+
-
+
楼层
-
+
-
-
宿舍楼
-
+
+
宿舍
+
-
+
奖励
- + +
+
+
奖励类型
+
-
+
奖励时间
- +
-
+
+
奖励部门
+
+
+
奖励原因
- + +
+
+
附件
+
@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Acc_Reward/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.js index 0a438ce75..150078793 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.js @@ -69,6 +69,8 @@ var bootstrap = function ($, learun) { value: 'id', allowSearch: true }) + $("#FilePath").lrUploader(); + $('#Department').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Index.js index 6fce0e090..95f0a1d2e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Index.js @@ -136,7 +136,7 @@ var bootstrap = function ($, learun) { } }, { - label: "宿舍楼", name: "RId", width: 100, align: "left", + label: "宿舍", name: "RId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_RoomData', @@ -149,6 +149,20 @@ var bootstrap = function ($, learun) { } }, { label: "奖励", name: "RewardContent", width: 100, align: "left" }, + { label: "奖励类型", name: "AType", width: 100, align: "left" }, + { + label: "奖励部门", name: "Department", 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: "RTime", width: 100, align: "left" }, { label: "奖励原因", name: "RReason", width: 100, align: "left" }, ], diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardEntity.cs index eed9239b9..f621f851a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardEntity.cs @@ -74,6 +74,21 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// [Column("FLOOR")] public string Floor { get; set; } + /// + /// 类型 + /// + [Column("ATYPE")] + public string AType { get; set; } + /// + /// 路径 + /// + [Column("FILEPATH")] + public string FilePath { get; set; } + /// + /// 部门 + /// + [Column("DEPARTMENT")] + public string Department { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardService.cs index 00247f88a..5641fe07d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardService.cs @@ -30,18 +30,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement { var strSql = new StringBuilder(); strSql.Append("SELECT "); - strSql.Append(@" - t.ID, - t.SYear, - t.Semester, - t.Dormitory, - t.Unit, - t.Floor, - t.RId, - t.RewardContent, - t.RTime, - t.RReason - "); + strSql.Append(@" * "); strSql.Append(" FROM Acc_Reward t "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); @@ -53,7 +42,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime); strSql.Append(" AND ( t.RTime >= @startTime AND t.RTime <= @endTime ) "); } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) { @@ -105,7 +94,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement { try { - this.BaseRepository("CollegeMIS").Delete(t=>t.ID == keyValue); + this.BaseRepository("CollegeMIS").Delete(t => t.ID == keyValue); } catch (Exception ex) {