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 107033884..345a7a0d5 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 @@ -41,6 +41,10 @@
人民币（大写）
+
+
附件
+
+
明细操作
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.js index e787de04f..77f294aea 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.js @@ -97,6 +97,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { + $('#Path').lrUploader({ extensions: 'gif,jpeg,jpg,png,bmp'}); $('#IsFixedAssets').lrDataItemSelect({ code: 'YesOrNoInt' }); $('#ApplyDept').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' }); $('#ApplyDept').lrselectSet(learun.clientdata.get(['userinfo']).departmentId); 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 84b0fadcd..3195bf9a3 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 @@ -41,6 +41,10 @@
人民币（大写）
+
+
附件
+
+
@*
明细操作
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.js index 7e68678db..6387babfb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.js @@ -97,6 +97,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { + $('#Path').lrUploader({ isUpload: false }); $('#IsFixedAssets').lrDataItemSelect({ code: 'YesOrNoInt' }); $('#ApplyDept').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' }); $('#ApplyDept').lrselectSet(learun.clientdata.get(['userinfo']).departmentId); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/FundsApply/FundsApplyEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/FundsApply/FundsApplyEntity.cs index 52107d240..80c4bb6e0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/FundsApply/FundsApplyEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/FundsApply/FundsApplyEntity.cs @@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem /// 日 期：2022-11-07 14:25 /// 描 述：经费开支申报 /// - public class FundsApplyEntity + public class FundsApplyEntity { #region 实体成员 /// @@ -69,6 +69,9 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem /// [Column("STATUS")] public int? Status { get; set; } + [Column("PATH")] + public string Path { get; set; } + #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs index c2a2be497..b3a350a70 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs @@ -896,6 +896,45 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration #endregion break; + + case "04": //转入 + #region 学籍表加数据 + var stuInfoBasicEntity = new StuInfoBasicEntity(); + stuInfoBasicEntity.StuId = upTrua.StuId; + stuInfoBasicEntity.StuNo = upTrua.StuNo; + stuInfoBasicEntity.ProvinceCode = upTrua.StuNo; + stuInfoBasicEntity.StuName = upTrua.StuName; + stuInfoBasicEntity.DeptNo = upTrua.NewDeptNo; + stuInfoBasicEntity.MajorNo = upTrua.NewMajorNo; + stuInfoBasicEntity.Grade = upTrua.NewGrade; + stuInfoBasicEntity.ClassNo = upTrua.NewClassNo; + stuInfoBasicEntity.EduSystem = upTrua.NewEduSystem; + stuInfoBasicEntity.GenderNo = upTrua.Gender; + stuInfoBasicEntity.Birthday = upTrua.Birthday; + stuInfoBasicEntity.NationalityNo = upTrua.NationalityNo; + stuInfoBasicEntity.RegionNo = upTrua.RegionNo; + stuInfoBasicEntity.EntranceDate = upTrua.LeaveDate; + stuInfoBasicEntity.IdentityCardNo = upTrua.IdentityCardNo; + stuInfoBasicEntity.mobile = upTrua.Mobile; + stuInfoBasicEntity.FatherUnit = upTrua.ResidencePlace; + stuInfoBasicEntity.MailAddress = upTrua.MailAddress; + stuInfoBasicEntity.F_SchoolId = this.BaseRepository().FindEntity(x => x.F_DeleteMark == 0 && x.F_EnabledMark == 1)?.F_CompanyId; + stuInfoBasicEntity.IdCardType = upTrua.IdCardType; + stuInfoBasicEntity.Guardian = upTrua.Guardian; + stuInfoBasicEntity.GuardianPhone = upTrua.GuardianMobile; + db.Insert(stuInfoBasicEntity); + #endregion + + #region 课表（StuSelectLessonList，旧-写入新班级课表数据；） + + //db.Insert(CreateInsertStuSelectLessonList(upTrua, stulist)); + // wx修改 2023-3-21 课表空数据报错 ,查找同班同学 如果不为空继续执行 + if (CreateInsertStuSelectLessonList(upTrua, stulist) != null) + { + db.Insert(CreateInsertStuSelectLessonList(upTrua, stulist)); + } + #endregion + break; case "16": //恢复学籍 //学籍异动列表 if (upTrua.IsReturnSchool == "0") @@ -1120,44 +1159,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration db.Insert(CreateInsertStuSelectLessonList(upTrua, stulist)); } - #endregion - break; - case "04": //转入 - #region 学籍表加数据 - var stuInfoBasicEntity = new StuInfoBasicEntity(); - stuInfoBasicEntity.StuId = upTrua.StuId; - stuInfoBasicEntity.StuNo = upTrua.StuNo; - stuInfoBasicEntity.ProvinceCode = upTrua.StuNo; - stuInfoBasicEntity.StuName = upTrua.StuName; - stuInfoBasicEntity.DeptNo = upTrua.NewDeptNo; - stuInfoBasicEntity.MajorNo = upTrua.NewMajorNo; - stuInfoBasicEntity.Grade = upTrua.NewGrade; - stuInfoBasicEntity.ClassNo = upTrua.NewClassNo; - stuInfoBasicEntity.EduSystem = upTrua.NewEduSystem; - stuInfoBasicEntity.GenderNo = upTrua.Gender; - stuInfoBasicEntity.Birthday = upTrua.Birthday; - stuInfoBasicEntity.NationalityNo = upTrua.NationalityNo; - stuInfoBasicEntity.RegionNo = upTrua.RegionNo; - stuInfoBasicEntity.EntranceDate = upTrua.LeaveDate; - stuInfoBasicEntity.IdentityCardNo = upTrua.IdentityCardNo; - stuInfoBasicEntity.mobile = upTrua.Mobile; - stuInfoBasicEntity.FatherUnit = upTrua.ResidencePlace; - stuInfoBasicEntity.MailAddress = upTrua.MailAddress; - stuInfoBasicEntity.F_SchoolId = this.BaseRepository().FindEntity(x => x.F_DeleteMark == 0 && x.F_EnabledMark == 1)?.F_CompanyId; - stuInfoBasicEntity.IdCardType = upTrua.IdCardType; - stuInfoBasicEntity.Guardian = upTrua.Guardian; - stuInfoBasicEntity.GuardianPhone = upTrua.GuardianMobile; - db.Insert(stuInfoBasicEntity); - #endregion - - #region 课表（StuSelectLessonList，旧-写入新班级课表数据；） - - //db.Insert(CreateInsertStuSelectLessonList(upTrua, stulist)); - // wx修改 2023-3-21 课表空数据报错 ,查找同班同学 如果不为空继续执行 - if (CreateInsertStuSelectLessonList(upTrua, stulist) != null) - { - db.Insert(CreateInsertStuSelectLessonList(upTrua, stulist)); - } #endregion break; default: