diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Index.cshtml
index 12a30c0e4..2ed0fa29c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Index.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Index.cshtml
@@ -17,10 +17,11 @@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Index.js
index 2f79e8e57..60236ceef 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Index.js
@@ -81,7 +81,7 @@ var bootstrap = function ($, learun) {
if (learun.checkrow(keyValue)) {
learun.layerConfirm('是否确认删除该项!', function (res) {
if (res) {
- learun.deleteForm(top.$.rootUrl + '/LR_Desktop/MessageRind/DeleteForm', { keyValue: keyValue}, function () {
+ learun.deleteForm(top.$.rootUrl + '/LR_Desktop/MessageRind/DeleteForm', { keyValue: keyValue }, function () {
refreshGirdData();
});
}
@@ -92,21 +92,38 @@ var bootstrap = function ($, learun) {
$('#lr_print').on('click', function () {
$('#gridtable').jqprintTable();
});
+ // 查看
+ $('#lr_view').on('click', function () {
+ var title = $('#gridtable').jfGridValue('TheTitle');
+ var keyValue = $('#gridtable').jfGridValue('InstanceId');
+ //var MessageId = $('#gridtable').jfGridValue('MessageId');
+ var ConnectionUrl = $('#gridtable').jfGridValue('ConnectionUrl');
+ var url = top.$.rootUrl + ConnectionUrl + keyValue;
+ learun.layerForm({
+ id: 'formview',
+ title: title,
+ url: url,
+ width: 1000,
+ height: 650,
+ maxmin: true,
+ btn: null,
+ });
+ });
},
-
-
+
+
// 初始化列表
initGird: function () {
$('#gridtable').lrAuthorizeJfGrid({
url: top.$.rootUrl + '/LR_Desktop/MessageRind/GetPageList',
headData: [
//{ label: "收件人ID", name: "ReceiptId", width: 100, align: "left"},
- { label: "收件人姓名", name: "ReceiptName", width: 100, align: "left"},
+ { label: "收件人姓名", name: "ReceiptName", width: 100, align: "left" },
//{ label: "发件人ID", name: "SenderId", width: 100, align: "left"},
- { label: "发件人姓名", name: "SenderName", width: 100, align: "left"},
- { label: "发送时间", name: "SendTime", width: 100, align: "left"},
- { label: "标题", name: "TheTitle", width: 100, align: "left"},
+ { label: "发件人姓名", name: "SenderName", width: 100, align: "left" },
+ { label: "发送时间", name: "SendTime", width: 100, align: "left" },
+ { label: "标题", name: "TheTitle", width: 100, align: "left" },
{ label: "内容", name: "TheContent", width: 400, align: "left" },
{
label: "状态", name: "ReadSigns", width: 100, align: "left", formatter: function (cellvalue) {
@@ -114,7 +131,7 @@ var bootstrap = function ($, learun) {
}
},
],
- mainId:'MessageId',
+ mainId: 'MessageId',
isPage: true
});
},
@@ -122,12 +139,12 @@ var bootstrap = function ($, learun) {
param = param || {};
param.StartTime = startTime;
param.EndTime = endTime;
- $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+ $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
refreshGirdData = function () {
$('#gridtable').jfGridSet('reload');
};
page.init();
-
+
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindService.cs
index a7b9a7bce..db2ee1ed8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindService.cs
@@ -32,15 +32,7 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
var strSql = new StringBuilder();
strSql.Append("SELECT ");
strSql.Append(@"
- t.MessageId,
- t.ReceiptId,
- t.ReceiptName,
- t.SenderId,
- t.SenderName,
- t.SendTime,
- t.TheTitle,
- t.TheContent,
- t.ReadSigns
+ t.*
");
strSql.Append(" FROM MessageRemind t ");
strSql.Append(" WHERE 1=1 ");