Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.cshtml

@@ -6,7 +6,7 @@
     var NewEnCode = "@ViewBag.EnCode";
 </script>
 <div class="lr-form-wrap" id="form">
-
+    <div style="padding: 0px; padding-left:30px; line-height: 38px; text-align: center; font-size: 24px; font-weight: bold; color: rgb(51, 51, 51);">经费开支申报单</div>
     <div class="col-xs-6 lr-form-item" data-table="FundsApply">
         <div class="lr-form-item-title">申报单号</div>
         <input id="EnCode" type="text" readonly class="form-control" readonly="readonly" />
@@ -31,14 +31,6 @@
         <div class="lr-form-item-title">备注</div>
         <input id="Remark" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="FundsApply">
-        <div class="lr-form-item-title">总金额</div>
-        <input id="SumAmount" type="text" class="form-control" readonly="readonly" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="FundsApply">
-        <div class="lr-form-item-title">人民币（大写）</div>
-        <input id="UpperAmount" type="text" class="form-control" readonly="readonly" />
-    </div>
     <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title">明细操作</div>
         <input id="detailadd" type="button" class="btn btn-success" value="新增明细" />
@@ -48,5 +40,13 @@
     <div class="col-xs-12 lr-form-item lr-form-item-grid">
         <div id="FundsApplyDetail"></div>
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="FundsApply">
+        <div class="lr-form-item-title">总金额</div>
+        <input id="SumAmount" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FundsApply">
+        <div class="lr-form-item-title">人民币（大写）</div>
+        <input id="UpperAmount" type="text" class="form-control" readonly="readonly" />
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/AssetManagementSystem/Views/FundsApply/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.cshtml

@@ -6,7 +6,7 @@
     var NewEnCode = "@ViewBag.EnCode";
 </script>
 <div class="lr-form-wrap" id="form">
-
+    <div style="padding: 0px; line-height: 38px; text-align: center; font-size: 20px; font-weight: bold; color: rgb(51, 51, 51);">经费开支申报单</div>
     <div class="col-xs-6 lr-form-item" data-table="FundsApply">
         <div class="lr-form-item-title">申报单号</div>
         <input id="EnCode" type="text" readonly class="form-control" readonly="readonly" />
@@ -31,6 +31,15 @@
         <div class="lr-form-item-title">备注</div>
         <input id="Remark" type="text" class="form-control" />
     </div>
+    @*<div class="col-xs-12 lr-form-item">
+            <div class="lr-form-item-title">明细操作</div>
+            <input id="detailadd" type="button" class="btn btn-success" value="新增明细" />
+            <input id="detailedit" type="button" class="btn btn-warning" value="编辑明细" />
+            <input id="detaildel" type="button" class="btn btn-danger" value="移除明细" />
+        </div>*@
+    <div class="col-xs-12 lr-form-item lr-form-item-grid">
+        <div id="FundsApplyDetail"></div>
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="FundsApply">
         <div class="lr-form-item-title">总金额</div>
         <input id="SumAmount" type="text" class="form-control" readonly="readonly" />
@@ -39,14 +48,5 @@
         <div class="lr-form-item-title">人民币（大写）</div>
         <input id="UpperAmount" type="text" class="form-control" readonly="readonly" />
     </div>
-    @*<div class="col-xs-12 lr-form-item">
-        <div class="lr-form-item-title">明细操作</div>
-        <input id="detailadd" type="button" class="btn btn-success" value="新增明细" />
-        <input id="detailedit" type="button" class="btn btn-warning" value="编辑明细" />
-        <input id="detaildel" type="button" class="btn btn-danger" value="移除明细" />
-    </div>*@
-    <div class="col-xs-12 lr-form-item lr-form-item-grid">
-        <div id="FundsApplyDetail"></div>
-    </div>
 </div>
 @Html.AppendJsFile("/Areas/AssetManagementSystem/Views/FundsApply/FormView.js")

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) {
 
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config

@@ -167,6 +167,8 @@
   <add key="EpidemicControlTeamRoleId" value="87f38e4e-b0a6-472c-b01a-2620b8f1ec46" />
   <!--注册教师生成编号 金隅:jy;西昌：xc；大厂：dc-->
   <add key="EmpNoRule" value="jy"/>
+  <!--校长角色Id-->
+  <add key="PrincipalRoleId" value="72b0df2d-66cc-4c84-a7d7-f3728c787d92" />
   <!--考勤明细统计时查询的职工编号前缀 大厂：DCZZ-->
   <add key="ADR_RecordUserNoPrev" value=""/>
   <!--第三方登录跳转地址（最后不加/）-->

Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/ioc.config

@@ -35,6 +35,7 @@
     <typeAlias alias="StuCancelDisciplineManagementMethod" type="Learun.Application.WorkFlow.StuCancelDisciplineManagementMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="StuDisciplineManagementMethod" type="Learun.Application.WorkFlow.StuDisciplineManagementMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="StudentCertificateMethod" type="Learun.Application.WorkFlow.StudentCertificateMethod,Learun.Application.WorkFlow" />
+    <typeAlias alias="FundsApplyMethod" type="Learun.Application.WorkFlow.FundsApplyMethod,Learun.Application.WorkFlow" />
 
     <!--任务调度器-->
     <typeAlias alias="ITSMethod" type="Learun.Application.Extention.TaskScheduling.ITsMethod,Learun.Application.Extention" />
@@ -77,6 +78,7 @@
       <type type="IWorkFlowMethod" mapTo="StuCancelDisciplineManagementMethod" name="StuCancelDisciplineManagementMethod"></type>
       <type type="IWorkFlowMethod" mapTo="StuDisciplineManagementMethod" name="StuDisciplineManagementMethod"></type>
       <type type="IWorkFlowMethod" mapTo="StudentCertificateMethod" name="StudentCertificateMethod"></type>
+      <type type="IWorkFlowMethod" mapTo="FundsApplyMethod" name="FundsApplyMethod"></type>
     </container>
     <container name="TsIOCcontainer">
       <!--<type type="ITSMethod" mapTo="TestTask" name="taskioc"></type>-->

Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config

@@ -102,8 +102,10 @@
   <add key="EpidemicControlTeamRoleId" value="87f38e4e-b0a6-472c-b01a-2620b8f1ec46" />
   <!--系主任角色Id-->
   <add key="DeptDirectorRoleId" value="cccde0ce-ebfe-41f2-9a78-e49aaa21cd5a" />
+  <!--校长角色Id-->
+  <add key="PrincipalRoleId" value="72b0df2d-66cc-4c84-a7d7-f3728c787d92" />
   <add key="QJUrl" value="www.qj.com"/>
   <!-- 报名选修课的最大课程数 -->
   <add key="ElectiveLessonApplyMax" value="2" />
- 
+
 </appSettings>

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<FundsApplyEntity>(strSql.ToString(), dp, pagination);
             }

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
 

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