diff --git a/.gitignore b/.gitignore index 80e85bbe3..18106d35b 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,6 @@ Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js /Learun.Framework.Ultimate V7/Learun.Application.Mobile/www.7z /Learun.Framework.Ultimate V7/Learun.Application.WebApi/bin.7z *.cs~merged +/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/StudentQRCode/AbNormalSerious +/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/StudentQRCode/AbNormalWeak +/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/StudentQRCode diff --git a/CppProperties.json b/CppProperties.json new file mode 100644 index 000000000..f598ba59c --- /dev/null +++ b/CppProperties.json @@ -0,0 +1,21 @@ +{ + "configurations": [ + { + "inheritEnvironments": [ + "msvc_x64" + ], + "name": "x64-Debug", + "includePath": [ + "${env.INCLUDE}", + "${workspaceRoot}\\**" + ], + "defines": [ + "WIN32", + "_DEBUG", + "UNICODE", + "_UNICODE" + ], + "intelliSenseMode": "windows-msvc-x64" + } + ] +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/UpgradeLog.htm b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/UpgradeLog.htm new file mode 100644 index 000000000..a88cd1b85 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/UpgradeLog.htm differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.html index 85355335d..6435d9a60 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/StuInfoBasic.html @@ -1,4 +1,4 @@ -
+
- -
- -
-
-
自然信息
-
-
- 籍贯 - -
-
-
-
通讯信息
-
-
- 家庭住址 - -
-
- 联系电话 - -
-
-
-
家庭成员(直系家属)
-
-
-
- 姓名 - -
-
- 与本人关系 - -
-
- 性别 - -
-
- 年龄 - -
-
- 政治面貌 - -
-
-
-
-
-
紧急联系人
-
-
-
- 姓名 - -
-
- 与本人关系 - -
-
- 手机号码 - -
-
- 座机号码 - -
-
- 联系地址 - -
-
-
-
+
基本信息
+
+ +
+ 学号 + +
+
+ 准考证号 + +
+
+ 考生号 + +
+
+ 姓名 +
+
+ 性别 + +
+
+ 系别 + +
+
+ 专业 + +
+
+ 班级 + +
+
+ 身份证号 + +
+
+ 出生日期 + +
+
+ 户口类别 + +
+
+ 政治面貌 + +
+
+
+
采集照片信息
+
+ + +
+ + +
+ +
+
+
自然信息
+
+
+ 籍贯 + +
+
+
+
通讯信息
+
+
+ 家庭住址 + +
+
+ 联系电话 + +
-
- -
-
+
+ 基础信息 +
+ 开户银行 + +
+
+
+ 银行卡账号 + +
+
+ 开户行位置 + +
+
+
+
家庭成员(直系家属)
+
+
+
+ 姓名 + +
+
+ 与本人关系 + +
+
+ 性别 + +
+
+ 年龄 + +
+
+ 政治面貌 + +
+
+
+
+
+
紧急联系人
+
+
+
+ 姓名 + +
+
+ 与本人关系 + +
+
+ 手机号码 + +
+
+ 座机号码 + +
+
+ 联系地址 + +
+
+
+
+ +
+ +
+ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js index e4a8ae29f..e7a127e16 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js @@ -1,340 +1,375 @@ -(function () { - var colDataItemArr = ['GenderNo']; - var colDataItemCode = ['usersex']; - - var page = { - isScroll: false, - init: function ($page) { - // 获取登录者信息 - var userinfo = learun.storage.get('userinfo'); +(function() { + var colDataItemArr = ['GenderNo']; + var colDataItemCode = ['usersex']; + var colDataItemBank = ['DepositBank']; - //增加联系人 - $page.find('.welT i').on('tap', function () { - var FamilyHtml = '
' + - '
' + - '姓名' + - '' + - '
' + - '
' + - '与本人关系' + - '
' + - '
' + - '
' + - '性别' + - '
' + - '
' + - '
' + - '年龄' + - '' + - '
' + - '
' + - '政治面貌' + - '
' + - '
' + - //'
' + - //'身份证号' + - //'' + - //'
' + - '
' + - '
'; - var EmergePeopleHtml = '
' + - '
' + - '姓名' + - '' + - '
' + - '
' + - '与本人关系' + - '' + - '
' + - '
' + - '手机号码' + - '' + - '
' + - '
' + - '座机号码' + - '' + - '
' + - '
' + - '联系地址' + - '' + - '
' + - '
' + - '
'; + var page = { + isScroll: false, + init: function($page) { + // 获取登录者信息 + var userinfo = learun.storage.get('userinfo'); + //增加联系人 + $page.find('.welT i').on('tap', function() { + var FamilyHtml = '
' + + '
' + + '姓名' + + '' + + '
' + + '
' + + '与本人关系' + + '
' + + '
' + + '
' + + '性别' + + '
' + + '
' + + '
' + + '年龄' + + '' + + '
' + + '
' + + '政治面貌' + + '
' + + '
' + + //'
' + + //'身份证号' + + //'' + + //'
' + + '
' + + '
'; + var EmergePeopleHtml = '
' + + '
' + + '姓名' + + '' + + '
' + + '
' + + '与本人关系' + + '' + + '
' + + '
' + + '手机号码' + + '' + + '
' + + '
' + + '座机号码' + + '' + + '
' + + '
' + + '联系地址' + + '' + + '
' + + '
' + + '
'; - var obj = $(this).parent().next(); - if ($(this).attr('title') == '紧急联系人') { - obj.append(EmergePeopleHtml); - } else { - obj.append(FamilyHtml); - } + var obj = $(this).parent().next(); + if ($(this).attr('title') == '紧急联系人') { + obj.append(EmergePeopleHtml); + } else { + obj.append(FamilyHtml); + } - page.bind($page); - }) - //删除联系人 - $page.find('.welBox').on('tap', '.welDel i', function () { - var parents = $(this).parents('.welCon') - learun.layer.confirm('是否删除此联系人？', function (_index) { - _index == 1 ? parents.remove() : '' - }, '提示', ['否', '是']); - }) - //上传照片 - var inputNode = $page.find('#files'); - $page.find('#welImgBtn').on('tap', function () { - var evt = new MouseEvent("click", { - bubbles: false, - cancelable: true, - view: window - }); - inputNode[0].dispatchEvent(evt); - }) - inputNode.on('change', function () { - previewFile(); - }); - //数据绑定 - learun.layer.loading(true, '获取数据中'); - learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => { - if (data) { - //基本信息 - for (var id in data['StuInfoFreshEntity']) { - var dom = $('#' + id)[0]; - if (dom) { - if (dom.tagName.toLowerCase() == "span") { - $('#' + id).html(data['StuInfoFreshEntity']['' + id + '']); - //数据字典 - if ($.inArray(id, colDataItemArr) >= 0) { - learun.clientdata.get('dataItem', { - code: colDataItemCode[$.inArray(id, colDataItemArr)], - key: data['StuInfoFreshEntity']['' + id + ''], - callback: function (data, op) { - $('#' + id).html(data.text); - } - }); - } - if (id == "PartyFaceNo") { - learun.clientdata.get('sourceData', { - code: 'BCdPartyFace', - key: data['StuInfoFreshEntity']['' + id + ''], - keyId: 'partyfaceno', - callback: function (data, op) { - $("#PartyFaceNo").html(data.partyface); - } - }); - } - } else if (dom.tagName.toLowerCase() == "input") { - $('#' + id).val(data['StuInfoFreshEntity']['' + id + '']); - } - } - } - $("#Birthday").html($("#Birthday").text().substr(0, $("#Birthday").text().indexOf(' '))); - //头像 - $('#PhotoImg').attr('src', config.web + data['Url']); - //家庭成员 - $('#StuInfoFreshFamily').html(""); - $.each(data['StuInfoFreshFamilyList'], function (i, item) { - var html = '
' + - '
' + - '姓名' + - '' + - '
' + - '
' + - '与本人关系' + - //'' + - '
' + - '
' + - '
' + - '性别' + - //'' + - '
' + - '
' + - '
' + - '年龄' + - '' + - '
' + - '
' + - '政治面貌' + - //'' + - '
' + - '
' + - //'
' + - //'身份证号' + - //'' + - //'
' + - '
' + - '
'; - $('#StuInfoFreshFamily').append(html); + page.bind($page); + }) + //删除联系人 + $page.find('.welBox').on('tap', '.welDel i', function() { + var parents = $(this).parents('.welCon') + learun.layer.confirm('是否删除此联系人？', function(_index) { + _index == 1 ? parents.remove() : '' + }, '提示', ['否', '是']); + }) + //上传照片 + var inputNode = $page.find('#files'); + $page.find('#welImgBtn').on('tap', function() { + var evt = new MouseEvent("click", { + bubbles: false, + cancelable: true, + view: window + }); + inputNode[0].dispatchEvent(evt); + }) + inputNode.on('change', function() { + previewFile(); + }); - }); + //数据绑定 + learun.layer.loading(true, '获取数据中'); + learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, ( + data) => { + if (data) { + //基本信息 + for (var id in data['StuInfoFreshEntity']) { + var dom = $('#' + id)[0]; + if (dom) { + if (dom.tagName.toLowerCase() == "span") { + $('#' + id).html(data['StuInfoFreshEntity']['' + id + '']); + //数据字典 + if ($.inArray(id, colDataItemArr) >= 0) { + learun.clientdata.get('dataItem', { + code: colDataItemCode[$.inArray(id, + colDataItemArr)], + key: data['StuInfoFreshEntity']['' + id + ''], + callback: function(data, op) { + $('#' + id).html(data.text); + } + }); + } + if (id == "PartyFaceNo") { + learun.clientdata.get('sourceData', { + code: 'BCdPartyFace', + key: data['StuInfoFreshEntity']['' + id + ''], + keyId: 'partyfaceno', + callback: function(data, op) { + $("#PartyFaceNo").html(data.partyface); + } + }); + } + // if (id == "#DepositBank") { + // learun.clientdata.get('sourceData', { + // code: 'DepositBank', + // key: data['StuInfoFreshEntity']['' + id + ''], + // keyId: 'DepositBank', + // callback: function(data, op) { + // $("#DepositBank").html(data.text); + // } + // }); + // } + } else if (dom.tagName.toLowerCase() == "input") { + $('#' + id).val(data['StuInfoFreshEntity']['' + id + '']); + } + } + } + $("#Birthday").html($("#Birthday").text().substr(0, $("#Birthday").text() + .indexOf(' '))); + $("#DepositBank").lrpickerSet(data.StuInfoFreshEntity.DepositBank); + //头像 + $('#PhotoImg').attr('src', config.web + data['Url']); + //家庭成员 + $('#StuInfoFreshFamily').html(""); + $.each(data['StuInfoFreshFamilyList'], function(i, item) { + var html = '
' + + '
' + + '姓名' + + '' + + '
' + + '
' + + '与本人关系' + + //'' + + '
' + + '
' + + '
' + + '性别' + + //'' + + '
' + + '
' + + '
' + + '年龄' + + '' + + '
' + + '
' + + '政治面貌' + + //'' + + '
' + + '
' + + //'
' + + //'身份证号' + + //'' + + //'
' + + '
' + + '
'; + $('#StuInfoFreshFamily').append(html); - //紧急联系人 - $('#StuInfoFreshEmergePeople').html(""); - $.each(data['StuInfoFreshEmergePeopleList'], function (i, item) { - var html = '
' + - '
' + - '姓名' + - '' + - '
' + - '
' + - '与本人关系' + - '' + - '
' + - '
' + - '手机号码' + - '' + - '
' + - '
' + - '座机号码' + - '' + - '
' + - '
' + - '联系地址' + - '' + - '
' + - '
' + - '
'; - $('#StuInfoFreshEmergePeople').append(html); + }); - }); + //紧急联系人 + $('#StuInfoFreshEmergePeople').html(""); + $.each(data['StuInfoFreshEmergePeopleList'], function(i, item) { + var html = '
' + + '
' + + '姓名' + + '' + + '
' + + '
' + + '与本人关系' + + '' + + '
' + + '
' + + '手机号码' + + '' + + '
' + + '
' + + '座机号码' + + '' + + '
' + + '
' + + '联系地址' + + '' + + '
' + + '
' + + '
'; + $('#StuInfoFreshEmergePeople').append(html); - page.bind($page); - learun.layer.loading(false); + }); - } + page.bind($page); + learun.layer.loading(false); - }); + } - //保存 - $page.find('#saveBtn').on('tap', function () { - var postdata = { - ID: $('#ID').val(), - RegionNo: $('#RegionNo').val(), - FamilyAddress: $('#FamilyAddress').val(), - telephone: $('#telephone').val(), - Photo: $('#Photo').val(), - StuInfoFreshFamilyEntities: family(), - StuInfoFreshEmergePeopleEntities: emergePeople() - }; + }); + + //保存 + $page.find('#saveBtn').on('tap', function() { + var postdata = { + ID: $('#ID').val(), + RegionNo: $('#RegionNo').val(), + FamilyAddress: $('#FamilyAddress').val(), + telephone: $('#telephone').val(), + Photo: $('#Photo').val(), + DepositBank: $('#DepositBank').lrpickerGet(), + BankCard: $('#BankCard').val(), + BankLocation: $('#BankLocation').val(), + StuInfoFreshFamilyEntities: family(), + StuInfoFreshEmergePeopleEntities: emergePeople() + }; console.log(postdata) // return - learun.layer.loading(true, '正在提交数据'); - learun.httpget(config.webapi + "StuInfoFresh/saveStuInfoFresh", postdata, (data) => { - learun.layer.loading(false); - if (data) { - learun.layer.toast('保存成功'); - location.reload(); - } - }); + learun.layer.loading(true, '正在提交数据'); + learun.httpget(config.webapi + "StuInfoFresh/saveStuInfoFresh", postdata, ( + data) => { + learun.layer.loading(false); + if (data) { + learun.layer.toast('保存成功'); + location.reload(); + } + }); + + }); - }); + }, + bind: function($page) { + //性别 + $.each($page.find('[name="Sex"]'), function(i, item) { + $page.find(item).lrpickerex({ + code: 'usersex', + type: 'dataItem' + }); + //赋值 + $(item).lrpickerSet($(item).attr('value')); + }); + $page.find('#DepositBank').lrpickerex({ + code: 'DepositBank', + type: 'dataItem' + }); + //政治面貌 + $.each($page.find('[name="Politicy"]'), function(i, item) { + $page.find(item).lrpickerex({ + code: 'BCdPartyFace', + type: 'sourceData', + ivalue: 'partyfaceno', + itext: 'partyface' + }); + //赋值 + $(item).lrpickerSet($(item).attr('value')); + }); + //与本人关系 + $.each($page.find('#StuInfoFreshFamily').find('[name="Relation"]'), function(i, item) { + $page.find(item).lrpickerex({ + code: 'FamilyRelation', + type: 'dataItem' + }); + //赋值 + $(item).lrpickerSet($(item).attr('value')); + }); + } + }; + //数据处理 + function family() { + var list = new Array(); + $.each($('#StuInfoFreshFamily').children('.welCon'), function(i, item) { + var o = $(item).children(".welConForm").serializeObject(); + o.Sex = $(item).find('[name="Sex"]').lrpickerGet(); + o.DepositBank = $(item).find('[name="DepositBank"]').lrpickerGet(); + o.Politicy = $(item).find('[name="Politicy"]').lrpickerGet(); + o.Relation = $(item).find('[name="Relation"]').lrpickerGet(); + list.push(o); + }); + return list; + } - }, - bind: function ($page) { - //性别 - $.each($page.find('[name="Sex"]'), function (i, item) { - $page.find(item).lrpickerex({ - code: 'usersex', - type: 'dataItem' - }); - //赋值 - $(item).lrpickerSet($(item).attr('value')); - }); - //政治面貌 - $.each($page.find('[name="Politicy"]'), function (i, item) { - $page.find(item).lrpickerex({ - code: 'BCdPartyFace', - type: 'sourceData', - ivalue: 'partyfaceno', - itext: 'partyface' - }); - //赋值 - $(item).lrpickerSet($(item).attr('value')); - }); - //与本人关系 - $.each($page.find('#StuInfoFreshFamily').find('[name="Relation"]'), function (i, item) { - $page.find(item).lrpickerex({ - code: 'FamilyRelation', - type: 'dataItem' - }); - //赋值 - $(item).lrpickerSet($(item).attr('value')); - }); - } - }; - //数据处理 - function family() { - var list = new Array(); - $.each($('#StuInfoFreshFamily').children('.welCon'), function (i, item) { - var o = $(item).children(".welConForm").serializeObject(); - o.Sex = $(item).find('[name="Sex"]').lrpickerGet(); - o.Politicy = $(item).find('[name="Politicy"]').lrpickerGet(); - o.Relation = $(item).find('[name="Relation"]').lrpickerGet(); - list.push(o); - }); - return list; - } - function emergePeople() { - var list = new Array(); - $.each($('#StuInfoFreshEmergePeople').children('.welCon'), function (i, item) { - var o = $(item).children(".welConForm").serializeObject(); - list.push(o); - }); - return list; - } + function emergePeople() { + var list = new Array(); + $.each($('#StuInfoFreshEmergePeople').children('.welCon'), function(i, item) { + var o = $(item).children(".welConForm").serializeObject(); + list.push(o); + }); + return list; + } - $.fn.serializeObject = function () { - var o = {}; - var a = this.serializeArray(); - $.each(a, function () { - if (o[this.name]) { - if (!o[this.name].push) { - o[this.name] = [o[this.name]]; - } - o[this.name].push(this.value || ''); - } else { - o[this.name] = this.value || ''; - } - }); - return o; - } + $.fn.serializeObject = function() { + var o = {}; + var a = this.serializeArray(); + $.each(a, function() { + if (o[this.name]) { + if (!o[this.name].push) { + o[this.name] = [o[this.name]]; + } + o[this.name].push(this.value || ''); + } else { + o[this.name] = this.value || ''; + } + }); + return o; + } - //上传照片 - function previewFile() { - var html = ''; - var file = document.querySelector('input[type=file]').files[0]; - var reader = new FileReader(); - reader.onloadend = function () { - //$('#PhotoImg').attr('src', reader.result); - var postData = { - Base64Url: reader.result - } - learun.httppost(config.webapi + "StuInfoFresh/savePhoto", postData, (data) => { - if (data) { - $('#Photo').val(data.AnnexesFileId); - $('#PhotoImg').attr('src', config.web + data.Url); - } else { - learun.layer.toast('采集照片信息失败！'); - } - }); - } - if (file) { - reader.readAsDataURL(file); - } - } + //上传照片 + function previewFile() { + var html = ''; + var file = document.querySelector('input[type=file]').files[0]; + var reader = new FileReader(); + reader.onloadend = function() { + //$('#PhotoImg').attr('src', reader.result); + var postData = { + Base64Url: reader.result + } + learun.httppost(config.webapi + "StuInfoFresh/savePhoto", postData, (data) => { + if (data) { + $('#Photo').val(data.AnnexesFileId); + $('#PhotoImg').attr('src', config.web + data.Url); + } else { + learun.layer.toast('采集照片信息失败！'); + } + }); + } + if (file) { + reader.readAsDataURL(file); + } + } - //产生随机数 - function GenerateRandom() { - var retstr = ""; - var date = new Date(); - retstr = date.getFullYear().toString() + "-" + date.getMonth().toString() + "-" + date.getDate().toString() + "-" + date.getUTCHours().toString() + "-" + date.getUTCMinutes() + "-" + date.getUTCSeconds().toString(); - var Num = ""; - for (var i = 0; i < 6; i++) { - Num += Math.floor(Math.random() * 10); - } - return retstr + Num; - } + //产生随机数 + function GenerateRandom() { + var retstr = ""; + var date = new Date(); + retstr = date.getFullYear().toString() + "-" + date.getMonth().toString() + "-" + date.getDate() + .toString() + "-" + date.getUTCHours().toString() + "-" + date.getUTCMinutes() + "-" + date + .getUTCSeconds() + .toString(); + var Num = ""; + for (var i = 0; i < 6; i++) { + Num += Math.floor(Math.random() * 10); + } + return retstr + Num; + } - return page; + return page; })(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs index bb578e616..29ed6a8d3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs @@ -39,6 +39,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return View(); } /// + /// 银行 + /// + /// + [HttpGet] + public ActionResult IndexBank() + { + return View("Index"); + } + /// /// 主页面【大厂】 /// /// 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 ae881ba38..c1f64a959 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 @@ -46,6 +46,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// + /// + /// + /// + [HttpGet] + public ActionResult Indexbank() + { + return View("Index"); + } + [HttpGet] public ActionResult IndexDC() { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml index cca53fdce..6c86ed491 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml @@ -41,7 +41,7 @@
疫情状态
-
+
政治面貌
@@ -54,8 +54,8 @@
健康状况
-
-
+
+
户口分类
@@ -79,6 +79,18 @@
E-mail
+
+
开户银行*
+
+
+
+
开户卡账号*
+ +
+
+
开户银行位置
+ +
通信地址*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js index 481635b8f..c53eb1050 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js @@ -55,6 +55,7 @@ var bootstrap = function ($, learun) { } }, bind: function () { + $('#DepositBank').lrDataItemSelect({ code: 'DepositBank' }); $('#F_ProvinceId').lrDataSourceSelect({ code: 'DIC_PROVINCE', value: 'pcode', text: 'pname', select: function (item) { @@ -168,6 +169,7 @@ var bootstrap = function ($, learun) { learun.alert.error('请先选择系和专业'); } }); + }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.js index 9efee1a5e..dbcec20ae 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.js @@ -198,7 +198,6 @@ var bootstrap = function ($, learun) { - }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js index 367bc0204..d5913cd4f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js @@ -351,7 +351,10 @@ var bootstrap = function ($, learun) { formatter: function (cellvalue) { return cellvalue == "1" ? "已审核" : "未审核"; } - } + }, + { label: '开户银行', name: 'DepositBank', width: 100, align: "left" }, + { label: '银行卡账号', name: 'BankCard', width: 150, align: "left" }, + { label: '开户银行位置', name: 'BankLocation', width: 200, align: "left" }, ], mainId: 'StuId', isPage: true, 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 9cfc81e3f..ede79a9a1 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 @@ -129,7 +129,18 @@
精准贫困户
- +
+
开户银行*
+
+
+
+
银行卡账号*
+ +
+
+
开户银行位置
+ +
拍照
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 8b8387548..a7e80130d 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 @@ -15,6 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { + $('#DepositBank').lrDataItemSelect({ code: 'DepositBank' }); $("#GenderNo").lrDataItemSelect({ code: 'usersex' }); $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); $("#FamilyOriginNo").lrDataItemSelect({ code: 'ExamineeCategory' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js index 296d47d15..d1efe7215 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js @@ -321,6 +321,9 @@ var bootstrap = function ($, learun) { { label: '数学', name: 'MathScore', width: 100, align: "left" }, { label: '英语', name: 'ForeignLangScore', width: 100, align: "left" }, { label: '综合', name: 'ComprehensiveScore', width: 100, align: "left" }, + { label: '开户银行', name: 'DepositBank', width: 100, align: "left" }, + { label: '银行卡账号', name: 'BankCard', width: 150, align: "left" }, + { label: '开户银行位置', name: 'BankLocation', width: 200, align: "left" }, ], mainId: 'ID', isPage: true, 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 46a2b34c6..1b9f03207 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 @@ -7172,6 +7172,8 @@ + + @@ -7253,6 +7255,10 @@ + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/FolderProfile4.pubxml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/FolderProfile4.pubxml new file mode 100644 index 000000000..3dd3b0238 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/FolderProfile4.pubxml @@ -0,0 +1,18 @@ + + + + + FileSystem + FileSystem + Release + Any CPU + + True + False + bin\Release\Publish + False + + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-validator-helper.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-validator-helper.js index cf0f792a8..dcac566ad 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-validator-helper.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-validator-helper.js @@ -38,9 +38,19 @@ } return res; }, + isBankCard: function (obj) {//验证银行卡的长度 + var res = { code: true, msg: '' }; + obj = $.trim(obj); + if (obj.length >= 20 || obj.length < 16) { + res.code = false; + res.msg = '输入错误，请核对银行卡账号'; + } + return res; + }, isNum: function (obj) {// 验证数字 return learun.validator.validReg(obj, /^[-+]?\d+$/, '必须为数字'); }, + isPositiveInteger: function (obj) {// 正整数 return learun.validator.validReg(obj, /^[1-9]\d*$/, '必须为正整数'); }, @@ -201,7 +211,7 @@ res.msg = '必须小于等于' + n + '位字符或空'; } return res; - } + }, }; })(window.jQuery, top.learun); 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..14f76a828 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs @@ -171,6 +171,10 @@ namespace Learun.Application.WebApi.Modules entity.RegionNo = model.RegionNo; entity.FamilyAddress = model.FamilyAddress; entity.telephone = model.telephone; + entity.BankCard = model.BankCard; + entity.BankLocation = model.BankLocation; + entity.DepositBank = model.DepositBank; + if (!string.IsNullOrEmpty(model.Photo)) { entity.IsPhoto = true; @@ -330,7 +334,6 @@ namespace Learun.Application.WebApi.Modules { ReqFormEntity parameter = this.GetReqData(); StuInfoFreshEntity entity = parameter.strEntity.ToObject(); - stuInfoFreshIBLL.SaveEntity(parameter.keyValue, entity); return Success("保存成功！"); } @@ -388,6 +391,18 @@ namespace Learun.Application.WebApi.Modules /// 紧急联系人 /// public List StuInfoFreshEmergePeopleEntities { get; set; } + /// + /// 开户行 + /// + public string DepositBank { get; set; } + /// + /// 银行卡号 + /// + public string BankCard { get; set; } + /// + /// 开户行位置 + /// + public string BankLocation { get; set; } } 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..0fac6f538 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config @@ -92,6 +92,10 @@ + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs index 88606a2b6..2e14c2089 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs @@ -708,7 +708,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("TWOPOSITION")] public string TwoPosition { get; set; } - + /// + /// 开户银行 + /// + [Column("DEPOSITBANK")] + public string DepositBank { get; set; } + /// + /// 银行卡账号 + /// + [Column("BANKCARD")] + public string BankCard { get; set; } + /// + /// 开户银行位置 + /// + [Column("BANKLOCATION")] + public string BankLocation { get; set; } #endregion #region 扩展操作 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 bb33a915d..9deaa0983 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 @@ -597,6 +597,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("ISINBASIC")] public bool? IsInBasic { get; set; } + /// + /// 开户银行 + /// + [Column("DEPOSITBANK")] + public string DepositBank { get; set; } + /// + /// 银行卡账号 + /// + [Column("BANKCARD")] + public string BankCard { get; set; } + /// + /// 开户银行位置 + /// + [Column("BANKLOCATION")] + public string BankLocation { get; set; } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs index 563b85c12..5e27b1f7c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs @@ -861,6 +861,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration entity.Modify(keyValue); db.Update(entity); db.Delete(t => t.StuInfoFreshId == stuInfoFreshEntityTmp.ID); + if (null != stuInfoFreshEmergePeopleList && null != stuInfoFreshFamilyList) { foreach (StuInfoFreshEmergePeopleEntity item in stuInfoFreshEmergePeopleList) @@ -899,10 +900,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } - db.Commit(); - //家长生成账号 GenerateAccoutForStuFamily(entity, stuInfoFreshFamilyList); + db.Commit(); + + } catch (Exception ex) {