diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaDormitoryInterior/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaDormitoryInterior/Form.cshtml index aa12cf51d..aef055040 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaDormitoryInterior/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaDormitoryInterior/Form.cshtml @@ -3,13 +3,13 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+ @*
班级
-
+
*@
分数
- +
日期
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaDormitoryInterior/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaDormitoryInterior/Form.js index 7ed6f9276..cdb7f68c1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaDormitoryInterior/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaDormitoryInterior/Form.js @@ -6,6 +6,7 @@ */ var acceptClick; var keyValue = request('keyValue'); +var DormitoryBuildId = request('DormitoryBuildId'); var bootstrap = function ($, learun) { "use strict"; var page = { @@ -37,8 +38,10 @@ var bootstrap = function ($, learun) { if (!$('body').lrValidform()) { return false; } + var strEntity = $('body').lrGetFormData(); + strEntity.DormitoryBuildId = DormitoryBuildId; var postData = { - strEntity: JSON.stringify($('body').lrGetFormData()) + strEntity: JSON.stringify(strEntity) }; $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/EvaDormitoryInterior/SaveForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaDormitoryInterior/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaDormitoryInterior/Index.cshtml index c8e5e6dbd..a106d6c80 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaDormitoryInterior/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaDormitoryInterior/Index.cshtml @@ -1,22 +1,24 @@ @{ - ViewBag.Title = "宿舍内务日考核"; + ViewBag.Title = "学生归宿管理"; Layout = "~/Views/Shared/_Index.cshtml"; } -
+
+
+
+
树形列表
+
+
+
-
+
+
+ 列表信息 +
-
-
-
-
-
班级
- -
-
-
-
+ @*
+
+
*@
@@ -26,6 +28,7 @@  录入  修改  删除 +  打印
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaDormitoryInterior/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaDormitoryInterior/Index.js index a79b2d6a0..f06a99bfa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaDormitoryInterior/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaDormitoryInterior/Index.js @@ -1,18 +1,58 @@ -/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) - * Copyright (c) 2013-2018 北京泉江科技有限公司 +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 * 创建人：超级管理员 - * 日 期：2019-11-20 11:34 - * 描 述：宿舍内务日考核 + * 日 期：2022-03-10 10:06 + * 描 述：学生归宿管理 */ var refreshGirdData; +var DormitoryBuildId = ''; var bootstrap = function ($, learun) { "use strict"; + var startTime; + var endTime; var page = { init: function () { page.initGird(); page.bind(); }, bind: function () { + // 初始化左侧树形数据 + $('#dataTree').lrtree({ + url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetTree', + nodeClick: function (item) { + if (item.title == '4') { + DormitoryBuildId = item.value; + page.search({ DormitoryBuildId: item.value }); + } + } + }); + // 时间搜索框 + $('#datesearch').lrdate({ + dfdata: [ + { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } } + ], + // 月 + mShow: false, + premShow: false, + // 季度 + jShow: false, + prejShow: false, + // 年 + ysShow: false, + yxShow: false, + preyShow: false, + yShow: false, + // 默认 + dfvalue: '1', + selectfn: function (begin, end) { + startTime = begin; + endTime = end; + page.search(); + } + }); $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); @@ -22,16 +62,20 @@ var bootstrap = function ($, learun) { }); // 新增 $('#lr_add').on('click', function () { - learun.layerForm({ - id: 'form', - title: '新增', - url: top.$.rootUrl + '/EducationalAdministration/EvaDormitoryInterior/Form', - width: 600, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); + if (!!DormitoryBuildId) { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/EducationalAdministration/EvaDormitoryInterior/Form?DormitoryBuildId=' + DormitoryBuildId, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } else { + return learun.alert.warning('请选择宿舍！'); + } }); // 编辑 $('#lr_edit').on('click', function () { @@ -40,7 +84,7 @@ var bootstrap = function ($, learun) { learun.layerForm({ id: 'form', title: '编辑', - url: top.$.rootUrl + '/EducationalAdministration/EvaDormitoryInterior/Form?keyValue=' + keyValue, + url: top.$.rootUrl + '/EducationalAdministration/EvaDormitoryInterior/Form?keyValue=' + keyValue + '&DormitoryBuildId=' + DormitoryBuildId, width: 600, height: 400, callBack: function (id) { @@ -62,41 +106,89 @@ var bootstrap = function ($, learun) { }); } }); + // 学生出宿 + $('#lr_out').on('click', function () { + if (!!ParentId) { + learun.layerForm({ + id: 'formout', + title: '学生出宿', + url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/FormOut?ParentId=' + ParentId, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } else { + return learun.alert.warning('请选择宿舍！'); + } + }); + + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/Form?keyValue=' + keyValue + '&ParentId=' + ParentId, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/EvaDormitoryInterior/GetPageList', headData: [ + { label: "分数", name: "Fraction", width: 100, align: "left" }, { - label: "班级", name: "Class", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', - key: value, - keyId: 'classno', - callback: function (_data) { - callback(_data['classname']); - } - }); + label: "日期", name: "Data", width: 130, align: "left", + formatter: function (value, row) { + if (!!value) { + return learun.formatDate(value, 'yyyy-MM-dd'); + } else { + return ''; + } } }, - { label: "分数", name: "Fraction", width: 100, align: "left" }, - { label: "日期", name: "Data", width: 130, align: "left" }, { label: "备注", name: "Remark", width: 100, align: "left" }, ], - mainId: 'ID', - isPage: true + mainId: 'Id', + isPage: true, + sidx: 'Data desc', }); - page.search(); }, search: function (param) { param = param || {}; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } }; refreshGirdData = function () { - page.search(); + $('#gridtable').jfGridSet('reload'); }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaDormitoryInterior/Indexold.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaDormitoryInterior/Indexold.cshtml new file mode 100644 index 000000000..c8e5e6dbd --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaDormitoryInterior/Indexold.cshtml @@ -0,0 +1,36 @@ +@{ + ViewBag.Title = "宿舍内务日考核"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
班级
+ +
+
+
+
+
+
+
+ +
+
+  录入 +  修改 +  删除 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/EvaDormitoryInterior/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaDormitoryInterior/Indexold.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaDormitoryInterior/Indexold.js new file mode 100644 index 000000000..a79b2d6a0 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EvaDormitoryInterior/Indexold.js @@ -0,0 +1,102 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-11-20 11:34 + * 描 述：宿舍内务日考核 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/EducationalAdministration/EvaDormitoryInterior/Form', + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/EducationalAdministration/EvaDormitoryInterior/Form?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/EvaDormitoryInterior/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/EvaDormitoryInterior/GetPageList', + headData: [ + { + label: "班级", name: "Class", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', + key: value, + keyId: 'classno', + callback: function (_data) { + callback(_data['classname']); + } + }); + } + }, + { label: "分数", name: "Fraction", width: 100, align: "left" }, + { label: "日期", name: "Data", width: 130, align: "left" }, + { label: "备注", name: "Remark", width: 100, align: "left" }, + ], + mainId: 'ID', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index b4692d004..16ca5cb79 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1022,6 +1022,7 @@ + @@ -7114,7 +7115,7 @@ - + @@ -7545,6 +7546,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EvaDormitoryInterior/EvaDormitoryInteriorEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EvaDormitoryInterior/EvaDormitoryInteriorEntity.cs index 202374741..9dd44a3a4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EvaDormitoryInterior/EvaDormitoryInteriorEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EvaDormitoryInterior/EvaDormitoryInteriorEntity.cs @@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 日 期：2019-11-20 11:34 /// 描 述：宿舍内务日考核 /// - public class EvaDormitoryInteriorEntity + public class EvaDormitoryInteriorEntity { #region 实体成员 /// @@ -19,6 +19,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("ID")] public string ID { get; set; } + + /// + /// 宿舍Id + /// + [Column("DORMITORYBUILDID")] + public string DormitoryBuildId { get; set; } /// /// 班级 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EvaDormitoryInterior/EvaDormitoryInteriorService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EvaDormitoryInterior/EvaDormitoryInteriorService.cs index a35616588..0bb52e12c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EvaDormitoryInterior/EvaDormitoryInteriorService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EvaDormitoryInterior/EvaDormitoryInteriorService.cs @@ -35,7 +35,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration t.Class, t.Fraction, t.Data, - t.Remark + t.Remark, +t.DormitoryBuildId "); strSql.Append(" FROM EvaDormitoryInterior t "); strSql.Append(" WHERE 1=1 "); @@ -47,7 +48,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("Class", "%" + queryParam["Class"].ToString() + "%", DbType.String); strSql.Append(" AND t.Class Like @Class "); } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + if (!queryParam["DormitoryBuildId"].IsEmpty()) + { + dp.Add("DormitoryBuildId", queryParam["DormitoryBuildId"].ToString(), DbType.String); + strSql.Append(" AND t.DormitoryBuildId = @DormitoryBuildId "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) { @@ -99,7 +105,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - this.BaseRepository("CollegeMIS").Delete(t=>t.ID == keyValue); + this.BaseRepository("CollegeMIS").Delete(t => t.ID == keyValue); } catch (Exception ex) {