Browse Source

经费开支pc添加附件功能

应县
ndbs 1 year ago
parent
commit
93c1b0e3c7
6 changed files with 53 additions and 39 deletions
  1. +4
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.cshtml
  2. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.js
  3. +4
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.cshtml
  4. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.js
  5. +4
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/FundsApply/FundsApplyEntity.cs
  6. +39
    -38
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs

+ 4
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.cshtml View File

@@ -41,6 +41,10 @@
<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" data-table="FundsApply">
<div class="lr-form-item-title">附件</div>
<div id="Path"></div>
</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="新增明细" />


+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.js View File

@@ -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);


+ 4
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.cshtml View File

@@ -41,6 +41,10 @@
<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" data-table="FundsApply">
<div class="lr-form-item-title">附件</div>
<div id="Path" readonly></div>
</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="新增明细" />


+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.js View File

@@ -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);


+ 4
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/FundsApply/FundsApplyEntity.cs View File

@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
/// 日 期:2022-11-07 14:25
/// 描 述:经费开支申报
/// </summary>
public class FundsApplyEntity
public class FundsApplyEntity
{
#region 实体成员
/// <summary>
@@ -69,6 +69,9 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
/// </summary>
[Column("STATUS")]
public int? Status { get; set; }
[Column("PATH")]
public string Path { get; set; }

#endregion

#region 扩展操作


+ 39
- 38
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs View File

@@ -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<CompanyEntity>(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<CompanyEntity>(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:


Loading…
Cancel
Save