diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Form.cshtml
index 4381b907b..abf2c24ad 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Form.cshtml
@@ -12,8 +12,8 @@
专业*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Form.js
index dbb4686dd..8f3ac5b5f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Form.js
@@ -16,19 +16,19 @@ var bootstrap = function ($, learun) {
},
bind: function () {
$('#DeptNo').lrDataSourceSelect({
- code: 'CdDeptInfo', value: 'deptno', text: 'deptname',
- select: function (item) {
- if (!!item) {
- $('#MajorNo').lrselectRefresh({
- url: "/CdMajor/GetListByDeptNo",
- param: { DeptNo: item.deptno },
- value: 'MajorNo',
- text: 'MajorName'
- });
- }
- }
+ code: 'CdDeptInfo', value: 'deptno', text: 'deptname'
+ //select: function (item) {
+ // if (!!item) {
+ // $('#MajorNo').lrselectRefresh({
+ // url: "/CdMajor/GetListByDeptNo",
+ // param: { DeptNo: item.deptno },
+ // value: 'MajorNo',
+ // text: 'MajorName'
+ // });
+ // }
+ //}
});
- $('#MajorNo').lrselect();
+ $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname'});
$('#Grade').lrselect({
url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
value: 'value',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs
index cecc6a18d..8ba4e596e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs
@@ -8,6 +8,11 @@ using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Linq;
+using System.IO;
+using NPOI.HSSF.UserModel;
+using NPOI.SS.UserModel;
+using Learun.Application.Base.SystemModule;
+using System.Drawing;
namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
{
@@ -21,6 +26,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
public class AccommodationController : MvcControllerBase
{
private AccommodationIBLL accommodationIBLL = new AccommodationBLL();
+ private AnnexesFileIBLL annexesFileIBLL = new AnnexesFileBLL();
#region 视图功能
@@ -207,7 +213,15 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
{
return View();
}
-
+ ///
+ /// 导入宿舍
+ ///
+ ///
+ [HttpGet]
+ public ActionResult IndexImport()
+ {
+ return View();
+ }
#endregion
@@ -526,6 +540,57 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
return Success("同步成功");
}
+ ///
+ /// 宿舍信息导入模板
+ ///
+ ///
+ public ActionResult DownTemplate()
+ {
+ FileStreamResult result = null;
+ try
+ {
+ var path = Server.MapPath("~/Content/excel/");
+ var pathoffull = path + "AccommodationImport.xls";
+ FileStream fsread = fsread = new FileStream(pathoffull, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+ result = File(fsread, "application/ms-excel", "宿舍信息导入.xls");
+
+ return result;
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
+ }
+
+
+ ///
+ /// 宿舍信息excel文件导入
+ ///
+ ///
+ ///
+ ///
+ [HttpPost]
+ [ValidateAntiForgeryToken]
+ public ActionResult ExecuteImportExcel(string fileGuid, int chunks)
+ {
+ string path = annexesFileIBLL.SaveAnnexes(fileGuid, fileGuid, chunks, LoginUserInfo.Get());
+ if (!string.IsNullOrEmpty(path))
+ {
+ DataTable dt = ExcelHelper.ExcelImport(path);
+ var res = accommodationIBLL.ExecuteImportExcel(dt, fileGuid);
+ var data = new
+ {
+ Success = res.snum,
+ Fail = res.failDt.Rows.Count
+ };
+ return Success(data);
+ }
+ else
+ {
+ return Fail("导入数据失败!");
+ }
+ }
+
#endregion
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClassify.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClassify.js
index 878fe4fc5..a4535c11e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClassify.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClassify.js
@@ -17,7 +17,13 @@ var bootstrap = function ($, learun) {
page.initSelect();
},
bind: function () {
- $('#BuildType').lrDataItemSelect({ code: 'BuildType' });
+ $('#BuildType').lrselect({
+ allowSearch: true,
+ url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailList',
+ param: { itemCode: 'BuildType' },
+ value: 'F_ItemValue',
+ text: 'F_ItemName',
+ });
// 上级
$('#ParentID').lrselect({
url: top.$.rootUrl + '/LogisticsManagement/Accommodation/GetClassifyTree',
@@ -25,7 +31,7 @@ var bootstrap = function ($, learun) {
allowSearch: true,
maxHeight: 225,
select: function (item) {
- if (item&&item.id!='-1') {
+ if (item && item.id != '-1') {
$('#BuildType').lrselectSet(item.title);
$('#BuildType').attr('readonly', 'readonly');
} else {
@@ -43,7 +49,7 @@ var bootstrap = function ($, learun) {
type: 'radio',
code: 'HasToilet',
})
-
+
//$('#StudentID').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuid', text: 'stuname' });
//$('#StudentID').lrDataSourceSelect({ code: 'StuInfoTwo', value: 'stuid', text: 'stuname' });
$('#StudentID').lrselect({
@@ -51,7 +57,7 @@ var bootstrap = function ($, learun) {
text: "stuname",
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic'
});
-
+
$('#Class').lrselect({
value: "classno",
text: "classname"
@@ -115,7 +121,7 @@ var bootstrap = function ($, learun) {
if (!!keyValue) {
$.lrSetForm(top.$.rootUrl + '/LogisticsManagement/Accommodation/GetFormData?keyValue=' + keyValue,
- function(data) {
+ function (data) {
for (var id in data) {
if (!!data[id].length && data[id].length > 0) {
$('#' + id).jfGridSet('refreshdata', data[id]);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.cshtml
index d4664f16f..49bced24d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.cshtml
@@ -67,7 +67,7 @@
批量添加宿舍
床位管理
- @*
自动分配宿舍
+ @*
自动分配宿舍
同步宿舍信息*@