diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Controllers/AP_OnlineUserInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Controllers/AP_OnlineUserInfoController.cs index fc20a5e30..de80592a9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Controllers/AP_OnlineUserInfoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Controllers/AP_OnlineUserInfoController.cs @@ -83,6 +83,33 @@ namespace Learun.Application.Web.Areas.AdmissionsPlatform.Controllers { return View(); } + /// + /// 主页面【缴费信息】 + /// + /// + [HttpGet] + public ActionResult PaymentIndex() + { + return View(); + } + /// + /// 主页面【报到信息】 + /// + /// + [HttpGet] + public ActionResult ReportIndex() + { + return View(); + } + /// + /// 主页面【退学信息】 + /// + /// + [HttpGet] + public ActionResult DropOutIndex() + { + return View(); + } #endregion #region 获取数据 @@ -261,9 +288,9 @@ namespace Learun.Application.Web.Areas.AdmissionsPlatform.Controllers /// [HttpPost] [AjaxOnly] - public ActionResult DoDropOut(string keyValue) + public ActionResult DoDropOut(string keyValue, string status) { - onlineUserInfoIBLL.DoDropOut(keyValue); + onlineUserInfoIBLL.DoDropOut(keyValue, status); return Success("操作成功！"); } /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.cshtml new file mode 100644 index 000000000..96ef9982d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.cshtml @@ -0,0 +1,59 @@ +@{ + ViewBag.Title = "退学信息"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
姓名
+ +
+
+
手机号
+ +
+
+
性别
+
+
+
+
专业
+
+
+
+
报名方式
+
+
+
+
推荐老师
+
+
+
+
审核状态
+
+
+
+
+
+
+
+
+ +
+
+  退学 +  取消退学 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.js new file mode 100644 index 000000000..0f30d8369 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.js @@ -0,0 +1,328 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2020-04-17 15:45 + * 描 述：退学信息 + */ +var selectedRow; +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + // 查询 + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 250, 400); + $("#SexId").lrDataItemSelect({ code: 'usersex' }); + $('#MajorId').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); + $('#UserTeacherId').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo', + param: { strWhere: "1=1 " }, + value: "empid", + text: "empname" + }); + $("#EnrollMode").lrDataItemSelect({ code: 'EnrollMode' }); + $("#AppStatus").lrDataItemSelect({ code: 'AdmissionsAppStatus' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + //退学 + $('#lr_Drop').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var IsDropOut = $('#gridtable').jfGridValue('IsDropOut'); + if (IsDropOut.indexOf('1') != -1) { + learun.alert.warning("选中记录中包含已退学项目！"); + return; + } + learun.layerConfirm('是否确认退学该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/DoDropOut', { keyValue: keyValue, status: '1' }, function () { + refreshGirdData(); + }); + } + }); + } + }); + //取消退学 + $('#lr_DropCancel').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var IsDropOut = $('#gridtable').jfGridValue('IsDropOut'); + if (IsDropOut.indexOf('0') != -1) { + learun.alert.warning("选中记录中包含未退学项目！"); + return; + } + learun.layerConfirm('是否确认取消退学该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/DoDropOut', { keyValue: keyValue, status: '0' }, function () { + refreshGirdData(); + }); + } + }); + } + }); + + }, + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/GetPageListOfRegistrate', + headData: [ + { + label: '审核状态', name: 'AppStatus', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'AdmissionsAppStatus', + callback: function (_data) { + //callback(_data.text); + if (_data.text) { + if (_data.text == "通过") { + callback('' + _data.text + ''); + } else if (_data.text == "未通过") { + callback('' + _data.text + ''); + } else { + callback('' + _data.text + ''); + } + } + } + }); + } + }, + { label: '创建时间', name: 'CreateDate', width: 130, align: "left" }, + { label: '姓名', name: 'RealName', width: 100, align: "left" }, + { label: '手机号码', name: 'Mobile', width: 100, align: "left" }, + { + label: '是否退学', name: 'IsDropOut', width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == "1" ? "是" : "否"; + } + }, + { label: '身份证号', name: 'CertNum', width: 100, align: "left" }, + { + label: '性别', name: 'SexId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'usersex', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '出生日期', name: 'BirthDate', width: 100, align: "left" }, + { + label: '民族', name: 'Nation', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + key: value, + keyId: 'nationalityno', + callback: function (_data) { + callback(_data['nationality']); + } + }); + } + }, + { + label: '政治面貌', name: 'PoliticsFace', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + key: value, + keyId: 'partyfaceno', + callback: function (_data) { + callback(_data['partyface']); + } + }); + } + }, + { label: '现户籍所在地', name: 'OriginAddress', width: 100, align: "left" }, + { + label: '户口性质', name: 'OriginId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'ResidenceNo', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '在籍年份', name: 'SchoolDate', width: 100, align: "left" }, + { label: '详细地址', name: 'DetailedAddress', width: 100, align: "left" }, + { label: '邮政编码', name: 'ZipCode', width: 100, align: "left" }, + { + label: '学习形式', name: 'YearFormId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'StudyModality', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '招生季度', name: 'QuarterId', width: 100, align: "left" }, + { label: '毕业学校', name: 'GraduateSchool', width: 100, align: "left" }, + { label: '爱好特长', name: 'Hobbies', width: 100, align: "left" }, + { + label: '文化程度', name: 'CultureId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree', + key: value, + keyId: 'culturedegreeno', + callback: function (_data) { + callback(_data['culturedegree']); + } + }); + } + }, + { label: '银行卡号', name: 'BankNumber', width: 100, align: "left" }, + { + label: '学制', name: 'LearnLength', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'EduSystem', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '家庭联系人', name: 'FamilyLinkman', width: 100, align: "left" }, + { label: '家庭联系电话', name: 'FamilyPhone', width: 100, align: "left" }, + { label: '家庭年总收入', name: 'FamilyIncome', width: 100, align: "left" }, + { label: '家庭人均收入', name: 'FamilyFenIncome', width: 100, align: "left" }, + { + label: '是否十万以下民族', name: 'IsTenId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoInt', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '是否家庭困难', name: 'IsHardId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoInt', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '是否低保', name: 'IsBasicId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoInt', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '收入来源', name: 'IncomeSourceId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'IncomeSource', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '报考校区', name: 'SchoolId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company', + key: value, + keyId: 'f_companyid', + callback: function (_data) { + callback(_data['f_fullname']); + } + }); + } + }, + { + label: '报考专业', name: 'MajorId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', + key: value, + keyId: 'majorno', + callback: function (_data) { + callback(_data['majorname']); + } + }); + } + }, + { + label: '推荐老师', name: 'UserTeacherId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { label: '缴费额度', name: 'PaymentQuota', width: 100, align: "left" }, + { label: '报名时间', name: 'EnrollDate', width: 100, align: "left" }, + { + label: '报名方式', name: 'EnrollMode', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'EnrollMode', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + + ], + mainId: 'Id', + isPage: true, + isMultiselect: true, + sord: 'desc', + sidx: 'CreateDate' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.cshtml new file mode 100644 index 000000000..dcd9965b0 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.cshtml @@ -0,0 +1,66 @@ +@{ + ViewBag.Title = "缴费信息"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
姓名
+ +
+
+
手机号
+ +
+
+
性别
+
+
+
+
专业
+
+
+
+
是否缴费
+
+
+
+
缴费方式
+
+
+
+
报名方式
+
+
+
+
推荐老师
+
+
+
+
审核状态
+
+
+
+
+
+
+
+
+ +
+
+  缴费 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.js new file mode 100644 index 000000000..326a7851a --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.js @@ -0,0 +1,324 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2020-04-17 15:45 + * 描 述：缴费信息 + */ +var selectedRow; +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + // 查询 + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 250, 400); + $("#SexId").lrDataItemSelect({ code: 'usersex' }); + $('#MajorId').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); + $('#UserTeacherId').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo', + param: { strWhere: "1=1 " }, + value: "empid", + text: "empname" + }); + $("#IsPaymentId").lrDataItemSelect({ code: 'YesOrNoInt' }); + $("#PaymentMode").lrDataItemSelect({ code: 'PaymentMode' }); + $("#EnrollMode").lrDataItemSelect({ code: 'EnrollMode' }); + $("#AppStatus").lrDataItemSelect({ code: 'AdmissionsAppStatus' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + //缴费 + $('#lr_Pay').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'PaymentForm', + title: '缴费', + url: top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/PaymentForm?keyValue=' + keyValue, + width: 700, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + + }, + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/GetPageListOfRegistrate', + headData: [ + { + label: '审核状态', name: 'AppStatus', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'AdmissionsAppStatus', + callback: function (_data) { + //callback(_data.text); + if (_data.text) { + if (_data.text == "通过") { + callback('' + _data.text + ''); + } else if (_data.text == "未通过") { + callback('' + _data.text + ''); + } else { + callback('' + _data.text + ''); + } + } + } + }); + } + }, + { label: '创建时间', name: 'CreateDate', width: 130, align: "left" }, + { label: '姓名', name: 'RealName', width: 100, align: "left" }, + { label: '手机号码', name: 'Mobile', width: 100, align: "left" }, + { + label: '是否缴费', name: 'IsPaymentId', width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == "1" ? "是" : "否"; + } + }, + { label: '缴费时间', name: 'PaymentDate', width: 100, align: "left" }, + { + label: '缴费方式', name: 'PaymentMode', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'PaymentMode', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '身份证号', name: 'CertNum', width: 100, align: "left" }, + { + label: '性别', name: 'SexId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'usersex', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '出生日期', name: 'BirthDate', width: 100, align: "left" }, + { + label: '民族', name: 'Nation', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + key: value, + keyId: 'nationalityno', + callback: function (_data) { + callback(_data['nationality']); + } + }); + } + }, + { + label: '政治面貌', name: 'PoliticsFace', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + key: value, + keyId: 'partyfaceno', + callback: function (_data) { + callback(_data['partyface']); + } + }); + } + }, + { label: '现户籍所在地', name: 'OriginAddress', width: 100, align: "left" }, + { + label: '户口性质', name: 'OriginId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'ResidenceNo', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '在籍年份', name: 'SchoolDate', width: 100, align: "left" }, + { label: '详细地址', name: 'DetailedAddress', width: 100, align: "left" }, + { label: '邮政编码', name: 'ZipCode', width: 100, align: "left" }, + { + label: '学习形式', name: 'YearFormId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'StudyModality', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '招生季度', name: 'QuarterId', width: 100, align: "left" }, + { label: '毕业学校', name: 'GraduateSchool', width: 100, align: "left" }, + { label: '爱好特长', name: 'Hobbies', width: 100, align: "left" }, + { + label: '文化程度', name: 'CultureId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree', + key: value, + keyId: 'culturedegreeno', + callback: function (_data) { + callback(_data['culturedegree']); + } + }); + } + }, + { label: '银行卡号', name: 'BankNumber', width: 100, align: "left" }, + { + label: '学制', name: 'LearnLength', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'EduSystem', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '家庭联系人', name: 'FamilyLinkman', width: 100, align: "left" }, + { label: '家庭联系电话', name: 'FamilyPhone', width: 100, align: "left" }, + { label: '家庭年总收入', name: 'FamilyIncome', width: 100, align: "left" }, + { label: '家庭人均收入', name: 'FamilyFenIncome', width: 100, align: "left" }, + { + label: '是否十万以下民族', name: 'IsTenId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoInt', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '是否家庭困难', name: 'IsHardId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoInt', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '是否低保', name: 'IsBasicId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoInt', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '收入来源', name: 'IncomeSourceId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'IncomeSource', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '报考校区', name: 'SchoolId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company', + key: value, + keyId: 'f_companyid', + callback: function (_data) { + callback(_data['f_fullname']); + } + }); + } + }, + { + label: '报考专业', name: 'MajorId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', + key: value, + keyId: 'majorno', + callback: function (_data) { + callback(_data['majorname']); + } + }); + } + }, + { + label: '推荐老师', name: 'UserTeacherId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { label: '缴费额度', name: 'PaymentQuota', width: 100, align: "left" }, + { label: '报名时间', name: 'EnrollDate', width: 100, align: "left" }, + { + label: '报名方式', name: 'EnrollMode', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'EnrollMode', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + + ], + mainId: 'Id', + isPage: true, + isMultiselect: true, + sord: 'desc', + sidx: 'CreateDate' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateIndex.cshtml index e5bb66218..7068648e1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateIndex.cshtml @@ -65,9 +65,6 @@  审核通过  审核不通过  关联教师 -  缴费 -  报到 -  退学 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateIndex.js index a7182aea8..bf4f13678 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateIndex.js @@ -142,58 +142,6 @@ var bootstrap = function ($, learun) { }); } }); - //缴费 - $('#lr_Pay').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - selectedRow = $('#gridtable').jfGridGet('rowdata'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'PaymentForm', - title: '缴费', - url: top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/PaymentForm?keyValue=' + keyValue, - width: 700, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - } - }); - //报到 - $('#lr_Report').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - selectedRow = $('#gridtable').jfGridGet('rowdata'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'ReportForm', - title: '报到', - url: top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/ReportForm?keyValue=' + keyValue, - width: 700, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - } - }); - //退学 - $('#lr_Drop').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - if (learun.checkrow(keyValue)) { - var IsDropOut = $('#gridtable').jfGridValue('IsDropOut'); - if (IsDropOut.indexOf('1') != -1) { - learun.alert.warning("选中记录中包含已退学项目！"); - return; - } - learun.layerConfirm('是否确认退学该项！', function (res) { - if (res) { - learun.postForm(top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/DoDropOut', { keyValue: keyValue }, function () { - refreshGirdData(); - }); - } - }); - } - }); }, initGird: function () { @@ -207,7 +155,16 @@ var bootstrap = function ($, learun) { key: value, code: 'AdmissionsAppStatus', callback: function (_data) { - callback(_data.text); + //callback(_data.text); + if (_data.text) { + if (_data.text == "通过") { + callback('' + _data.text + ''); + } else if (_data.text == "未通过") { + callback('' + _data.text + ''); + } else { + callback('' + _data.text + ''); + } + } } }); } @@ -405,15 +362,8 @@ var bootstrap = function ($, learun) { }, { label: '缴费额度', name: 'PaymentQuota', width: 100, align: "left" }, { - label: '是否缴费', name: 'IsPaymentId', width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'YesOrNoInt', - callback: function (_data) { - callback(_data.text); - } - }); + label: '是否缴费', name: 'IsPaymentId', width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == "1" ? "是" : "否"; } }, { label: '缴费时间', name: 'PaymentDate', width: 100, align: "left" }, @@ -436,7 +386,16 @@ var bootstrap = function ($, learun) { key: value, code: 'IsReport', callback: function (_data) { - callback(_data.text); + //callback(_data.text); + if (_data.text) { + if (_data.text == "正常报到") { + callback('' + _data.text + ''); + } else if (_data.text == "异常报到") { + callback('' + _data.text + ''); + } else { + callback('' + _data.text + ''); + } + } } }); } @@ -455,15 +414,8 @@ var bootstrap = function ($, learun) { } }, { - label: '是否退学', name: 'IsDropOut', width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'YesOrNoInt', - callback: function (_data) { - callback(_data.text); - } - }); + label: '是否退学', name: 'IsDropOut', width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == "1" ? "是" : "否"; } }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.cshtml new file mode 100644 index 000000000..0a164733f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.cshtml @@ -0,0 +1,62 @@ +@{ + ViewBag.Title = "报到信息"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
姓名
+ +
+
+
手机号
+ +
+
+
性别
+
+
+
+
专业
+
+
+
+
是否报到
+
+
+
+
报名方式
+
+
+
+
推荐老师
+
+
+
+
审核状态
+
+
+
+
+
+
+
+
+ +
+
+  报到 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.js new file mode 100644 index 000000000..b1831fcba --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.js @@ -0,0 +1,326 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2020-04-17 15:45 + * 描 述：报到信息 + */ +var selectedRow; +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + // 查询 + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 250, 400); + $("#SexId").lrDataItemSelect({ code: 'usersex' }); + $('#MajorId').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); + $('#UserTeacherId').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo', + param: { strWhere: "1=1 " }, + value: "empid", + text: "empname" + }); + $("#IsReportId").lrDataItemSelect({ code: 'IsReport' }); + $("#EnrollMode").lrDataItemSelect({ code: 'EnrollMode' }); + $("#AppStatus").lrDataItemSelect({ code: 'AdmissionsAppStatus' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + //报到 + $('#lr_Report').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'ReportForm', + title: '报到', + url: top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/ReportForm?keyValue=' + keyValue, + width: 700, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + + }, + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/AdmissionsPlatform/AP_OnlineUserInfo/GetPageListOfRegistrate', + headData: [ + { + label: '审核状态', name: 'AppStatus', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'AdmissionsAppStatus', + callback: function (_data) { + //callback(_data.text); + if (_data.text) { + if (_data.text == "通过") { + callback('' + _data.text + ''); + } else if (_data.text == "未通过") { + callback('' + _data.text + ''); + } else { + callback('' + _data.text + ''); + } + } + } + }); + } + }, + { label: '创建时间', name: 'CreateDate', width: 130, align: "left" }, + { label: '姓名', name: 'RealName', width: 100, align: "left" }, + { label: '手机号码', name: 'Mobile', width: 100, align: "left" }, + { + label: '是否报到', name: 'IsReportId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'IsReport', + callback: function (_data) { + //callback(_data.text); + if (_data.text) { + if (_data.text == "正常报到") { + callback('' + _data.text + ''); + } else if (_data.text == "异常报到") { + callback('' + _data.text + ''); + } else { + callback('' + _data.text + ''); + } + } + } + }); + } + }, + { label: '身份证号', name: 'CertNum', width: 100, align: "left" }, + { + label: '性别', name: 'SexId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'usersex', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '出生日期', name: 'BirthDate', width: 100, align: "left" }, + { + label: '民族', name: 'Nation', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + key: value, + keyId: 'nationalityno', + callback: function (_data) { + callback(_data['nationality']); + } + }); + } + }, + { + label: '政治面貌', name: 'PoliticsFace', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + key: value, + keyId: 'partyfaceno', + callback: function (_data) { + callback(_data['partyface']); + } + }); + } + }, + { label: '现户籍所在地', name: 'OriginAddress', width: 100, align: "left" }, + { + label: '户口性质', name: 'OriginId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'ResidenceNo', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '在籍年份', name: 'SchoolDate', width: 100, align: "left" }, + { label: '详细地址', name: 'DetailedAddress', width: 100, align: "left" }, + { label: '邮政编码', name: 'ZipCode', width: 100, align: "left" }, + { + label: '学习形式', name: 'YearFormId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'StudyModality', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '招生季度', name: 'QuarterId', width: 100, align: "left" }, + { label: '毕业学校', name: 'GraduateSchool', width: 100, align: "left" }, + { label: '爱好特长', name: 'Hobbies', width: 100, align: "left" }, + { + label: '文化程度', name: 'CultureId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree', + key: value, + keyId: 'culturedegreeno', + callback: function (_data) { + callback(_data['culturedegree']); + } + }); + } + }, + { label: '银行卡号', name: 'BankNumber', width: 100, align: "left" }, + { + label: '学制', name: 'LearnLength', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'EduSystem', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: '家庭联系人', name: 'FamilyLinkman', width: 100, align: "left" }, + { label: '家庭联系电话', name: 'FamilyPhone', width: 100, align: "left" }, + { label: '家庭年总收入', name: 'FamilyIncome', width: 100, align: "left" }, + { label: '家庭人均收入', name: 'FamilyFenIncome', width: 100, align: "left" }, + { + label: '是否十万以下民族', name: 'IsTenId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoInt', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '是否家庭困难', name: 'IsHardId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoInt', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '是否低保', name: 'IsBasicId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoInt', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '收入来源', name: 'IncomeSourceId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'IncomeSource', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '报考校区', name: 'SchoolId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company', + key: value, + keyId: 'f_companyid', + callback: function (_data) { + callback(_data['f_fullname']); + } + }); + } + }, + { + label: '报考专业', name: 'MajorId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', + key: value, + keyId: 'majorno', + callback: function (_data) { + callback(_data['majorname']); + } + }); + } + }, + { + label: '推荐老师', name: 'UserTeacherId', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { label: '缴费额度', name: 'PaymentQuota', width: 100, align: "left" }, + { label: '报名时间', name: 'EnrollDate', width: 100, align: "left" }, + { + label: '报名方式', name: 'EnrollMode', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'EnrollMode', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + + ], + mainId: 'Id', + isPage: true, + isMultiselect: true, + sord: 'desc', + sidx: 'CreateDate' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 3af8213ac..d02d1d59e 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 @@ -789,6 +789,9 @@ + + + @@ -6794,6 +6797,9 @@ + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoBLL.cs index 6dc8920e8..00eb5111a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoBLL.cs @@ -379,11 +379,11 @@ namespace Learun.Application.TwoDevelopment.AdmissionsPlatform /// 主键 /// /// - public void DoDropOut(string keyValue) + public void DoDropOut(string keyValue, string status) { try { - onlineUserInfoService.DoDropOut(keyValue); + onlineUserInfoService.DoDropOut(keyValue, status); } catch (Exception ex) { @@ -478,7 +478,7 @@ namespace Learun.Application.TwoDevelopment.AdmissionsPlatform { try { - onlineUserInfoService.SaveReselectMajor(userId, majorNo); + onlineUserInfoService.SaveReselectMajor(userId, majorNo); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoIBLL.cs index 2e2507a87..befc3a845 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoIBLL.cs @@ -113,7 +113,7 @@ namespace Learun.Application.TwoDevelopment.AdmissionsPlatform /// 主键 /// /// - void DoDropOut(string keyValue); + void DoDropOut(string keyValue, string status); /// /// 关联教师 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoService.cs index af4cb68b3..2681215eb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AdmissionsPlatform/AP_OnlineUserInfo/AP_OnlineUserInfoService.cs @@ -627,7 +627,7 @@ namespace Learun.Application.TwoDevelopment.AdmissionsPlatform /// 主键 /// /// - public void DoDropOut(string keyValue) + public void DoDropOut(string keyValue, string status) { var db = this.BaseRepository("CollegeMIS").BeginTrans(); try @@ -636,13 +636,13 @@ namespace Learun.Application.TwoDevelopment.AdmissionsPlatform { if (keyValue.IndexOf(",") == -1) { - db.ExecuteBySql("update AP_OnlineStudentInfo set IsDropOut='1' where UserId='" + keyValue + "' "); + db.ExecuteBySql("update AP_OnlineStudentInfo set IsDropOut='" + status + "' where UserId='" + keyValue + "' "); } else { foreach (var item in keyValue.Split(',')) { - db.ExecuteBySql("update AP_OnlineStudentInfo set IsDropOut='1' where UserId='" + item + "' "); + db.ExecuteBySql("update AP_OnlineStudentInfo set IsDropOut='" + status + "' where UserId='" + item + "' "); } } }