From e2b659537feb636321003046153e2785b057a89b Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Thu, 24 Sep 2020 17:04:00 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E6=95=99=E5=B8=88=E5=8A=9F=E8=83=BD=EF=BC=9A?= =?UTF-8?q?=E6=96=B0=E7=94=9F=E7=BC=B4=E8=B4=B9=E7=AE=A1=E7=90=86=EF=BC=9B?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=8A=A5=E5=88=B0=E8=AE=A4=E5=AE=9A=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../StuInfoFresh/PayFee/PayFee.css | 1 + .../StuInfoFresh/PayFee/PayFee.html | 24 +++ .../StuInfoFresh/PayFee/PayFee.js | 134 ++++++++++++ .../StuInfoFresh/PayFee/form/form.css | 7 + .../StuInfoFresh/PayFee/form/form.html | 14 ++ .../StuInfoFresh/PayFee/form/form.js | 151 ++++++++++++++ .../RegisterQRCode/RegisterQRCode.css | 4 +- .../RegisterQRCode/RegisterQRCode.html | 2 +- .../RegisterQRCode/RegisterQRCode.js | 6 +- .../StuInfoFresh/StudentLoan/StudentLoan.html | 2 +- .../StuInfoFresh/StudentLoan/StudentLoan.js | 4 +- .../ClassWork/form/form.js | 5 +- .../ConfirmStudentsCheckIn/form/form.css | 25 +++ .../ConfirmStudentsCheckIn/form/form.html | 41 +++- .../ConfirmStudentsCheckIn/form/form.js | 169 +++++++--------- .../www/pages/notice/notice.js | 14 +- .../www/pages/notice2/notice2.html | 118 +++++------ .../www/pages/notice2/notice2.js | 82 ++++---- .../www/pages/welcome/welcome.css | 5 +- .../www/pages/welcome/welcome.js | 10 +- .../Modules/StuInfoFreshApi.cs | 190 ++++++++---------- .../StuInfoFresh/StuInfoFreshService.cs | 11 + 23 files changed, 693 insertions(+), 327 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.css create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.html create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.css create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.html create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js diff --git a/.gitignore b/.gitignore index 6ca799005..98e318e07 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ typings/ unpackage Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js /Learun.Framework.Ultimate V7/Learun.Application.Web/Resource/ +/Learun.Framework.Ultimate V7/Learun.Application.Mobile/platforms/android/assets/www diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.css new file mode 100644 index 000000000..5f282702b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.css @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.html new file mode 100644 index 000000000..f7014b1dc --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.html @@ -0,0 +1,24 @@ +
+
+
+ 总共0条 +
+
+ +
+
+
+ +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js new file mode 100644 index 000000000..cf8bcb276 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js @@ -0,0 +1,134 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人:超级管理员 + * 日 期:2019-12-26 14:43 + * 描 述:新生缴费管理 + */ +(function () { + var begin = ''; + var end = ''; + var multipleData = null; + var page = { + grid: null, + init: function ($page) { + begin = ''; + end = ''; + multipleData = null; + page.grid = $page.find('#lr_StuInfoFreshPayFee_list').lrpagination({ + lclass: page.lclass, + rows: 10, // 每页行数 + getData: function (param, callback) {// 获取数据 param 分页参数,callback 异步回调 + param.multipleData = multipleData; + page.loadData(param, callback, $page); + }, + renderData: function (_index, _item, _$item) {// 渲染数据模板 + return page.rowRender(_index, _item, _$item, $page); + }, + click: function (item, $item, $et) {// 列表行点击事件 + if ($et.hasClass('lr-btn-danger')) { + page.btnClick(item, $item, $page); + } + else { + page.rowClick(item, $item, $page); + } + }, + btns: page.rowBtns + }); + // 多条件查询 + var $multiple = $page.find('.lr_multiple_search').multiplequery({ + callback: function (data) { + begin = ''; + end = ''; + multipleData = data || {}; + multipleData.EmpNo = learun.storage.get('userinfo').baseinfo.account; + page.grid.reload(); + } + }); + //$multiple.find('#ClassNo').lrpickerex({ + // type: 'sourceData', + // code: 'bjsj', + // ivalue:'classno', + // itext:'classname' + //}); + }, + lclass: 'lr-list', + loadData: function (param, callback, $page) {// 列表加载后台数据 + var empno = { + EmpNo: learun.storage.get('userinfo').baseinfo.account + }; + var _postParam = { + pagination: { + rows: param.rows, + page: param.page, + sidx: 'ClassNo,StuNo', + sord: 'ASC' + }, + queryJson: JSON.stringify(empno) + }; + if (param.multipleData) { + _postParam.queryJson = JSON.stringify(multipleData); + } + if (param.begin && param.end) { + _postParam.queryJson = JSON.stringify({ StartTime: param.begin, EndTime: param.end }); + } + learun.httpget(config.webapi + 'StuInfoFresh/pagelist', _postParam, (data) => { + $page.find('.lr-badge').text('0'); + if (data) { + $page.find('.lr-badge').text(data.records); + callback(data.rows, parseInt(data.records)); + } + else { + callback([], 0); + } + }); + }, + rowRender: function (_index, _item, _$item, $page) {// 渲染列表行数据 + _$item.addClass('lr-list-item lr-list-item-multi'); + _$item.append($('

学号:

').dataFormatter({ value: _item.StuNo })); + _$item.append($('

姓名:

').dataFormatter({ value: _item.StuName })); + _$item.append($('

班级:

').dataFormatter({ + value: _item.ClassNo, + type: 'dataSource', + code: 'bjsj', + keyId: 'classno', + text: 'classname' + })); + _$item.append($('

线上缴费状态:

').dataFormatter({ + value: _item.PayFeeStatus, + type: 'dataItem', + code: 'PayStatus' + })); + _$item.append($('

线上缴费时间:

').dataFormatter({ + value: _item.PayFeeDate, + type: 'datetime', + dateformat: 'yyyy-MM-dd hh:mm:ss' + })); + _$item.append($('

贷款回执码:

').dataFormatter({ value: _item.StudentLoan })); + _$item.append($('

现场缴费状态:

').dataFormatter({ + value: _item.OnsitePayFeeStatus, + type: 'dataItem', + code: 'OnsitePayStatus' + })); + + return ''; + }, + rowClick: function (item, $item, $page) {// 列表行点击触发方法 + learun.nav.go({ path: 'EducationalAdministration/StuInfoFresh/PayFee/form', title: '缴费详情', type: 'right', param: { keyValue: item.ID } }); + }, + //btnClick: function (item, $item, $page) {// 左滑按钮点击事件 + // learun.layer.confirm('确定要删除该笔数据吗?', function (_index) { + // if (_index === '1') { + // learun.layer.loading(true, '正在删除该笔数据'); + // learun.httppost(config.webapi + 'learun/PersonnelManagement/ClassWork/delete', item.Id, (data) => { + // if (data) {// 删除数据成功 + // page.grid.reload(); + // } + // learun.layer.loading(false); + // }); + // } + // }, 'Learun智慧校园提示', ['取消', '确定']); + //}, + //rowBtns: ['删除'] // 列表行左滑按钮 + }; + return page; +})(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.css new file mode 100644 index 000000000..c3b2cd671 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.css @@ -0,0 +1,7 @@ +.lr-form-container .lr-form-row { + padding-left: 100px; +} + +.lr-form-row label { + width: 100px; +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.html new file mode 100644 index 000000000..1780cdb40 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.html @@ -0,0 +1,14 @@ +
+
+ +
+
+
+ + +
+
+ +
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js new file mode 100644 index 000000000..33418a949 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js @@ -0,0 +1,151 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人:超级管理员 + * 日 期:2019-12-26 14:43 + * 描 述:新生缴费管理 + */ +(function () { + var keyValue = ''; + var $header = null; + var titleText = ''; + var page = { + isScroll: true, + init: function ($page, param) { + keyValue = param.keyValue; + // 添加头部按钮列表 + var _html = '\ +
取消
\ +
\ +
\ +
\ +
提交
'; + $header = $page.parents('.f-page').find('.f-page-header'); + $header.append(_html); + // 取消 + $header.find('.lr-form-header-cancel').on('tap', function () { + learun.layer.confirm('确定要退出当前编辑?', function (_index) { + if (_index === '1') { + if (keyValue) {// 如果是编辑状态 + learun.formblur(); + $header.find('.lr-form-header-cancel').hide(); + $header.find('.lr-form-header-submit').hide(); + $header.find('.lr-form-header-btnlist').show(); + $header.find('.f-page-title').text(titleText); + $page.find('.lr-form-container').setFormRead(); + } + else {// 如果是新增状态 关闭当前页面 + learun.nav.closeCurrent(); + } + } + }, 'learun智慧校园提示', ['取消', '确定']); + }); + // 编辑 + $header.find('.lr-form-header-edit').on('tap', function () { + $header.find('.lr-form-header-btnlist').hide(); + $header.find('.lr-form-header-cancel').show(); + $header.find('.lr-form-header-submit').show(); + titleText = $header.find('.f-page-title').text(); + $header.find('.f-page-title').text('编辑'); + $page.find('.lr-form-container').setFormWrite(); + }); + // 更多 + //$header.find('.lr-form-header-more').on('tap', function () { + // learun.actionsheet({ + // id: 'more', + // data: [ + // { + // text: '删除', + // mark: true, + // event: function () {// 删除当前条信息 + // learun.layer.confirm('确定要删除该笔数据吗?', function (_index) { + // if (_index === '1') { + // learun.layer.loading(true, '正在删除该笔数据'); + // learun.httppost(config.webapi + 'learun/PersonnelManagement/ClassWork/delete', keyValue, (data) => { + // learun.layer.loading(false); + // if (data) {// 删除数据成功 + // learun.nav.closeCurrent(); + // var prepage = learun.nav.getpage('PersonnelManagement/ClassWork'); + // prepage.grid.reload(); + // } + // }); + // } + // }, 'Learun智慧校园提示', ['取消', '确定']); + // } + // } + // ], + // cancel: function () { + // } + // }); + //}); + // 提交 + $header.find('.lr-form-header-submit').on('tap', function () { + // 获取表单数据 + if (!$page.find('.lr-form-container').lrformValid()) { + return false; + } + var _postData = {} + _postData.keyValue = keyValue; + _postData.strEntity = JSON.stringify($page.find('.lr-form-container').lrformGet()); + learun.layer.loading(true, '正在提交数据'); + learun.httppost(config.webapi + 'StuInfoFresh/save', _postData, (data) => { + learun.layer.loading(false); + if (data) {// 表单数据保存成功 + if (keyValue) { + learun.layer.toast('保存数据成功!'); + learun.formblur(); + $header.find('.lr-form-header-cancel').hide(); + $header.find('.lr-form-header-submit').hide(); + $header.find('.lr-form-header-btnlist').show(); + $header.find('.f-page-title').text(titleText); + $page.find('.lr-form-container').setFormRead(); + } + else {// 如果是 + learun.nav.closeCurrent(); + } + var prepage = learun.nav.getpage('/EducationalAdministration/StuInfoFresh/PayFee'); + prepage.grid.reload(); + } + }); + }); + page.bind($page, param); + if (keyValue) { + // 添加编辑按钮 + $page.find('.lr-form-container').setFormRead(); + $header.find('.lr-form-header-btnlist').show(); + // 获取表单数据 + learun.layer.loading(true, '获取表单数据'); + learun.httpget(config.webapi + 'StuInfoFresh/form', keyValue, (data) => { + if (data) { + for (var id in data) { + if (data[id].length) { + $page.find('#' + id).lrgridSet(data[id]); + } + else { + $page.find('[data-table="' + id + '"]').lrformSet(data[id]); + } + } + } + learun.layer.loading(false); + }); + } + else { + $header.find('.lr-form-header-cancel').show(); + $header.find('.lr-form-header-submit').show(); + } + }, + bind: function ($page, param) { + $page.find('#PayFeeStatus').lrpickerex({ + type: 'dataItem', + code: 'PayStatus' + }).lrpickerSet(0); + $page.find('#OnsitePayFeeStatus').lrpickerex({ + type: 'dataItem', + code: 'OnsitePayStatus' + }).lrpickerSet(0); + }, destroy: function (pageinfo) { + $header = null; + keyValue = ''; + } + }; + return page; +})(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.css index bf6cf92f1..1a369d668 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.css +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.css @@ -114,13 +114,13 @@ cursor: pointer; } -#PhotoImg { +#Img { width: 200px; height: 200px; margin: 30px auto; } - #PhotoImg img { + #Img img { width: 100%; height: 100%; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html index 576e9d212..0411479a6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html @@ -2,7 +2,7 @@
报到二维码
-
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js index 0b1c85f4e..5a4329fe8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js @@ -10,7 +10,7 @@ //数据绑定 learun.layer.loading(true, '获取数据中'); - learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", {}, (data) => { + learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => { if (data) { //判断是否显示报到二维码:未确认报到,且已完善信息,且缴费三有一; var entity = data["StuInfoFreshEntity"]; @@ -28,7 +28,7 @@ }, '智慧校园提示', ['确定']); return false; } - if (entity.PayFeeStatus == "未缴费" && (entity.StudentLoan == null || entity.StudentLoan == "" || entity.StudentLoan == undefined) && entity.OnsitePayFeeStatus != "1") { + if (entity.PayFeeStatus != "1" && (entity.StudentLoan == null || entity.StudentLoan == "" || entity.StudentLoan == undefined) && entity.OnsitePayFeeStatus != "1") { learun.layer.loading(false); learun.layer.confirm('新生未缴费,无法报到!', function (_index) { learun.nav.closeCurrent(); @@ -59,7 +59,7 @@ } } //二维码 - learun.code.encode({ id: 'PhotoImg', text: userinfo.baseinfo.account }); + learun.code.encode({ id: 'Img', text: userinfo.baseinfo.account }); page.bind($page); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.html index aca76c48f..48b742e7c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.html @@ -4,7 +4,7 @@
贷款回执码 - +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js index 83083cbff..69f9b8bdd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js @@ -8,8 +8,8 @@ if (data) { for (var id in data) { if (id == "StuInfoFreshEntity") { - $("#ID").val(data[id].ID); - $("#StudentLoan").val(data[id].StudentLoan); + $page.find("#ID").val(data[id].ID); + $page.find("#StudentLoan").val(data[id].StudentLoan); } } page.bind($page); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ClassWork/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ClassWork/form/form.js index 650886ca4..b235da4e3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ClassWork/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ClassWork/form/form.js @@ -119,7 +119,7 @@ if (data) { for (var id in data) { if (data[id].length) { - $page.find('#' + id ).lrgridSet(data[id]); + $page.find('#' + id).lrgridSet(data[id]); } else { $page.find('[data-table="' + id + '"]').lrformSet(data[id]); @@ -142,8 +142,9 @@ itext: 'classname' }); $page.find('#Date').lrdate({ + type: 'date' }); - }, destroy: function (pageinfo) { + }, destroy: function (pageinfo) { $header = null; keyValue = ''; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/WelcomNewStudents/ConfirmStudentsCheckIn/form/form.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/WelcomNewStudents/ConfirmStudentsCheckIn/form/form.css index 8e54c11de..d74094d1c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/WelcomNewStudents/ConfirmStudentsCheckIn/form/form.css +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/WelcomNewStudents/ConfirmStudentsCheckIn/form/form.css @@ -63,6 +63,22 @@ margin-bottom: 0; } + .welInput div { + margin-left: 28%; + width: 72%; + height: 30px; + line-height: 28px; + } + +#WaitInfo .welInput span { + width: 30%; +} + +#WaitInfo .welInput div { + margin-left: 32%; + width: 68%; +} + .welCon { padding: 10px; border: 1px solid #efefef; @@ -114,8 +130,17 @@ cursor: pointer; } +.welBoxPhoto { + height: 110px; +} + + .welBoxPhoto .welImgAdd { + height: 100%; + } + #PhotoImg { width: 110px; + height: 100%; } .btnBox { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/WelcomNewStudents/ConfirmStudentsCheckIn/form/form.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/WelcomNewStudents/ConfirmStudentsCheckIn/form/form.html index 8852bd30e..8c5fee00d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/WelcomNewStudents/ConfirmStudentsCheckIn/form/form.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/WelcomNewStudents/ConfirmStudentsCheckIn/form/form.html @@ -52,9 +52,9 @@
采集照片信息
-
+
- +
@@ -64,7 +64,7 @@
籍贯 - +
@@ -72,11 +72,11 @@
家庭住址 - +
联系电话 - +
@@ -133,8 +133,37 @@
+
+ + +
待认定信息
+
+
+ 是否精准贫困户 +
+
+
+ 钥匙发放 +
+
+
+ 校园卡发放 +
+
+
+ 其他费用收取 +
+
+
+ 档案收取 +
+
+
+
+ +
- +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/WelcomNewStudents/ConfirmStudentsCheckIn/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/WelcomNewStudents/ConfirmStudentsCheckIn/form/form.js index 45b0c2ca8..4922a73d0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/WelcomNewStudents/ConfirmStudentsCheckIn/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/WelcomNewStudents/ConfirmStudentsCheckIn/form/form.js @@ -1,12 +1,14 @@ (function () { - var colDataItemArr = ['GenderNo', 'PartyFaceNo']; - var colDataItemCode = ['usersex', 'PolityStatus']; + var colDataItemArr = ['GenderNo', 'PartyFaceNo', 'IsPoor', 'GetKeyStatus', 'GetCardStatus', 'OtherPayFeeStatus', 'CollectFileStatus']; + var colDataItemCode = ['usersex', 'PolityStatus', 'YesOrNoInt', 'YesOrNoInt', 'YesOrNoInt', 'YesOrNoInt', 'YesOrNoInt']; var page = { isScroll: false, - init: function ($page,param) { + init: function ($page, param) { + page.bind2($page); //数据绑定 - learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntityByStuNo", '\''+param.StuNo+'\'', (data) => { + learun.layer.loading(true, '获取数据中'); + learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", param.StuNo, (data) => { if (data) { //基本信息 for (var id in data['StuInfoFreshEntity']) { @@ -27,6 +29,8 @@ } else if (dom.tagName.toLowerCase() == "input") { $('#' + id).val(data['StuInfoFreshEntity']['' + id + '']); + } else if (dom.tagName.toLowerCase() == "div") { + $('#' + id).lrpickerSet(data['StuInfoFreshEntity']['' + id + '']); } } } @@ -38,32 +42,32 @@ var html = '
' + '
' + '姓名' + - '' + + '' + '
' + '
' + '与本人关系' + - //'' + - '
' + + '' + + //'
' + '
' + '
' + '性别' + - //'' + - '
' + + '' + + //'
' + '
' + '
' + '年龄' + - '' + + '' + '
' + '
' + '政治面貌' + - //'' + - '
' + + '' + + //'
' + '
' + '
' + '身份证号' + - '' + + '' + '
' + - '
' + + //'
' + '
'; $('#StuInfoFreshFamily').append(html); @@ -75,32 +79,32 @@ var html = '
' + '
' + '姓名' + - '' + + '' + '
' + '
' + '与本人关系' + - '' + + '' + '
' + '
' + '手机号码' + - '' + + '' + '
' + '
' + '座机号码' + - '' + + '' + '
' + '
' + '联系地址' + - '' + + '' + '
' + - '
' + + //'
' + '
'; $('#StuInfoFreshEmergePeople').append(html); }); page.bind($page); - + learun.layer.loading(false); } @@ -108,22 +112,25 @@ //保存 $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() - }; - learun.httpget(config.webapi + "StuInfoFresh/saveStuInfoFresh", postdata, (data) => { - if (data) { + // 获取表单数据 + if (!$page.find('#WaitInfo').lrformValid()) { + return false; + } + var _postData = {} + _postData.keyValue = $('#ID').val(); + var data = $page.find('#WaitInfo').lrformGet(); + data.RegisterStatus = "1"; + data.ArriveDate = getTime(); + console.log(data); + _postData.strEntity = JSON.stringify(data); + learun.layer.loading(true, '正在提交数据'); + learun.httppost(config.webapi + 'StuInfoFresh/save', _postData, (data) => { + learun.layer.loading(false); + if (data) {// 表单数据保存成功 learun.layer.toast('保存成功'); - location.reload(); + learun.nav.closeCurrent(); } }); - }); @@ -131,81 +138,55 @@ bind: function ($page) { //性别 $.each($page.find('[name="Sex"]'), function (i, item) { - $page.find(item).lrpickerex({ + learun.clientdata.get('dataItem', { code: 'usersex', - type: 'dataItem' + key: $(item).attr('value'), + callback: function (data, op) { + $(item).val(data.text); + } }); - //赋值 - $(item).lrpickerSet($(item).attr('value')); }); //政治面貌 $.each($page.find('[name="Politicy"]'), function (i, item) { - $page.find(item).lrpickerex({ + learun.clientdata.get('dataItem', { code: 'PolityStatus', - type: 'dataItem' + key: $(item).attr('value'), + callback: function (data, op) { + $(item).val(data.text); + } }); - //赋值 - $(item).lrpickerSet($(item).attr('value')); }); //与本人关系 $.each($page.find('#StuInfoFreshFamily').find('[name="Relation"]'), function (i, item) { - $page.find(item).lrpickerex({ + learun.clientdata.get('dataItem', { code: 'FamilyRelation', - type: 'dataItem' + key: $(item).attr('value'), + callback: function (data, op) { + $(item).val(data.text); + } }); - //赋值 - $(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; - } - - $.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; - } - + }, + //待认定信息 + bind2: function ($page) { + $.each($page.find('#WaitInfo .YesOrNo'), function (i, item) { + $(item).lrpickerex({ + type: 'dataItem', + code: 'YesOrNoInt' + }).lrpickerSet(0); + }); - //产生随机数 - 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 getTime() { + var nowDate = new Date(); + var year = nowDate.getFullYear(); + var month = nowDate.getMonth() + 1 < 10 ? "0" + (nowDate.getMonth() + 1) : nowDate.getMonth() + 1; + var date = nowDate.getDate() < 10 ? "0" + nowDate.getDate() : nowDate.getDate(); + var hour = nowDate.getHours() < 10 ? "0" + nowDate.getHours() : nowDate.getHours(); + var minute = nowDate.getMinutes() < 10 ? "0" + nowDate.getMinutes() : nowDate.getMinutes(); + var second = nowDate.getSeconds() < 10 ? "0" + nowDate.getSeconds() : nowDate.getSeconds(); + return year + "-" + month + "-" + date + " " + hour + ":" + minute + ":" + second; } return page; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js index 31c1e6f5d..c989d93cd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js @@ -3,9 +3,11 @@ var page = { isScroll: false, init: function ($page) { + // 获取登录者信息 + var userinfo = learun.storage.get('userinfo'); - //ݰ - learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", {}, (data) => { + //数据绑定 + learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => { if (data) { var entity = data['StuInfoFreshEntity']; if (entity != null) { @@ -16,16 +18,16 @@ $('#ClassNo').html(entity.ClassNo); $('#ClassTutorName').html(entity.ClassTutorName); $('#ClassTutorMobile').html(entity.ClassTutorMobile); - $('#PayFeeStatus').html(entity.PayFeeStatus); - $('#CollectFileStatus').html(entity.CollectFileStatus); - $('#GetKeyStatus').html(entity.GetKeyStatus); + $('#PayFeeStatus').html(entity.PayFeeStatus == "1" ? "已缴费" : "未缴费"); + $('#CollectFileStatus').html(entity.CollectFileStatus == "1" ? "已提交" : "未提交"); + $('#GetKeyStatus').html(entity.GetKeyStatus == "1" ? "已领取" : "未领取"); $('#IsCompleteInfo').html(entity.IsCompleteInfo); $('#Dormitory').html(entity.DormitoryName); } } }); - + }, bind: function ($page) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html index 0e901d528..a95e33e7f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html @@ -1,61 +1,61 @@
- - - -
-
2020
-
新生入校流程
-
-
-
-
step1
-
- -
- 完善学生信息 -
-
已完成
-
-
-
- -
step2
-
- -
- 线上缴费 - ( 已缴费、未缴费 ) -
-
未完成
-
-
- -
- 助学贷款 - ( 填写贷款回执码 ) -
-
已完成
-
-
- -
- 现场缴费 - ( 已缴费、缓交、部分缴费、未缴费 ) -
-
未完成
-
-
-
- -
step3
-
- -
- 报到注册 - ( 生成报到二维码,并显示报到教室 ) -
-
未完成
-
-
-
+ + + +
+
2020
+
新生入校流程
+
+
+
+
step1
+
+ +
+ 完善学生信息 +
+
未完成
+
+
+
+ +
step2
+
+ +
+ 线上缴费 + ( 已缴费、未缴费 ) +
+
未完成
+
+
+ +
+ 助学贷款 + ( 填写贷款回执码 ) +
+
已完成
+
+
+ +
+ 现场缴费 + ( 已缴费、缓交、部分缴费、未缴费 ) +
+
未完成
+
+
+
+ +
step3
+
+ +
+ 报到注册 + ( 生成报到二维码,并显示报到教室 ) +
+
未完成
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js index 8aadd1a53..14e654b11 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js @@ -7,57 +7,53 @@ var page = { isScroll: false, init: function ($page) { - //ݰ - learun.layer.loading(true, 'ȡ'); - learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", {}, (data) => { - if (data) { - for (var id in data) { - if (id == "StuInfoFreshEntity") { - //todo: - console.log(data[id].IsCompleteInfo == "");//false - - if (data[id].IsCompleteInfo == "") { - completeStyle("#IsCompleteInfo", "images/enter1-1.png"); - } else { - notCompleteStyle("#IsCompleteInfo", "images/enter2-1.png"); - } - if (data[id].PayFeeStatus == "ѽɷ") { - completeStyle("#PayFeeStatus", "images/enter1-2.png"); - } else { - notCompleteStyle("#PayFeeStatus", "images/enter2-2.png"); - } - if (data[id].StudentLoan == null || data[id].StudentLoan == "" || data[id].StudentLoan == undefined) { - notCompleteStyle("#StudentLoan", "images/enter2-3.png"); - } else { - completeStyle("#StudentLoan", "images/enter1-3.png"); - } - if (data[id].OnsitePayFeeStatus == "1") { - completeStyle("#OnsitePayFeeStatus", "images/enter1-4.png"); - } else { - notCompleteStyle("#OnsitePayFeeStatus", "images/enter2-4.png"); - } - if (data[id].RegisterStatus == "1") { - completeStyle("#RegisterStatus", "images/enter1-5.png"); - } else { - notCompleteStyle("#RegisterStatus", "images/enter2-5.png"); - } + // 获取登录者信息 + var userinfo = learun.storage.get('userinfo'); - } + //数据绑定 + learun.layer.loading(true, '获取数据中'); + learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => { + if (data) { + if (data["StuInfoFreshFamilyList"].length && data["StuInfoFreshFamilyList"].length > 0) { + completeStyle("#IsCompleteInfo", "images/enter1-1.png"); + } else { + notCompleteStyle("#IsCompleteInfo", "images/enter2-1.png"); + } + if (data["StuInfoFreshEntity"].PayFeeStatus == "1") { + completeStyle("#PayFeeStatus", "images/enter1-2.png"); + } else { + notCompleteStyle("#PayFeeStatus", "images/enter2-2.png"); } + if (data["StuInfoFreshEntity"].StudentLoan == null || data["StuInfoFreshEntity"].StudentLoan == "" || data["StuInfoFreshEntity"].StudentLoan == undefined) { + notCompleteStyle("#StudentLoan", "images/enter2-3.png"); + } else { + completeStyle("#StudentLoan", "images/enter1-3.png"); + } + if (data["StuInfoFreshEntity"].OnsitePayFeeStatus == "1") { + completeStyle("#OnsitePayFeeStatus", "images/enter1-4.png"); + } else { + notCompleteStyle("#OnsitePayFeeStatus", "images/enter2-4.png"); + } + if (data["StuInfoFreshEntity"].RegisterStatus == "1") { + completeStyle("#RegisterStatus", "images/enter1-5.png"); + } else { + notCompleteStyle("#RegisterStatus", "images/enter2-5.png"); + } + page.bind($page); learun.layer.loading(false); } }); - // + //点击步骤 $page.on('tap', '#IsCompleteInfo', function () { - learun.nav.go({ path: 'welcome', title: 'Ϣ', isBack: true, isHead: true, param: {}, type: 'right' }); + learun.nav.go({ path: 'welcome', title: '完善新生信息', isBack: true, isHead: true, param: {}, type: 'right' }); }); $page.on('tap', '#RegisterStatus', function () { - learun.nav.go({ path: '/EducationalAdministration/StuInfoFresh/RegisterQRCode', title: 'ɱά', isBack: true, isHead: true, param: {}, type: 'right' }); + learun.nav.go({ path: '/EducationalAdministration/StuInfoFresh/RegisterQRCode', title: '生成报到二维码', isBack: true, isHead: true, param: {}, type: 'right' }); }); $page.on('tap', '#StudentLoan', function () { - learun.nav.go({ path: '/EducationalAdministration/StuInfoFresh/StudentLoan', title: 'дִ', isBack: true, isHead: true, param: {}, type: 'right' }); + learun.nav.go({ path: '/EducationalAdministration/StuInfoFresh/StudentLoan', title: '填写贷款回执码', isBack: true, isHead: true, param: {}, type: 'right' }); }); }, @@ -65,16 +61,16 @@ } }; - //ʽ + //已完成样式 var completeStyle = function (box, img) { $(box).removeClass("sSec1Type2").addClass("sSec1Type1"); - $(box).find(".sSec1State").html(""); + $(box).find(".sSec1State").html('已完成'); $(box).find('img').attr("src", img); }; - //ʽ + //已完成样式 var notCompleteStyle = function (box, img) { $(box).removeClass("sSec1Type1").addClass("sSec1Type2"); - $(box).find(".sSec1State").html("δ"); + $(box).find(".sSec1State").html('未完成'); $(box).find('img').attr("src", img); }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.css index 77c7b1d75..e457854ed 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.css +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.css @@ -113,9 +113,12 @@ margin: 10px auto; cursor: pointer; } - +.welImgAdd{ + min-height:110px; +} #PhotoImg { width: 110px; + height:110px; } .btnBox{ 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 2ae8eeea3..02242c932 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 @@ -5,6 +5,8 @@ var page = { isScroll: false, init: function ($page) { + // 获取登录者信息 + var userinfo = learun.storage.get('userinfo'); //增加联系人 $page.find('.welT i').on('tap', function () { @@ -90,8 +92,10 @@ inputNode.on('change', function () { previewFile(); }); + //数据绑定 - learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", {}, (data) => { + learun.layer.loading(true, '获取数据中'); + learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => { if (data) { //基本信息 for (var id in data['StuInfoFreshEntity']) { @@ -185,7 +189,7 @@ }); page.bind($page); - + learun.layer.loading(false); } @@ -202,7 +206,9 @@ StuInfoFreshFamilyEntities: family(), StuInfoFreshEmergePeopleEntities: emergePeople() }; + learun.layer.loading(true, '正在提交数据'); learun.httpget(config.webapi + "StuInfoFresh/saveStuInfoFresh", postdata, (data) => { + learun.layer.loading(false); if (data) { learun.layer.toast('保存成功'); location.reload(); 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 b469337c9..86189fbab 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs @@ -19,11 +19,13 @@ namespace Learun.Application.WebApi.Modules { Get["/stuInfoFreshEntity"] = GetStuInfoFreshEntity; Get["/stuInfoFresh"] = GetStuInfoFresh; - Get["/stuInfoFreshEntityByStuNo"] = GetStuInfoFreshEntityByStuNo; Get["/saveStuInfoFresh"] = GetSaveStuInfoFresh; Get["/saveLoan"] = GetSaveLoan; Post["/savePhoto"] = GetSavePhoto; Get["/payFeeDetail"] = GetPayFeeDetail; + Get["/pageList"] = GetPageList; + Get["/form"] = GetForm; + Post["/save"] = SaveForm; } @@ -47,7 +49,7 @@ namespace Learun.Application.WebApi.Modules var StuInfoFreshFamilyList = new List(); var StuInfoFreshEmergePeopleList = new List(); - var StuInfoFreshEntity = stuInfoFreshIBLL.GetStuInfoFreshEntityByStuNo(userInfo.account); + var StuInfoFreshEntity = stuInfoFreshIBLL.GetStuInfoFreshEntityByStuNo(GetReqData()); if (StuInfoFreshEntity != null) { //处理数据源 @@ -73,41 +75,38 @@ namespace Learun.Application.WebApi.Modules StuInfoFreshEntity.ClassDiredctorMobile = empInfoEntity2.mobile; } } - if (StuInfoFreshEntity.PayFeeStatus == "1") + + //获取头像地址 + if (StuInfoFreshEntity.IsPhoto == true && !string.IsNullOrEmpty(StuInfoFreshEntity.Photo)) { - StuInfoFreshEntity.PayFeeStatus = "已缴费"; + var annexesFileEntity = annexesFileIBLL.GetEntity(StuInfoFreshEntity.Photo); + if (annexesFileEntity != null) + { + url = annexesFileEntity.F_FilePath.Substring(annexesFileEntity.F_FilePath.IndexOf("Resource")); + } } - else + StuInfoFreshEntity.DormitoryName = accdormitoryIBLL.GetDormitoryInfoByPlanStuNo(StuInfoFreshEntity.ID); + if (StuInfoFreshEntity.IsPoor != "1") { - StuInfoFreshEntity.PayFeeStatus = "未缴费"; + StuInfoFreshEntity.IsPoor = "0"; } - if (StuInfoFreshEntity.CollectFileStatus == "1") + if (StuInfoFreshEntity.GetKeyStatus != "1") { - StuInfoFreshEntity.CollectFileStatus = "已提交"; + StuInfoFreshEntity.GetKeyStatus = "0"; } - else + if (StuInfoFreshEntity.GetCardStatus != "1") { - StuInfoFreshEntity.CollectFileStatus = "未提交"; + StuInfoFreshEntity.GetCardStatus = "0"; } - if (StuInfoFreshEntity.GetKeyStatus == "1") + if (StuInfoFreshEntity.OtherPayFeeStatus != "1") { - StuInfoFreshEntity.GetKeyStatus = "已领取"; + StuInfoFreshEntity.OtherPayFeeStatus = "0"; } - else + if (StuInfoFreshEntity.CollectFileStatus != "1") { - StuInfoFreshEntity.GetKeyStatus = "未领取"; + StuInfoFreshEntity.CollectFileStatus = "0"; } - //获取头像地址 - if (StuInfoFreshEntity.IsPhoto == true && !string.IsNullOrEmpty(StuInfoFreshEntity.Photo)) - { - var annexesFileEntity = annexesFileIBLL.GetEntity(StuInfoFreshEntity.Photo); - if (annexesFileEntity != null) - { - url = annexesFileEntity.F_FilePath.Substring(annexesFileEntity.F_FilePath.IndexOf("Resource")); - } - } - StuInfoFreshEntity.DormitoryName = accdormitoryIBLL.GetDormitoryInfoByPlanStuNo(StuInfoFreshEntity.ID); //是否完善信息 StuInfoFreshFamilyList = stuInfoFreshIBLL.GetStuInfoFreshFamilyList(StuInfoFreshEntity.ID).ToList(); @@ -143,87 +142,9 @@ namespace Learun.Application.WebApi.Modules return Success(result); } - - private Response GetStuInfoFreshEntityByStuNo(dynamic _) - { - var url = Config.GetValue("defaultheadimg"); - var StuInfoFreshFamilyList = new List(); - var StuInfoFreshEmergePeopleList = new List(); - - var StuInfoFreshEntity = stuInfoFreshIBLL.GetStuInfoFreshEntityByStuNo(GetReqData()); - if (StuInfoFreshEntity != null) - { - //处理数据源 - StuInfoFreshEntity.MajorNo = cdMajorIBLL.GetCdMajorEntityByMajorNo(StuInfoFreshEntity.MajorNo).MajorName; - StuInfoFreshEntity.DeptNo = cdDeptIBLL.GetCdDeptEntityByNo(StuInfoFreshEntity.DeptNo).DeptName; - - var classInfoEntity = classInfoIBLL.GetClassInfoEntityByClassNo(StuInfoFreshEntity.ClassNo); - if (classInfoEntity != null) - { - StuInfoFreshEntity.ClassNo = classInfoEntity.ClassName; - StuInfoFreshEntity.ClassTutorNo = classInfoEntity.ClassTutorNo; - var empInfoEntity = empInfoIBLL.GetEmpInfoEntityByEmpNo(classInfoEntity.ClassTutorNo); - if (empInfoEntity != null) - { - StuInfoFreshEntity.ClassTutorName = empInfoEntity.EmpName; - StuInfoFreshEntity.ClassTutorMobile = empInfoEntity.mobile; - } - } - if (StuInfoFreshEntity.PayFeeStatus == "1") - { - StuInfoFreshEntity.PayFeeStatus = "已缴费"; - } - else - { - StuInfoFreshEntity.PayFeeStatus = "未缴费"; - } - if (StuInfoFreshEntity.CollectFileStatus == "1") - { - StuInfoFreshEntity.CollectFileStatus = "已提交"; - } - else - { - StuInfoFreshEntity.CollectFileStatus = "未提交"; - } - if (StuInfoFreshEntity.GetKeyStatus == "1") - { - StuInfoFreshEntity.GetKeyStatus = "已领取"; - } - else - { - StuInfoFreshEntity.GetKeyStatus = "未领取"; - } - - //获取头像地址 - if (StuInfoFreshEntity.IsPhoto == true && !string.IsNullOrEmpty(StuInfoFreshEntity.Photo)) - { - var annexesFileEntity = annexesFileIBLL.GetEntity(StuInfoFreshEntity.Photo); - if (annexesFileEntity != null) - { - url = annexesFileEntity.F_FilePath.Substring(annexesFileEntity.F_FilePath.IndexOf("Resource")); - } - } - StuInfoFreshEntity.DormitoryName = accdormitoryIBLL.GetDormitoryInfoByPlanStuNo(StuInfoFreshEntity.ID); - - //是否完善信息 - StuInfoFreshFamilyList = stuInfoFreshIBLL.GetStuInfoFreshFamilyList(StuInfoFreshEntity.ID).ToList(); - StuInfoFreshEmergePeopleList = stuInfoFreshIBLL.GetStuInfoFreshEmergePeopleList(StuInfoFreshEntity.ID).ToList(); - StuInfoFreshEntity.ClassTutorNo = StuInfoFreshFamilyList.Any() ? "已完善" : "未完善"; - - } - - var result = new - { - StuInfoFreshEntity = StuInfoFreshEntity, - StuInfoFreshFamilyList = StuInfoFreshFamilyList, - StuInfoFreshEmergePeopleList = StuInfoFreshEmergePeopleList, - Url = url - }; - - return Success(result); - } + /// - /// 保存个人信息 + /// 保存完善个人信息 /// /// /// @@ -251,7 +172,7 @@ namespace Learun.Application.WebApi.Modules return Success("保存成功"); } /// - /// 保存个人信息 + /// 保存贷款回执码 /// /// /// @@ -350,6 +271,65 @@ namespace Learun.Application.WebApi.Modules return Success(result); } + /// + /// 根据班级查询新生列表 + /// + /// + /// + public Response GetPageList(dynamic _) + { + ReqPageParam parameter = this.GetReqData(); + var data = stuInfoFreshIBLL.GetPageList(parameter.pagination, parameter.queryJson); + var jsonData = new + { + rows = data, + total = parameter.pagination.total, + page = parameter.pagination.page, + records = parameter.pagination.records + }; + return Success(jsonData); + } + + /// + /// 获取表单数据 + /// + /// + /// + public Response GetForm(dynamic _) + { + string keyValue = this.GetReqData(); + var StuInfoFreshData = stuInfoFreshIBLL.GetStuInfoFreshEntity(keyValue); + var jsonData = new + { + StuInfoFresh = StuInfoFreshData, + }; + return Success(jsonData); + } + /// + /// 保存实体数据(新增、修改) + /// + /// + /// + public Response SaveForm(dynamic _) + { + ReqFormEntity parameter = this.GetReqData(); + StuInfoFreshEntity entity = parameter.strEntity.ToObject(); + + stuInfoFreshIBLL.SaveEntity(parameter.keyValue, entity); + return Success("保存成功!"); + } + + #region 私有类 + + /// + /// 表单实体类 + /// + private class ReqFormEntity + { + public string keyValue { get; set; } + public string strEntity { 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 b3c3a554f..35f82489a 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 @@ -219,6 +219,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration strSql.Append(" and t.StuNo = @StuNo "); dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String); } + if (!queryParam["StuName"].IsEmpty()) + { + strSql.Append(" and t.StuName like @StuName "); + dp.Add("StuName", '%' + queryParam["StuName"].ToString() + '%', DbType.String); + } //分配班级 if (!queryParam["MajorNo"].IsEmpty()) { @@ -328,6 +333,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration strSql.Append(" AND (t.DormitoryNo IS NOT NULL AND t.DormitoryNo<>'')"); } } + //班主任/辅导员 + if (!queryParam["EmpNo"].IsEmpty()) + { + strSql.Append(" and (c.ClassDiredctorNo = @EmpNo or c.ClassTutorNo = @EmpNo) "); + dp.Add("EmpNo", queryParam["EmpNo"].ToString(), DbType.String); + } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); }