From 4be9cbbd54c0b12936910d364ebb8d9c196ad846 Mon Sep 17 00:00:00 2001 From: lb01 Date: Mon, 5 Dec 2022 11:30:08 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=BB=8F=E8=B4=B9=E5=AE=A1=E6=8A=A5?= =?UTF-8?q?=E5=AD=90=E8=A1=A8=E6=98=8E=E7=BB=86=E9=87=91=E9=A2=9D=E5=9B=9B?= =?UTF-8?q?=E8=88=8D=E4=BA=94=E5=85=A5=EF=BC=8C=E5=AD=A6=E7=94=9F=E6=8C=89?= =?UTF-8?q?=E5=A4=A9=E8=AF=B7=E5=81=87=20=E5=BC=80=E5=A7=8B=E5=92=8C?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/AssetManagementSystem/FundsApply/single.vue | 2 +- .../StuLeaveManagement/single.vue | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue index 9a4348ac7..c6ef703f0 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue @@ -374,7 +374,7 @@ console.log(item) let _this = this if (item.Number && item.Price) { - item.Amount = item.Number * item.Price + item.Amount = (item.Number * item.Price).toFixed(2) // _this.current.SumAmount = item.Number * item.Price diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue index 4e9a5feab..98c73f83d 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue @@ -309,12 +309,20 @@ export default { break case 'save': - // console.log(this.current) + const verifyResult = this.verifyForm() if (verifyResult.length > 0) { this.CONFIRM('表单验证失败', verifyResult.join('\n')) return } + + let StartTime = Date.parse(this.current.StuLeaveManagement.StartTime) + let EndTime = Date.parse(this.current.StuLeaveManagement.EndTime) + + if(StartTime > EndTime){ + this.TOAST('结束时间不能早于开始时间') + return + } if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { return From 788742ff8d20665e9e875f3678bc4c53e8a2f53a Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 5 Dec 2022 16:46:23 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=BB=8F=E8=B4=B9=E5=BC=80=E6=94=AF?= =?UTF-8?q?=E7=94=B3=E6=8A=A5=E6=89=8B=E6=9C=BA=E7=AB=AF=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XmlConfig/system.config | 2 ++ .../XmlConfig/system.config | 4 +++- .../FundsApply/FundsApplyService.cs | 17 ++++++++++++++--- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config index 871d1b737..7044f579f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config @@ -167,6 +167,8 @@ + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config index 9ef90188b..6958bd859 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config @@ -102,8 +102,10 @@ + + - + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/FundsApply/FundsApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/FundsApply/FundsApplyService.cs index 12ec5cf91..771154266 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/FundsApply/FundsApplyService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/FundsApply/FundsApplyService.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.AssetManagementSystem @@ -45,10 +46,20 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime); strSql.Append(" AND ( t.ApplyTime >= @startTime AND t.ApplyTime <= @endTime ) "); } - if (!queryParam["ApplyUser"].IsEmpty()) + var userLogin = LoginUserInfo.Get(); + var PrincipalRole = Config.GetValue("PrincipalRoleId"); + var loginInfoRoleIds = LoginUserInfo.Get().roleIds; + if (!userLogin.Description.Contains("管理员") && !loginInfoRoleIds.Split(',').Contains(PrincipalRole)) { - dp.Add("ApplyUser", queryParam["ApplyUser"].ToString(), DbType.String); - strSql.Append(" AND t.ApplyUser = @ApplyUser "); + strSql.Append(" AND t.ApplyUser = '" + userLogin.userId + "' "); + } + else + { + if (!queryParam["ApplyUser"].IsEmpty()) + { + dp.Add("ApplyUser", queryParam["ApplyUser"].ToString(), DbType.String); + strSql.Append(" AND t.ApplyUser = @ApplyUser "); + } } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } From cc1ec46e09388e3cd0d97019177bb85e6a33dab5 Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 5 Dec 2022 17:20:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=BB=8F=E8=B4=B9=E5=BC=80=E6=94=AF?= =?UTF-8?q?=E7=94=B3=E6=8A=A5=E8=A1=A8=E5=8D=95=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/FundsApply/Form.cshtml | 18 ++++++++--------- .../Views/FundsApply/FormView.cshtml | 20 +++++++++---------- .../Views/FundsApply/Index.js | 6 +++--- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.cshtml index 907fcd77e..32959c547 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.cshtml @@ -6,7 +6,7 @@ var NewEnCode = "@ViewBag.EnCode";
- +
经费开支申报单
申报单号
@@ -31,14 +31,6 @@
备注
-
-
总金额
- -
-
-
人民币（大写）
- -
明细操作
@@ -48,5 +40,13 @@
+
+
总金额
+ +
+
+
人民币（大写）
+ +
@Html.AppendJsFile("/Areas/AssetManagementSystem/Views/FundsApply/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.cshtml index 77e8a894a..971afdb82 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.cshtml @@ -6,7 +6,7 @@ var NewEnCode = "@ViewBag.EnCode";
- +
经费开支申报单
申报单号
@@ -31,6 +31,15 @@
备注
+ @*
+
明细操作
+ + + +
*@ +
+
+
总金额
@@ -39,14 +48,5 @@
人民币（大写）
- @*
-
明细操作
- - - -
*@ -
-
-
@Html.AppendJsFile("/Areas/AssetManagementSystem/Views/FundsApply/FormView.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js index 90f3fa408..0777b70a6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js @@ -58,7 +58,7 @@ var bootstrap = function ($, learun) { title: '申请', url: top.$.rootUrl + '/AssetManagementSystem/FundsApply/Form', width: 860, - height: 600, + height: 750, callBack: function (id) { var res = false; // 验证数据 @@ -90,7 +90,7 @@ var bootstrap = function ($, learun) { title: '编辑', url: top.$.rootUrl + '/AssetManagementSystem/FundsApply/Form?keyValue=' + keyValue, width: 860, - height: 600, + height: 750, callBack: function (id) { var res = false; // 验证数据 @@ -156,7 +156,7 @@ var bootstrap = function ($, learun) { title: '查看', url: top.$.rootUrl + '/AssetManagementSystem/FundsApply/FormView?keyValue=' + keyValue, width: 860, - height: 600, + height: 720, callBack: function (id) { } From 3849ee9cd79ec97e3660d8bf835c5111a4219a09 Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 5 Dec 2022 17:46:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?app=20=E7=BB=93=E6=9D=9F=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=BA=BF=E8=B7=AF=20=E7=BB=93=E6=9D=9F=E4=B8=8D=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.WebApi/XmlConfig/ioc.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/ioc.config b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/ioc.config index f9526f23e..956979b97 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/ioc.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/ioc.config @@ -35,6 +35,7 @@ + @@ -77,6 +78,7 @@ +