【修改】开具发票、收款记账、成本发票、付款记账、费用登记：增加消息提醒查看页面的传参限制；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/BudgetApply/Index.js

@@ -5,6 +5,7 @@
  * 描  述：预算申请
  */
 var refreshGirdData;
+var keyValueInMessageRemind = request('keyValue');//消息提醒-查看-id
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
@@ -13,6 +14,12 @@ var bootstrap = function ($, learun) {
             page.bind();
         },
         bind: function () {
+            //消息提醒-查看：按钮隐藏
+            if (keyValueInMessageRemind != "" && keyValueInMessageRemind != undefined && keyValueInMessageRemind != null) {
+                $('.lr-layout-tool > div').hide();
+            } else {
+                $('.lr-layout-tool > div').show();
+            }
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
@@ -164,6 +171,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.keyValueInMessageRemind = keyValueInMessageRemind;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/CostInvoice/Form.cshtml

@@ -3,33 +3,33 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-6 lr-form-item"  data-table="CostInvoice" >
-        <div class="lr-form-item-title">发票类别</div>
-        <input id="Type" type="text" class="form-control"  />
+    <div class="col-xs-6 lr-form-item" data-table="CostInvoice">
+        <div class="lr-form-item-title">发票类别<font face="宋体">*</font></div>
+        <input id="Type" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="CostInvoice" >
-        <div class="lr-form-item-title">服务名称</div>
-        <input id="ServiceName" type="text" class="form-control"  />
+    <div class="col-xs-6 lr-form-item" data-table="CostInvoice">
+        <div class="lr-form-item-title">服务名称<font face="宋体">*</font></div>
+        <input id="ServiceName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="CostInvoice" >
+    <div class="col-xs-6 lr-form-item" data-table="CostInvoice">
         <div class="lr-form-item-title">税率</div>
-        <input id="TaxRate" type="text" class="form-control"  />
+        <input id="TaxRate" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="CostInvoice" >
-        <div class="lr-form-item-title">开票金额</div>
-        <input id="Amount" type="text" class="form-control"  />
+    <div class="col-xs-6 lr-form-item" data-table="CostInvoice">
+        <div class="lr-form-item-title">开票金额<font face="宋体">*</font></div>
+        <input id="Amount" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="CostInvoice" >
-        <div class="lr-form-item-title">发票号</div>
-        <input id="Number" type="text" class="form-control"  />
+    <div class="col-xs-6 lr-form-item" data-table="CostInvoice">
+        <div class="lr-form-item-title">发票号<font face="宋体">*</font></div>
+        <input id="Number" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="CostInvoice" >
+    <div class="col-xs-6 lr-form-item" data-table="CostInvoice">
         <div class="lr-form-item-title">对方单位</div>
-        <input id="OtherParty" type="text" class="form-control"  />
+        <input id="OtherParty" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="CostInvoice" >
+    <div class="col-xs-12 lr-form-item" data-table="CostInvoice">
         <div class="lr-form-item-title">附件上传</div>
-        <div id="Url"  ></div>
+        <div id="Url"></div>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/CustomFunction/Views/CostInvoice/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/CostInvoice/Index.js

@@ -5,6 +5,7 @@
  * 描  述：成本发票
  */
 var refreshGirdData;
+var keyValueInMessageRemind = request('keyValue');//消息提醒-查看-id
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
@@ -13,6 +14,12 @@ var bootstrap = function ($, learun) {
             page.bind();
         },
         bind: function () {
+            //消息提醒-查看：按钮隐藏
+            if (keyValueInMessageRemind != "" && keyValueInMessageRemind != undefined && keyValueInMessageRemind != null) {
+                $('.lr-layout-tool > div').hide();
+            } else {
+                $('.lr-layout-tool > div').show();
+            }
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -135,6 +142,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.keyValueInMessageRemind = keyValueInMessageRemind;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/PaymentAccount/Index.js

@@ -5,6 +5,7 @@
  * 描  述：付款记账
  */
 var refreshGirdData;
+var keyValueInMessageRemind = request('keyValue');//消息提醒-查看-id
 var bootstrap = function ($, learun) {
     "use strict";
     var processId = '';
@@ -14,6 +15,12 @@ var bootstrap = function ($, learun) {
             page.bind();
         },
         bind: function () {
+            //消息提醒-查看：按钮隐藏
+            if (keyValueInMessageRemind != "" && keyValueInMessageRemind != undefined && keyValueInMessageRemind != null) {
+                $('.lr-layout-tool > div').hide();
+            } else {
+                $('.lr-layout-tool > div').show();
+            }
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
@@ -205,6 +212,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.keyValueInMessageRemind = keyValueInMessageRemind;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtInvoice/Index.js

@@ -5,6 +5,7 @@
  * 描  述：发票
  */
 var refreshGirdData;
+var keyValueInMessageRemind = request('keyValue');//消息提醒-查看-id
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
@@ -13,6 +14,12 @@ var bootstrap = function ($, learun) {
             page.bind();
         },
         bind: function () {
+            //消息提醒-查看：按钮隐藏
+            if (keyValueInMessageRemind != "" && keyValueInMessageRemind != undefined && keyValueInMessageRemind != null) {
+                $('.lr-layout-tool > div').hide();
+            } else {
+                $('.lr-layout-tool > div').show();
+            }
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
@@ -139,6 +146,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.keyValueInMessageRemind = keyValueInMessageRemind;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Index.js

@@ -122,7 +122,7 @@ var bootstrap = function ($, learun) {
                     { 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: "SendTime", width: 150, align: "left" },
                     { label: "标题", name: "TheTitle", width: 100, align: "left" },
                     { label: "内容", name: "TheContent", width: 400, align: "left" },
                     {
@@ -132,7 +132,9 @@ var bootstrap = function ($, learun) {
                     },
                 ],
                 mainId: 'MessageId',
-                isPage: true
+                isPage: true,
+                sidx: 'SendTime',
+                sord:'desc'
             });
         },
         search: function (param) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_BudgetFile/Index.js

@@ -5,6 +5,7 @@
  * 描  述：基础信息采集
  */
 var refreshGirdData;
+var keyValueInMessageRemind = request('keyValue');//消息提醒-查看-id
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
@@ -13,6 +14,12 @@ var bootstrap = function ($, learun) {
             page.bind();
         },
         bind: function () {
+            //消息提醒-查看：按钮隐藏
+            if (keyValueInMessageRemind != "" && keyValueInMessageRemind != undefined && keyValueInMessageRemind != null) {
+                $('.lr-layout-tool > div').hide();
+            } else {
+                $('.lr-layout-tool > div').show();
+            }
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
@@ -174,6 +181,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.keyValueInMessageRemind = keyValueInMessageRemind;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         },
         downLoad: function (fileId) {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/BudgetApply/BudgetApplyService.cs

@@ -34,18 +34,7 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.Id,
-                t.Purpose,
-                t.Amount,
-                t.Remark,
-t.Status,
-                t.CreateTime,
-                t.CreateUserId,
-t.AdjustTime,
-                t.AdjustUserId
-                ");
+                strSql.Append("SELECT t.* ");
                 strSql.Append("  FROM BudgetApply t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -70,6 +59,11 @@ t.AdjustTime,
                 {
                     strSql.Append(queryParam["SqlParameter"].ToString());
                 }
+                if (!queryParam["keyValueInMessageRemind"].IsEmpty())
+                {
+                    dp.Add("keyValueInMessageRemind", queryParam["keyValueInMessageRemind"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Id = @keyValueInMessageRemind ");
+                }
 
                 return this.BaseRepository("CollegeMIS").FindList<BudgetApplyEntity>(strSql.ToString(), dp, pagination);
             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/CostInvoice/CostInvoiceService.cs

@@ -34,21 +34,17 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.Id,
-                t.Type,
-                t.ServiceName,
-                t.TaxRate,
-                t.Amount,
-                t.Number,
-                t.OtherParty,t.Status
-                ");
+                strSql.Append("SELECT t.* ");
                 strSql.Append("  FROM CostInvoice t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
+                if (!queryParam["keyValueInMessageRemind"].IsEmpty())
+                {
+                    dp.Add("keyValueInMessageRemind", queryParam["keyValueInMessageRemind"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Id = @keyValueInMessageRemind ");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<CostInvoiceEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/PaymentAccount/PaymentAccountService.cs

@@ -55,6 +55,11 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
                     dp.Add("PayStatus", queryParam["PayStatus"].ToString(), DbType.String);
                     strSql.Append(" AND t.PayStatus = @PayStatus ");
                 }
+                if (!queryParam["keyValueInMessageRemind"].IsEmpty())
+                {
+                    dp.Add("keyValueInMessageRemind", queryParam["keyValueInMessageRemind"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Id = @keyValueInMessageRemind ");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<PaymentAccountEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DtInvoice/DtInvoiceService.cs

@@ -119,6 +119,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("TaxRate", queryParam["TaxRate"].ToString(), DbType.String);
                     strSql.Append(" AND t.people = @TaxRate ");
                 }
+                if (!queryParam["keyValueInMessageRemind"].IsEmpty())
+                {
+                    dp.Add("keyValueInMessageRemind", queryParam["keyValueInMessageRemind"].ToString(), DbType.String);
+                    strSql.Append(" AND t.id = @keyValueInMessageRemind ");
+                }
                 return this.BaseRepository("waydbString").FindList<DtInvoiceEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindService.cs

@@ -4,6 +4,7 @@ using Learun.Util;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using System.Text;
 
 namespace Learun.Application.TwoDevelopment.LR_Desktop
@@ -69,7 +70,7 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
             try
             {
                 var userInfo = LoginUserInfo.Get();
-                return this.BaseRepository().FindList<MessageRemindEntity>(x => x.ReadSigns == false && x.ReceiptId == userInfo.userId);
+                return this.BaseRepository().FindList<MessageRemindEntity>(x => x.ReadSigns == false && x.ReceiptId == userInfo.userId).OrderByDescending(x=>x.SendTime);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FD_BudgetFile/FD_BudgetFileService.cs

@@ -35,16 +35,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.Id,
-                t.YearNo,
-                t.MouthNo,
-                t.DeptId,
-                t.FileName,
-                t.Url,
-                t.Remark
-                ");
+                strSql.Append("SELECT t.* ");
                 strSql.Append("  FROM FD_BudgetFile t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -65,6 +56,11 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
                     dp.Add("FileName", "%" + queryParam["FileName"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.FileName Like @FileName ");
                 }
+                if (!queryParam["keyValueInMessageRemind"].IsEmpty())
+                {
+                    dp.Add("keyValueInMessageRemind", queryParam["keyValueInMessageRemind"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Id = @keyValueInMessageRemind ");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<FD_BudgetFileEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)