diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js index 60eeacebf..356c54ea0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js @@ -7,8 +7,8 @@ // web:"http://112.230.201.53/:8081/"//web地址，用于配置logo //}; var config = { - webapi: 'http://localhost:31173/', - web: "http://localhost:20472/"//web地址，用于配置logo + webapi: 'http://localhost:8088/', + web: "http://localhost:8087/"//web地址，用于配置logo }; // var config = { // webapi: 'http://123.57.209.16:31173/', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs index 2fb9f24e3..11d6ed1ed 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs @@ -316,6 +316,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers public ActionResult GetFormData(string keyValue) { var StuInfoFreshData = stuInfoFreshIBLL.GetStuInfoFreshEntity(keyValue); + StuInfoFreshData.Files = StuInfoFreshData.ID; //获取头像地址 var url = Config.GetValue("defaultheadimg"); if (StuInfoFreshData.IsPhoto == true && !string.IsNullOrEmpty(StuInfoFreshData.Photo)) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.cshtml index ebc438e07..a53a6a7b5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.cshtml @@ -21,7 +21,7 @@
-
第几级
+
年级
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.js index 079b81dbe..a398dc727 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.js @@ -50,10 +50,14 @@ var bootstrap = function ($, learun) { //校园卡注销 $('#lr_cardderegistrate').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); + var CardDeregistrateStatus = $('#gridtable').jfGridValue('CardDeregistrateStatus'); if (learun.checkrow(keyValue)) { + if (CardDeregistrateStatus.indexOf('1') != -1) { + return learun.alert.warning("选中项包括已注销数据！"); + } learun.layerConfirm('是否确认注销校园卡！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCardDeregistrate', { keyValue: keyValue,status:'1' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCardDeregistrate', { keyValue: keyValue, status: '1' }, function () { refreshGirdData(); }); } @@ -66,7 +70,7 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { learun.layerConfirm('是否确认取消注销校园卡！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCardDeregistrate', { keyValue: keyValue, status: '0' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCardDeregistrate', { keyValue: keyValue, status: '0' }, function () { refreshGirdData(); }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.cshtml index d5440339d..187e05d2d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.cshtml @@ -21,7 +21,7 @@
-
第几级
+
年级
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.js index 746f451bb..76d50f9b5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.js @@ -50,10 +50,14 @@ var bootstrap = function ($, learun) { //办理退住手续 $('#lr_checkout').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); + var CheckOutStatus = $('#gridtable').jfGridValue('CheckOutStatus'); if (learun.checkrow(keyValue)) { + if (CheckOutStatus.indexOf('1') != -1) { + return learun.alert.warning("选中项包括已办理退住数据！"); + } learun.layerConfirm('是否确认办理退住手续！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCheckOut', { keyValue: keyValue,status:'1' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCheckOut', { keyValue: keyValue, status: '1' }, function () { refreshGirdData(); }); } @@ -66,7 +70,7 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { learun.layerConfirm('是否确认取消办理退住手续！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCheckOut', { keyValue: keyValue, status: '0' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCheckOut', { keyValue: keyValue, status: '0' }, function () { refreshGirdData(); }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.cshtml index ae8aeee06..096c17ab1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.cshtml @@ -21,7 +21,7 @@
-
第几级
+
年级
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.js index 7a34e3943..bb62c012f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.js @@ -50,10 +50,14 @@ var bootstrap = function ($, learun) { //毕业证领取 $('#lr_getcard').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); + var DiplomaReceiveStatus = $('#gridtable').jfGridValue('DiplomaReceiveStatus'); if (learun.checkrow(keyValue)) { + if (DiplomaReceiveStatus.indexOf('1') != -1) { + return learun.alert.warning("选中项包括已领取数据！"); + } learun.layerConfirm('是否确认领取毕业证！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetCard', { keyValue: keyValue,status:'1' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetCard', { keyValue: keyValue, status: '1' }, function () { refreshGirdData(); }); } @@ -66,7 +70,7 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { learun.layerConfirm('是否确认取消领取毕业证！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetCard', { keyValue: keyValue, status: '0' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetCard', { keyValue: keyValue, status: '0' }, function () { refreshGirdData(); }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.cshtml index 263c095e3..3acfdea75 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.cshtml @@ -21,7 +21,7 @@
-
第几级
+
年级
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.js index 9a8ca60f9..95917e329 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.js @@ -50,10 +50,14 @@ var bootstrap = function ($, learun) { //就业协议备案 $('#lr_employagree').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); + var EmployAgreeStatus = $('#gridtable').jfGridValue('EmployAgreeStatus'); if (learun.checkrow(keyValue)) { + if (EmployAgreeStatus.indexOf('1') != -1) { + return learun.alert.warning("选中项包括已备案数据！"); + } learun.layerConfirm('是否确认备案就业协议！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsEmployAgree', { keyValue: keyValue,status:'1' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsEmployAgree', { keyValue: keyValue, status: '1' }, function () { refreshGirdData(); }); } @@ -66,7 +70,7 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { learun.layerConfirm('是否确认取消备案就业协议！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsEmployAgree', { keyValue: keyValue, status: '0' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsEmployAgree', { keyValue: keyValue, status: '0' }, function () { refreshGirdData(); }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.cshtml index 63b5ff185..32c74ebb1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.cshtml @@ -21,7 +21,7 @@
-
第几级
+
年级
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.js index 9245bdf6e..e32d8896a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.js @@ -50,10 +50,14 @@ var bootstrap = function ($, learun) { //学杂费结算 $('#lr_feesettle').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); + var FeeSettleStatus = $('#gridtable').jfGridValue('FeeSettleStatus'); if (learun.checkrow(keyValue)) { + if (FeeSettleStatus.indexOf('1') != -1) { + return learun.alert.warning("选中项包括已结算数据！"); + } learun.layerConfirm('是否确认结算学杂费！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFeeSettle', { keyValue: keyValue,status:'1' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFeeSettle', { keyValue: keyValue, status: '1' }, function () { refreshGirdData(); }); } @@ -66,7 +70,7 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { learun.layerConfirm('是否确认取消结算学杂费！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFeeSettle', { keyValue: keyValue, status: '0' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFeeSettle', { keyValue: keyValue, status: '0' }, function () { refreshGirdData(); }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.cshtml index b12072bc7..bee2196c7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.cshtml @@ -21,7 +21,7 @@
-
第几级
+
年级
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.js index c4933c84c..67eaf8261 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.js @@ -50,10 +50,14 @@ var bootstrap = function ($, learun) { //档案与组织关系转出 $('#lr_filetransfer').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); + var FileTransferStatus = $('#gridtable').jfGridValue('FileTransferStatus'); if (learun.checkrow(keyValue)) { + if (FileTransferStatus.indexOf('1') != -1) { + return learun.alert.warning("选中项包括已转出数据！"); + } learun.layerConfirm('是否确认转出档案与组织关系！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFileTransfer', { keyValue: keyValue,status:'1' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFileTransfer', { keyValue: keyValue, status: '1' }, function () { refreshGirdData(); }); } @@ -66,7 +70,7 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { learun.layerConfirm('是否确认取消转出档案与组织关系！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFileTransfer', { keyValue: keyValue, status: '0' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFileTransfer', { keyValue: keyValue, status: '0' }, function () { refreshGirdData(); }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.cshtml index 3ed8a1682..b3a955fa3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.cshtml @@ -21,7 +21,7 @@
-
第几级
+
年级
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.js index 5c369d8e1..cc5d20685 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.js @@ -50,10 +50,14 @@ var bootstrap = function ($, learun) { //图书资料归还 $('#lr_returnbooks').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); + var ReturnBooksStatus = $('#gridtable').jfGridValue('ReturnBooksStatus'); if (learun.checkrow(keyValue)) { + if (ReturnBooksStatus.indexOf('1') != -1) { + return learun.alert.warning("选中项包括已归还数据！"); + } learun.layerConfirm('是否确认归还图书资料！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsReturnBooks', { keyValue: keyValue,status:'1' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsReturnBooks', { keyValue: keyValue, status: '1' }, function () { refreshGirdData(); }); } @@ -66,7 +70,7 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { learun.layerConfirm('是否确认取消归还图书资料！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsReturnBooks', { keyValue: keyValue, status: '0' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsReturnBooks', { keyValue: keyValue, status: '0' }, function () { refreshGirdData(); }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js index b512795e8..eca5946ba 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js @@ -35,8 +35,8 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList', headData: [ - { label: "学号", name: "StuNo", width: 100, align: "left" }, - { label: "学籍号", name: "StuCode", width: 100, align: "left" }, + { label: "学号", name: "StuNo", width: 200, align: "left" }, + { label: "学籍号", name: "StuCode", width: 200, align: "left" }, { label: "姓名", name: "StuName", width: 100, align: "left" }, { label: "性别", name: "GenderNo", width: 80, align: "left", @@ -44,8 +44,12 @@ var bootstrap = function ($, learun) { return cellvalue == true ? "男" : "女"; } }, - { label: "出生日期", name: "Birthday", width: 100, align: "left" }, - { label: "身份证号", name: "IdentityCardNo", width: 100, align: "left" }, + { + label: "出生日期", name: "Birthday", width: 100, align: "left", + formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } }, + { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" }, { label: "民族", name: "NationalityNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -120,8 +124,18 @@ var bootstrap = function ($, learun) { }); } }, - { label: "报到日期", name: "RegisterDate", width: 100, align: "left" }, - { label: "入学年月", name: "EntranceDate", width: 100, align: "left" }, + { + label: "报到日期", name: "RegisterDate", width: 100, align: "left", + formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } + }, + { + label: "入学年月", name: "EntranceDate", width: 100, align: "left", + formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } + }, { label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center", formatter: function (cellvalue) { @@ -137,7 +151,7 @@ var bootstrap = function ($, learun) { ], mainId: 'StuId', isPage: true, - isMultiselect: true, + //isMultiselect: true, //onSelectRow: function (rowdata) { // if (rowdata.CheckMark == "1") { // $("#check").hide(); @@ -153,7 +167,7 @@ var bootstrap = function ($, learun) { //} }); - //page.search(); + page.search(); }, search: function (param) { param = param || {}; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml index 9ca74af75..74fbe8dd9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml @@ -61,9 +61,9 @@
@*
-
考生类型
-
-
*@ +
考生类型
+
+ *@
第几志愿 *
@@ -129,6 +129,10 @@
精准贫困户
+ @*
+
附件
+
+
*@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js index 32a3553ca..878a59462 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js @@ -25,6 +25,8 @@ var bootstrap = function ($, learun) { $("#MatriculateSort").lrDataItemSelect({ code: 'enrollType' }); $('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' }); $('#IsPoor').lrDataItemSelect({ code: 'YesOrNoInt' }); + //附件 + //$('#Files').lrUploader(); $('#StuInfoFreshFamily').jfGrid({ headData: [ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js index 95c8da332..beac0586f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js @@ -104,7 +104,16 @@ var bootstrap = function ($, learun) { { label: "学号", name: "StuNo", width: 200, align: "left" }, { label: "姓名", name: "StuName", width: 200, align: "left" }, { - label: "处分名称", name: "PunishName", width: 200, align: "left" + label: "处分名称", name: "PunishNo", width: 200, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'Punishment', + callback: function (_data) { + callback(_data.text); + } + }); + } }, { label: "处分原因", name: "PunishReason", width: 300, align: "left" }, { label: "处分日期", name: "PunishDate", width: 200, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.js index 5b6d436d5..eadcd071b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.js @@ -45,9 +45,13 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { learun.layerConfirm('是否准许 ' + stuName + ' 毕业？', function (res) { if (res) { - learun.httpAsync('get', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/AllowGraduate', { stuNo: keyValue, status: '1' }, function () { - $('#btn_Search').trigger('click'); + learun.getForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/AllowGraduate?stuNo=' + keyValue +'&status=1', function () { + refreshGirdData(); + //$('#btn_Search').trigger('click'); }); + //learun.httpAsync('get', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/AllowGraduate', { stuNo: keyValue, status: '1' }, function () { + // $('#btn_Search').trigger('click'); + //}); } }); } @@ -59,7 +63,7 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { learun.layerConfirm('是否不准 ' + stuName + ' 毕业？', function (res) { if (res) { - learun.httpAsync('get', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/AllowGraduate', { stuNo: keyValue, status: '0' }, function () { + learun.getForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/AllowGraduate?stuNo=' + keyValue + '&status=0', function () { $('#btn_Search').trigger('click'); }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs index f090e2650..e02ed891c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs @@ -26,6 +26,8 @@ namespace Learun.Application.WebApi.Modules Get["/pageList"] = GetPageList; Get["/form"] = GetForm; Post["/save"] = SaveForm; + Post["/upload"] = Upload; + Post["/deleteFiles"] = DeleteFiles; } @@ -99,8 +101,20 @@ namespace Learun.Application.WebApi.Modules if (annexesFileEntity != null) { url = annexesFileEntity.F_FilePath.Substring(annexesFileEntity.F_FilePath.IndexOf("Resource")); + StuInfoFreshEntity.Url = url; } } + //获取附件列表 + var annexesFileList = annexesFileIBLL.GetList(StuInfoFreshEntity.ID); + if (annexesFileList.Any()) + { + foreach (var item in annexesFileList) + { + item.F_FilePath = item.F_FilePath.Substring(item.F_FilePath.IndexOf("Resource")); + } + StuInfoFreshEntity.FilesList = annexesFileList.ToList(); + } + StuInfoFreshEntity.DormitoryName = accdormitoryIBLL.GetDormitoryInfoByPlanStuNo(StuInfoFreshEntity.ID); if (StuInfoFreshEntity.IsPoor != "1") { @@ -335,6 +349,89 @@ namespace Learun.Application.WebApi.Modules return Success("保存成功！"); } + /// + /// 上传附件图片文件 + /// + /// + public Response Upload(dynamic _) + { + var files = (List)this.Context.Request.Files; + var folderId = this.GetReq().folderId;//文件夹id=新生id + var name = this.GetReq().name;//文件夹id=新生id + + + string filePath = Config.GetValue("AnnexesFile"); + string uploadDate = DateTime.Now.ToString("yyyyMMdd"); + string FileEextension = name; + string fileGuid = Guid.NewGuid().ToString(); + + string virtualPath = string.Format("{0}/{1}/{2}/{3}{4}", filePath, userInfo.userId, uploadDate, fileGuid, FileEextension); + + //创建文件夹 + string path = Path.GetDirectoryName(virtualPath); + Directory.CreateDirectory(path); + AnnexesFileEntity fileAnnexesEntity = new AnnexesFileEntity(); + if (!System.IO.File.Exists(virtualPath)) + { + byte[] bytes = new byte[files[0].Value.Length]; + files[0].Value.Read(bytes, 0, bytes.Length); + FileInfo file = new FileInfo(virtualPath); + FileStream fs = file.Create(); + fs.Write(bytes, 0, bytes.Length); + fs.Close(); + + //文件信息写入数据库 + fileAnnexesEntity.F_Id = fileGuid; + fileAnnexesEntity.F_FolderId = folderId; + fileAnnexesEntity.F_FileName = name; + fileAnnexesEntity.F_FilePath = virtualPath; + fileAnnexesEntity.F_FileSize = files[0].Value.Length.ToString(); + fileAnnexesEntity.F_FileExtensions = FileEextension; + fileAnnexesEntity.F_FileType = FileEextension.Replace(".", ""); + fileAnnexesEntity.F_CreateUserId = userInfo.userId; + fileAnnexesEntity.F_CreateUserName = userInfo.realName; + + annexesFileIBLL.SaveEntity(folderId, fileAnnexesEntity); + } + + //文件地址截取到resource后 + fileAnnexesEntity.F_FilePath = fileAnnexesEntity.F_FilePath.Substring(fileAnnexesEntity.F_FilePath.IndexOf("Resource")); + + return Success(fileAnnexesEntity); + } + + /// + /// 删除附件 + /// + /// + /// + public Response DeleteFiles(dynamic _) + { + var fileId = this.GetReqData().id; + + AnnexesFileEntity fileInfoEntity = annexesFileIBLL.GetEntity(fileId); + if (fileInfoEntity != null) + { + //删除附件表 + annexesFileIBLL.DeleteEntity(fileId); + //删除文件 + if (System.IO.File.Exists(fileInfoEntity.F_FilePath)) + { + System.IO.File.Delete(fileInfoEntity.F_FilePath); + } + + + //下载 + //if (FileDownHelper.FileExists(fileInfoEntity.F_FilePath)) + //{ + // FileDownHelper.DownLoadnew(fileInfoEntity.F_FilePath); + //} + } + + return Success("删除成功"); + } + + #region 私有类 /// @@ -389,6 +486,7 @@ namespace Learun.Application.WebApi.Modules /// public List StuInfoFreshEmergePeopleEntities { get; set; } + } public class PhotoModel @@ -397,5 +495,11 @@ namespace Learun.Application.WebApi.Modules public string account { get; set; } } + public class FileModel + { + public string folderId { get; set; } + public string name { get; set; } + public string id { get; set; } + } } } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config index 9f5e1c6ec..a1e3c4b29 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config @@ -65,7 +65,7 @@ - + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Annexes/AnnexesFileService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Annexes/AnnexesFileService.cs index 8c4039d9f..c4a8579cc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Annexes/AnnexesFileService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Annexes/AnnexesFileService.cs @@ -13,7 +13,7 @@ namespace Learun.Application.Base.SystemModule /// 日 期：2017.03.08 /// 描 述：附件管理 /// - public class AnnexesFileService:RepositoryFactory + public class AnnexesFileService : RepositoryFactory { #region 属性 构造函数 private string fieldSql; @@ -188,7 +188,7 @@ namespace Learun.Application.Base.SystemModule { try { - this.BaseRepository().Delete(new AnnexesFileEntity() { F_Id = fileId }); + this.BaseRepository().Delete(x => x.F_Id == fileId); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs index aecc480d0..2613e4335 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs @@ -345,7 +345,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { var ClassDiredctorNo = LoginUserInfo.Get().account; - return this.BaseRepository("CollegeMIS").FindTable($" SELECT * FROM dbo.ClassInfo where ClassDiredctorNo='{ClassDiredctorNo}' or ClassTutorNo='{ClassDiredctorNo}'"); + string sql = " SELECT * FROM dbo.ClassInfo where CheckMark=1 "; + if (ClassDiredctorNo.ToUpper() != "SYSTEM") + { + sql += $" and ClassDiredctorNo='{ClassDiredctorNo}' or ClassTutorNo='{ClassDiredctorNo}'"; + } + return this.BaseRepository("CollegeMIS").FindTable(sql); } catch (Exception ex) { @@ -512,7 +517,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 主键 /// /// - public void GetCard(string keyValue,string status) + public void GetCard(string keyValue, string status) { var db = this.BaseRepository("CollegeMIS").BeginTrans(); try diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs index b7a16a27b..a503d3216 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs @@ -1,5 +1,7 @@ -using Learun.Util; +using Learun.Application.Base.SystemModule; +using Learun.Util; using System; +using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; namespace Learun.Application.TwoDevelopment.EducationalAdministration @@ -716,6 +718,23 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [NotMapped] public bool? IsStudentEdit { get; set; } + /// + /// 图片显示地址 + /// + [NotMapped] + public string Url { get; set; } + + /// + /// 附件(文件夹id) + /// + [NotMapped] + public string Files { get; set; } + /// + /// 附件列表 + /// + [NotMapped] + public List FilesList { get; set; } + #endregion } }